[backup]NyARToolkit

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

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java
index 04f85fe..3b381d6 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java
@@ -50,10 +50,10 @@ public class NyARSquareDetector_X2 extends NyARSquareContourDetector
        private final int _width;\r
        private final int _height;\r
 \r
-       private final LabelOverlapChecker<RleLabelFragmentInfoStack.RleLabelFragmentInfo> _overlap_checker = new LabelOverlapChecker<RleLabelFragmentInfoStack.RleLabelFragmentInfo>(32,RleLabelFragmentInfoStack.RleLabelFragmentInfo.class);\r
+       private final NyARLabelOverlapChecker<NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo> _overlap_checker = new NyARLabelOverlapChecker<NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo>(32,NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo.class);\r
        private final SquareContourDetector_X2 _sqconvertor;\r
-       private final ContourPickup _cpickup=new ContourPickup();\r
-       private final RleLabelFragmentInfoStack _stack;\r
+       private final NyARContourPickup _cpickup=new NyARContourPickup();\r
+       private final NyARRleLabelFragmentInfoStack _stack;\r
 \r
        \r
        \r
@@ -69,7 +69,7 @@ public class NyARSquareDetector_X2 extends NyARSquareContourDetector
                this._height = i_size.h;\r
                this._labeling = new NyARLabeling_Rle(this._width,this._height);\r
                this._sqconvertor=new SquareContourDetector_X2(i_size,i_dist_factor_ref);\r
-               this._stack=new RleLabelFragmentInfoStack(i_size.w*i_size.h*2048/(320*240)+32);//検出可能な最大ラベル数\r
+               this._stack=new NyARRleLabelFragmentInfoStack(i_size.w*i_size.h*2048/(320*240)+32);//検出可能な最大ラベル数\r
                \r
 \r
                // 輪郭の最大長は画面に映りうる最大の長方形サイズ。\r
@@ -97,8 +97,8 @@ public class NyARSquareDetector_X2 extends NyARSquareContourDetector
         */\r
        public final void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException\r
        {\r
-               final RleLabelFragmentInfoStack flagment=this._stack;\r
-               final LabelOverlapChecker<RleLabelFragmentInfoStack.RleLabelFragmentInfo> overlap = this._overlap_checker;\r
+               final NyARRleLabelFragmentInfoStack flagment=this._stack;\r
+               final NyARLabelOverlapChecker<NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo> overlap = this._overlap_checker;\r
 \r
                // 初期化\r
 \r
@@ -112,7 +112,7 @@ public class NyARSquareDetector_X2 extends NyARSquareContourDetector
                }\r
                //ラベルをソートしておく\r
                flagment.sortByArea();\r
-               RleLabelFragmentInfoStack.RleLabelFragmentInfo[] labels=flagment.getArray();\r
+               NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo[] labels=flagment.getArray();\r
 \r
 \r
                final int xsize = this._width;\r
@@ -125,7 +125,7 @@ public class NyARSquareDetector_X2 extends NyARSquareContourDetector
                overlap.setMaxLabels(label_num);\r
 \r
                for (int i=0; i < label_num; i++) {\r
-                       final RleLabelFragmentInfoStack.RleLabelFragmentInfo label_pt=labels[i];\r
+                       final NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo label_pt=labels[i];\r
                        final int label_area = label_pt.area;\r
 \r
                        // クリップ領域が画面の枠に接していれば除外\r