[バックアップ]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 c5b1ed8..a199dc8 100644 (file)
--- a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
+++ b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
@@ -86,9 +86,12 @@ public class NyARSingleDetectMarker_X2
        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
                // 解析オブジェクトを作る\r
-               this._square_detect = new NyARSquareDetector_X2(i_param.getDistortionFactor(),scr_size);\r
-               this._transmat = new NyARTransMat_X2(i_param);\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
                // 比較コードを保存\r
                this._code = i_code;\r
                this._marker_width = i_marker_width;\r
@@ -104,6 +107,7 @@ public class NyARSingleDetectMarker_X2
        private NyARBinRaster _bin_raster;\r
        private NyARRasterFilter_ARToolkitThreshold _tobin_filter=new NyARRasterFilter_ARToolkitThreshold(100);\r
 \r
+       \r
        /**\r
         * i_imageにマーカー検出処理を実行し、結果を記録します。\r
         * \r
@@ -120,7 +124,7 @@ public class NyARSingleDetectMarker_X2
                        throw new NyARException();\r
                }\r
 \r
-               //ラスタを２値イメージに変換する.\r
+               //ラスタを(1/4の画像の)２値イメージに変換する.\r
                this._tobin_filter.setThreshold(i_threshold);\r
                this._tobin_filter.doFilter(i_raster,this._bin_raster);\r
                \r