[更新]NyARToolkit

[nyartoolkit-and/nyartoolkit-and.git] / trunk / src / jp / nyatla / nyartoolkit / core / transmat / optimize / NyARRotTransOptimize_O2.java

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize_O2.java b/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize_O2.java
index 8e7447a..c322f48 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize_O2.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize_O2.java
@@ -76,11 +76,9 @@ public class NyARRotTransOptimize_O2 implements INyARRotTransOptimize
        }\r
        \r
        private final double[][] __modifyMatrix_double1D = new double[8][3];\r
-       private final NyARDoublePoint3d __modifyMatrix_angle = new NyARDoublePoint3d(); \r
        /**\r
         * arGetRot計算を階層化したModifyMatrix 896\r
         * \r
-        * @param nyrot\r
         * @param trans\r
         * @param i_vertex3d\r
         * [m][3]\r
@@ -137,7 +135,6 @@ public class NyARRotTransOptimize_O2 implements INyARRotTransOptimize
                double SACASC, SACACBSC, SACACBCC, SACACC;\r
                final double[][] double1D = this.__modifyMatrix_double1D;\r
 \r
-               final NyARDoublePoint3d angle = this.__modifyMatrix_angle;\r
                final double[] a_factor = double1D[1];\r
                final double[] sinb = double1D[2];\r
                final double[] cosb = double1D[3];\r
@@ -148,7 +145,7 @@ public class NyARRotTransOptimize_O2 implements INyARRotTransOptimize
                double w, w2;\r
                double wsin, wcos;\r
                \r
-               io_rot.getAngle(angle);// arGetAngle( rot, &a, &b, &c );\r
+               final NyARDoublePoint3d angle = io_rot.refAngle();\r
                a2 = angle.x;\r
                b2 = angle.y;\r
                c2 = angle.z;\r