no more enum

Author: samfreund

photon-core/src/main/java/org/photonvision/common/LoadJNI.java

@@ -19,44 +19,41 @@
 
 import edu.wpi.first.util.CombinedRuntimeLoader;
 import java.io.IOException;
+import java.util.HashMap;
 import org.photonvision.jni.LibraryLoader;
 
 public class LoadJNI {
+    private static HashMap<JNITypes, Boolean> loadedMap = new HashMap<>();
+
     public enum JNITypes {
-        RUBIK_DETECTOR(false, "tensorflowlite", "tensorflowlite_c", "external_delegate", "rubik_jni"),
-        RKNN_DETECTOR(false, "rga", "rknnrt", "rknn_jni"),
-        MRCAL(false, "mrcal_jni"),
-        LIBCAMERA(false, "photonlibcamera");
+        RUBIK_DETECTOR("tensorflowlite", "tensorflowlite_c", "external_delegate", "rubik_jni"),
+        RKNN_DETECTOR("rga", "rknnrt", "rknn_jni"),
+        MRCAL("mrcal_jni"),
+        LIBCAMERA("photonlibcamera");
 
-        private volatile boolean hasLoaded;
         public final String[] libraries;
 
-        JNITypes(boolean hasLoaded, String... libraries) {
-            this.hasLoaded = hasLoaded;
+        JNITypes(String... libraries) {
             this.libraries = libraries;
         }
-
-        public boolean hasLoaded() {
-            return hasLoaded;
-        }
-
-        public void setHasLoaded(boolean loaded) {
-            this.hasLoaded = loaded;
-        }
     }
 
     public static synchronized void forceLoad(JNITypes type) throws IOException {
         loadLibraries();
 
-        if (type.hasLoaded()) {
+        if (loadedMap.getOrDefault(type, false)) {
             return;
         }
 
         CombinedRuntimeLoader.loadLibraries(LoadJNI.class, type.libraries);
-        type.setHasLoaded(true);
+        loadedMap.put(type, true);
     }
 
     public static boolean loadLibraries() {
         return LibraryLoader.loadWpiLibraries() && LibraryLoader.loadTargeting();
     }
+
+    public static boolean hasLoaded(JNITypes t) {
+        return loadedMap.containsKey(t) ? false : loadedMap.get(t);
+    }
 }

photon-core/src/main/java/org/photonvision/common/dataflow/websocket/UIPhotonConfiguration.java

@@ -20,6 +20,7 @@
 import java.util.List;
 import org.photonvision.PhotonVersion;
 import org.photonvision.common.LoadJNI;
+import org.photonvision.common.LoadJNI.JNITypes;
 import org.photonvision.common.configuration.NeuralNetworkModelManager;
 import org.photonvision.common.configuration.PhotonConfiguration;
 import org.photonvision.common.dataflow.networktables.NetworkTablesManager;
@@ -52,8 +53,8 @@ public static UIPhotonConfiguration programStateToUi(PhotonConfiguration c) {
                         new UIGeneralSettings(
                                 PhotonVersion.versionString,
                                 // TODO add support for other types of GPU accel
-                                LoadJNI.JNITypes.LIBCAMERA.hasLoaded() ? "Zerocopy Libcamera Working" : "",
-                                LoadJNI.JNITypes.MRCAL.hasLoaded(),
+                                LoadJNI.hasLoaded(JNITypes.LIBCAMERA) ? "Zerocopy Libcamera Working" : "",
+                                LoadJNI.hasLoaded(JNITypes.MRCAL),
                                 c.neuralNetworkPropertyManager().getModels(),
                                 NeuralNetworkModelManager.getInstance().getSupportedBackends(),
                                 c.getHardwareConfig().deviceName.isEmpty()

photon-core/src/main/java/org/photonvision/vision/pipe/impl/Calibrate3dPipe.java

@@ -28,6 +28,7 @@
 import org.opencv.core.*;
 import org.opencv.imgcodecs.Imgcodecs;
 import org.photonvision.common.LoadJNI;
+import org.photonvision.common.LoadJNI.JNITypes;
 import org.photonvision.common.logging.LogGroup;
 import org.photonvision.common.logging.Logger;
 import org.photonvision.common.util.math.MathUtils;
@@ -94,7 +95,7 @@ protected CameraCalibrationCoefficients process(CalibrationInput in) {
         CameraCalibrationCoefficients ret;
         var start = System.nanoTime();
 
-        if (LoadJNI.JNITypes.MRCAL.hasLoaded() && params.useMrCal) {
+        if (LoadJNI.hasLoaded(JNITypes.MRCAL) && params.useMrCal) {
             logger.debug("Calibrating with mrcal!");
             ret =
                     calibrateMrcal(

photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java

@@ -28,6 +28,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import org.photonvision.common.LoadJNI;
+import org.photonvision.common.LoadJNI.JNITypes;
 import org.photonvision.common.configuration.CameraConfiguration;
 import org.photonvision.common.configuration.ConfigManager;
 import org.photonvision.common.dataflow.DataChangeService;
@@ -301,7 +302,7 @@ protected List<PVCameraInfo> getConnectedCameras() {
                 .filter(c -> !(String.join("", c.otherPaths()).contains("csi-video")))
                 .filter(c -> !c.name().equals("unicam"))
                 .forEach(cameraInfos::add);
-        if (LoadJNI.JNITypes.LIBCAMERA.hasLoaded()) {
+        if (LoadJNI.hasLoaded(JNITypes.LIBCAMERA)) {
             // find all CSI cameras (Raspberry Pi cameras)
             Stream.of(LibCameraJNI.getCameraNames())
                     .map(