[backup]NyARToolkit

[nyartoolkit-and/nyartoolkit-and.git] / trunk / src / jp / nyatla / nyartoolkit / detector / NyARDetectMarker.java

diff --git a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
index 4aeab43..e2a1db2 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
@@ -39,12 +39,12 @@ import jp.nyatla.nyartoolkit.core.raster.*;
 import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.*;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.*;\r
-import jp.nyatla.nyartoolkit.core.squaredetect.Coord2Linear;\r
-import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareContourDetector;\r
+import jp.nyatla.nyartoolkit.core.squaredetect.NyARCoord2Linear;\r
+import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareContourDetector;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare;\r
 import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareContourDetector_Rle;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.types.stack.NyObjectStack;\r
+import jp.nyatla.nyartoolkit.core.types.stack.NyARObjectStack;\r
 \r
 class NyARDetectMarkerResult\r
 {\r
@@ -55,7 +55,7 @@ class NyARDetectMarkerResult
 }\r
 \r
 \r
-class NyARDetectMarkerResultStack extends NyObjectStack<NyARDetectMarkerResult>\r
+class NyARDetectMarkerResultStack extends NyARObjectStack<NyARDetectMarkerResult>\r
 {\r
        public NyARDetectMarkerResultStack(int i_length) throws NyARException\r
        {\r
@@ -78,7 +78,7 @@ public class NyARDetectMarker
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements INyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public NyARDetectMarkerResultStack result_stack=new NyARDetectMarkerResultStack(NyARDetectMarker.AR_SQUARE_MAX);\r
@@ -89,7 +89,7 @@ public class NyARDetectMarker
                private NyARMatchPattDeviationColorData _deviation_data;\r
                private NyARMatchPatt_Color_WITHOUT_PCA[] _match_patt;\r
                private final NyARMatchPattResult __detectMarkerLite_mr=new NyARMatchPattResult();\r
-               private Coord2Linear _coordline;\r
+               private NyARCoord2Linear _coordline;\r
                \r
                public DetectSquareCB(INyARColorPatt i_inst_patt,NyARCode[] i_ref_code,int i_num_of_code,NyARParam i_param) throws NyARException\r
                {\r
@@ -97,7 +97,7 @@ public class NyARDetectMarker
                        final int ch = i_ref_code[0].getHeight();\r
 \r
                        this._inst_patt=i_inst_patt;\r
-                       this._coordline=new Coord2Linear(i_param.getScreenSize(),i_param.getDistortionFactor());\r
+                       this._coordline=new NyARCoord2Linear(i_param.getScreenSize(),i_param.getDistortionFactor());\r
                        this._deviation_data=new NyARMatchPattDeviationColorData(cw,ch);\r
 \r
                        //NyARMatchPatt_Color_WITHOUT_PCA[]の作成\r
@@ -117,7 +117,7 @@ public class NyARDetectMarker
                 * 矩形が見付かるたびに呼び出されます。\r
                 * 発見した矩形のパターンを検査して、方位を考慮した頂点データを確保します。\r
                 */\r
-               public void onSquareDetect(INyARSquareContourDetector i_sender,int[] i_coordx,int[] i_coordy,int i_coor_num,int[] i_vertex_index) throws NyARException\r
+               public void onSquareDetect(NyARSquareContourDetector i_sender,int[] i_coordx,int[] i_coordy,int i_coor_num,int[] i_vertex_index) throws NyARException\r
                {\r
                        NyARMatchPattResult mr=this.__detectMarkerLite_mr;\r
                        //輪郭座標から頂点リストに変換\r
@@ -186,7 +186,7 @@ public class NyARDetectMarker
        \r
        private static final int AR_SQUARE_MAX = 300;\r
        private boolean _is_continue = false;\r
-       private INyARSquareContourDetector _square_detect;\r
+       private NyARSquareContourDetector _square_detect;\r
        protected INyARTransMat _transmat;\r
        private NyARRectOffset[] _offset;       \r
 \r
@@ -247,7 +247,7 @@ public class NyARDetectMarker
        \r
        private NyARBinRaster _bin_raster;\r
 \r
-       private INyARRasterFilter_RgbToBin _tobin_filter;\r
+       private INyARRasterFilter_Rgb2Bin _tobin_filter;\r
 \r
        /**\r
         * i_imageにマーカー検出処理を実行し、結果を記録します。\r