[バックアップ]NyARToolkit

[nyartoolkit-and/nyartoolkit-and.git] / sample / sandbox / jp / nyatla / nyartoolkit / sandbox / x2 / NyARSingleDetectMarker_X2.java

diff --git a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
index a199dc8..93b3a64 100644 (file)
--- a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
+++ b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
@@ -85,13 +85,12 @@ public class NyARSingleDetectMarker_X2
         */\r
        public NyARSingleDetectMarker_X2(NyARParam i_param, NyARCode i_code, double i_marker_width) throws NyARException\r
        {\r
-               final NyARIntSize scr_size=i_param.getScreenSize();             \r
-               final NyARFixedFloatCameraDistortionFactorMap dist_factor_map=new NyARFixedFloatCameraDistortionFactorMap(i_param.getDistortionFactor(),scr_size);\r
+               final NyARIntSize scr_size=i_param.getScreenSize();     \r
+        final NyARFixedFloatObserv2IdealMap dist_map = new NyARFixedFloatObserv2IdealMap(i_param.getDistortionFactor(), scr_size);\r
+               \r
                // 解析オブジェクトを作る\r
-//             this._square_detect = new NyARSquareDetector_X2(dist_factor_map,scr_size);\r
-//             this._transmat = new NyARTransMat_X2(i_param,dist_factor_map);\r
-               this._square_detect = new NyARSquareDetector(i_param.getDistortionFactor(),scr_size);\r
-               this._transmat = new NyARTransMat_X2(i_param,dist_factor_map);\r
+               this._square_detect = new NyARSquareDetector_X2(dist_map,scr_size);\r
+               this._transmat = new NyARTransMat_X2(i_param);\r
                // 比較コードを保存\r
                this._code = i_code;\r
                this._marker_width = i_marker_width;\r