Merge branch 'master' into opencv-dnn

PhotonVision · Oct 9, 2023 · c503958 · c503958
2 parents 4c887e6 + 6e8e3a0
commit c503958
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/photon-lib/src/main/java/org/photonvision/estimation/OpenCVHelp.java b/photon-lib/src/main/java/org/photonvision/estimation/OpenCVHelp.java
@@ -27,7 +27,7 @@
 import edu.wpi.first.math.Matrix;
 import edu.wpi.first.math.Nat;
 import edu.wpi.first.math.Num;
-import edu.wpi.first.math.Vector;
+import edu.wpi.first.math.VecBuilder;
 import edu.wpi.first.math.geometry.Pose3d;
 import edu.wpi.first.math.geometry.Rotation3d;
 import edu.wpi.first.math.geometry.Transform3d;
@@ -142,16 +142,15 @@ public static MatOfPoint3f rotationToRvec(Rotation3d rotation) {
      * @param rvecInput The rvec to create a Rotation3d from
      */
     public static Rotation3d rvecToRotation(Mat rvecInput) {
+        // Get the 'rodriguez' (axis-angle, where the norm is the angle about the normalized direction
+        // of the vector)
         float[] data = new float[3];
         var wrapped = new Mat(rvecInput.rows(), rvecInput.cols(), CvType.CV_32F);
         rvecInput.convertTo(wrapped, CvType.CV_32F);
         wrapped.get(0, 0, data);
         wrapped.release();
-        Vector<N3> axis = new Vector<>(Nat.N3());
-        axis.set(0, 0, data[0]);
-        axis.set(1, 0, data[1]);
-        axis.set(2, 0, data[2]);
-        return rotationEDNtoNWU(new Rotation3d(axis.div(axis.norm()), axis.norm()));
+
+        return rotationEDNtoNWU(new Rotation3d(VecBuilder.fill(data[0], data[1], data[2])));
     }
 
     public static Point avgPoint(Point[] points) {