RMat44: delete the new multiply3x3 method (not in DMat44)

stephengold · Feb 23, 2025 · a00c48a · a00c48a
1 parent 7295792
commit a00c48a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 44 deletions.
diff --git a/src/main/java/com/github/stephengold/joltjni/RMat44.java b/src/main/java/com/github/stephengold/joltjni/RMat44.java
@@ -407,23 +407,6 @@ public RMat44 multiply(RMat44Arg right) {
         return result;
     }
 
-    /**
-     * Multiply the current 3x3 matrix by the specified 3x3 matrix. The current
-     * matrix is unaffected.
-     *
-     * @param right the right factor (not null, unaffected)
-     * @return a new matrix
-     */
-    @Override
-    public RMat44 multiply3x3(RMat44Arg right) {
-        long leftVa = va();
-        long rightVa = right.targetVa();
-        long productVa = multiply3x3(leftVa, rightVa);
-        RMat44 result = new RMat44(productVa, true);
-
-        return result;
-    }
-
     /**
      * Multiply the 3x3 matrix by the specified column vector. The matrix is
      * unaffected.
@@ -611,8 +594,6 @@ native private static void getQuaternion(
 
     native private static void multiply3x3(long matrixVa, float[] tmpFloats);
 
-    native private static long multiply3x3(long leftVa, long rightVa);
-
     native private static void multiply3x3Transposed(
             long matrixVa, float[] tmpFloats);
 

diff --git a/src/main/java/com/github/stephengold/joltjni/readonly/RMat44Arg.java b/src/main/java/com/github/stephengold/joltjni/readonly/RMat44Arg.java
@@ -130,15 +130,6 @@ public interface RMat44Arg extends ConstJoltPhysicsObject {
      */
     RMat44 multiply(RMat44Arg right);
 
-    /**
-     * Multiply the current 3x3 matrix by the specified 3x3 matrix. The current
-     * matrix is unaffected.
-     *
-     * @param right the right factor (not null, unaffected)
-     * @return a new matrix
-     */
-    RMat44 multiply3x3(RMat44Arg right);
-
     /**
      * Multiply the 3x3 matrix by the specified column vector. The matrix is
      * unaffected.

diff --git a/src/main/native/glue/r/RMat44.cpp b/src/main/native/glue/r/RMat44.cpp
@@ -316,7 +316,7 @@ JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_RMat44_multiply
  * Method:    multiply3x3
  * Signature: (J[F)V
  */
-JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_RMat44_multiply3x3__J_3F
+JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_RMat44_multiply3x3
   (JNIEnv *pEnv, jclass, jlong matrixVa, jfloatArray tmpFloats) {
     const RMat44 * const pMatrix = reinterpret_cast<RMat44 *> (matrixVa);
     jboolean isCopy;
@@ -330,21 +330,6 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_RMat44_multiply3x3__J
     pEnv->ReleaseFloatArrayElements(tmpFloats, pTmpFloats, 0);
 }
 
-/*
- * Class:     com_github_stephengold_joltjni_RMat44
- * Method:    multiply3x3
- * Signature: (JJ)J
- */
-JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_RMat44_multiply3x3__JJ
-  (JNIEnv *, jclass, jlong leftVa, jlong rightVa) {
-    const RMat44 * const pLeft = reinterpret_cast<RMat44 *> (leftVa);
-    const RMat44 * const pRight = reinterpret_cast<RMat44 *> (rightVa);
-    RMat44 * const pResult = new RMat44();
-    TRACE_NEW("RMat44", pResult)
-    *pResult = pLeft->Multiply3x3(*pRight);
-    return reinterpret_cast<jlong> (pResult);
-}
-
 /*
  * Class:     com_github_stephengold_joltjni_RMat44
  * Method:    multiply3x3Transposed