[Backup]NyARToolkit for Java

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

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotMatrixOptimize.java b/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
similarity index 92%
rename from trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotMatrixOptimize.java
rename to trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
index a51677a..e78ed78 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotMatrixOptimize.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/transmat/optimize/artoolkit/NyARRotMatrixOptimize.java
@@ -29,12 +29,12 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.transmat.optimize;\r
+package jp.nyatla.nyartoolkit.core.transmat.optimize.artoolkit;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
+import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.solver.INyARTransportVectorSolver;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
@@ -53,7 +53,7 @@ public class NyARRotMatrixOptimize implements INyARRotMatrixOptimize
                this._projection_mat_ref=i_projection_mat_ref;\r
                return;\r
        }\r
-       final public double optimize(NyARRotMatrix io_rotmat,NyARDoublePoint3d io_transvec,INyARTransportVectorSolver i_solver,NyARDoublePoint3d[] i_offset_3d,NyARDoublePoint2d[] i_2d_vertex) throws NyARException\r
+       final public double optimize(NyARRotMatrix_ARToolKit io_rotmat,NyARDoublePoint3d io_transvec,INyARTransportVectorSolver i_solver,NyARDoublePoint3d[] i_offset_3d,NyARDoublePoint2d[] i_2d_vertex) throws NyARException\r
        {\r
                double err = -1;\r
                /*ループを抜けるタイミングをARToolKitと合わせるために変なことしてます。*/\r
@@ -84,7 +84,7 @@ public class NyARRotMatrixOptimize implements INyARRotMatrixOptimize
         * @return\r
         * @throws NyARException\r
         */\r
-       public double modifyMatrix(NyARRotMatrix io_rot,NyARDoublePoint3d trans, NyARDoublePoint3d[] i_vertex3d, NyARDoublePoint2d[] i_vertex2d) throws NyARException\r
+       public double modifyMatrix(NyARRotMatrix_ARToolKit io_rot,NyARDoublePoint3d trans, NyARDoublePoint3d[] i_vertex3d, NyARDoublePoint2d[] i_vertex2d) throws NyARException\r
        {\r
                double factor;\r
                double a2, b2, c2;\r