mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-20 00:51:41 +00:00
Use the tool plugin to include photon-targeting into photon-core (#2137)
## Description This allows photon-targeting to be loaded using the same mechanism as the rest of the WPILib libraries, fixing issues with libraries not being able to find and load their dependent libraries. ## Meta Merge checklist: - [x] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [x] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2025.3.2 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [ ] If this PR addresses a bug, a regression test for it is added
This commit is contained in:
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (C) Photon Vision.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.photonvision.jni;
|
||||
|
||||
import edu.wpi.first.apriltag.jni.AprilTagJNI;
|
||||
import edu.wpi.first.cscore.CameraServerJNI;
|
||||
import edu.wpi.first.cscore.OpenCvLoader;
|
||||
import edu.wpi.first.hal.JNIWrapper;
|
||||
import edu.wpi.first.math.jni.WPIMathJNI;
|
||||
import edu.wpi.first.net.WPINetJNI;
|
||||
import edu.wpi.first.networktables.NetworkTablesJNI;
|
||||
import edu.wpi.first.util.CombinedRuntimeLoader;
|
||||
import edu.wpi.first.util.WPIUtilJNI;
|
||||
import java.io.IOException;
|
||||
import org.opencv.core.Core;
|
||||
|
||||
public class LibraryLoader {
|
||||
private static boolean hasWpiLoaded = false;
|
||||
private static boolean hasTargetingLoaded = false;
|
||||
|
||||
public static boolean loadWpiLibraries() {
|
||||
if (hasWpiLoaded) return true;
|
||||
|
||||
NetworkTablesJNI.Helper.setExtractOnStaticLoad(false);
|
||||
WPIUtilJNI.Helper.setExtractOnStaticLoad(false);
|
||||
CameraServerJNI.Helper.setExtractOnStaticLoad(false);
|
||||
OpenCvLoader.Helper.setExtractOnStaticLoad(false);
|
||||
JNIWrapper.Helper.setExtractOnStaticLoad(false);
|
||||
WPINetJNI.Helper.setExtractOnStaticLoad(false);
|
||||
WPIMathJNI.Helper.setExtractOnStaticLoad(false);
|
||||
AprilTagJNI.Helper.setExtractOnStaticLoad(false);
|
||||
try {
|
||||
// Need to load wpiutil first before checking if the MSVC runtime is valid
|
||||
CombinedRuntimeLoader.loadLibraries(LibraryLoader.class, "wpiutiljni");
|
||||
WPIUtilJNI.checkMsvcRuntime();
|
||||
CombinedRuntimeLoader.loadLibraries(
|
||||
LibraryLoader.class,
|
||||
"wpimathjni",
|
||||
"ntcorejni",
|
||||
"wpinetjni",
|
||||
"wpiHaljni",
|
||||
"cscorejni",
|
||||
"apriltagjni");
|
||||
|
||||
CombinedRuntimeLoader.loadLibraries(LibraryLoader.class, Core.NATIVE_LIBRARY_NAME);
|
||||
hasWpiLoaded = true;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
hasWpiLoaded = false;
|
||||
}
|
||||
|
||||
return hasWpiLoaded;
|
||||
}
|
||||
|
||||
public static boolean loadTargeting() {
|
||||
if (hasTargetingLoaded) return true;
|
||||
try {
|
||||
CombinedRuntimeLoader.loadLibraries(LibraryLoader.class, "photontargetingJNI");
|
||||
hasTargetingLoaded = true;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
hasTargetingLoaded = false;
|
||||
}
|
||||
return hasTargetingLoaded;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user