[Backup]NyARToolkit[Backup]NyARToolkit for Java

偏微分フィッティングの為の調整

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
index 074bc66..271b69a 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
@@ -33,7 +33,7 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare;\r
 import jp.nyatla.nyartoolkit.core.transmat.solver.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.optimize.NyARPartialDifferentiationOptimize;\r
+import jp.nyatla.nyartoolkit.core.transmat.optimize.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.*;\r
@@ -72,7 +72,7 @@ public class NyARTransMat implements INyARTransMat
        {\r
                final NyARCameraDistortionFactor dist=i_param.getDistortionFactor();\r
                final NyARPerspectiveProjectionMatrix pmat=i_param.getPerspectiveProjectionMatrix();\r
-               this._transsolver=new NyARTransportVectorSolver_ARToolKit(pmat);\r
+               this._transsolver=new NyARTransportVectorSolver(pmat,4);\r
                //互換性が重要な時は、NyARRotMatrix_ARToolKitを使うこと。\r
                //理屈はNyARRotMatrix_NyARToolKitもNyARRotMatrix_ARToolKitも同じだけど、少しだけ値がずれる。\r
                this._rotmatrix = new NyARRotMatrix(pmat);\r

diff --git a/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java b/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
index ea7b750..cc99f97 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
+++ b/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
@@ -25,7 +25,6 @@
 package jp.nyatla.nyartoolkit.processor;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r