[更新]NyARToolkit/nyatlaブランチ

[nyartoolkit-and/nyartoolkit-and.git] / src / jp / nyatla / nyartoolkit / core / transmat / NyARTransMatResult.java

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
index 2d7e58a..9486227 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
@@ -32,8 +32,9 @@
 package jp.nyatla.nyartoolkit.core.transmat;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARMat;\r
-import jp.nyatla.nyartoolkit.detector.*;\r
+import jp.nyatla.nyartoolkit.core.*;\r
+import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
+import jp.nyatla.nyartoolkit.core.types.*;\r
 \r
 /**\r
  * NyARTransMat戻り値専用のNyARMat\r
@@ -67,26 +68,26 @@ public class NyARTransMatResult extends NyARMat
         * @param i_off\r
         * @param i_trans\r
         */\r
-       public void updateMatrixValue(NyARRotMatrix i_rot, double[] i_off, double[] i_trans)\r
+       public void updateMatrixValue(NyARRotMatrix i_rot, NyARDoublePoint3d i_off, NyARDoublePoint3d i_trans)\r
        {\r
                double[] pa;\r
                pa = this.m[0];\r
                pa[0] = i_rot.m00;\r
                pa[1] = i_rot.m01;\r
                pa[2] = i_rot.m02;\r
-               pa[3] = i_rot.m00 * i_off[0] + i_rot.m01 * i_off[1] + i_rot.m02 * i_off[2] + i_trans[0];\r
+               pa[3] = i_rot.m00 * i_off.x + i_rot.m01 * i_off.y + i_rot.m02 * i_off.z + i_trans.x;\r
 \r
                pa = this.m[1];\r
                pa[0] = i_rot.m10;\r
                pa[1] = i_rot.m11;\r
                pa[2] = i_rot.m12;\r
-               pa[3] = i_rot.m10 * i_off[0] + i_rot.m11 * i_off[1] + i_rot.m12 * i_off[2] + i_trans[1];\r
+               pa[3] = i_rot.m10 * i_off.x + i_rot.m11 * i_off.y + i_rot.m12 * i_off.z + i_trans.y;\r
 \r
                pa = this.m[2];\r
                pa[0] = i_rot.m20;\r
                pa[1] = i_rot.m21;\r
                pa[2] = i_rot.m22;\r
-               pa[3] = i_rot.m20 * i_off[0] + i_rot.m21 * i_off[1] + i_rot.m22 * i_off[2] + i_trans[2];\r
+               pa[3] = i_rot.m20 * i_off.x + i_rot.m21 * i_off.y + i_rot.m22 * i_off.z + i_trans.z;\r
 \r
                this.has_value = true;\r
                return;\r