[backup]NyARToolkit

+一部クラス名変更
+2.5.0候補

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@393 7cac0a50-4618-4814-88d0-24b83990f816

diff --git a/trunk/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/LabelingViewer.java b/trunk/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/LabelingViewer.java
index 4dcca3c..b53c37d 100644 (file)
--- a/trunk/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/LabelingViewer.java
+++ b/trunk/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/LabelingViewer.java
@@ -96,7 +96,7 @@ public class LabelingViewer extends Frame implements JmfCaptureListener
        /**
         * detectMarkerのコールバック関数
         */
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback
        {
                public DetectSquareCB()
                {

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector.java b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector.java
index 0bbcae6..72d701d 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector.java
@@ -35,7 +35,7 @@ import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster;
 \r
 public abstract class NyARSquareContourDetector\r
 {\r
-       public interface DetectMarkerCallback\r
+       public interface IDetectMarkerCallback\r
        {\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
@@ -45,6 +45,6 @@ public abstract class NyARSquareContourDetector
         * @param o_square_stack\r
         * @throws NyARException\r
         */\r
-       public abstract void detectMarkerCB(NyARBinRaster i_raster, DetectMarkerCallback i_callback) throws NyARException;\r
+       public abstract void detectMarkerCB(NyARBinRaster i_raster, IDetectMarkerCallback i_callback) throws NyARException;\r
 }\r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_ARToolKit.java b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_ARToolKit.java
index 272389a..91a42a2 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_ARToolKit.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_ARToolKit.java
@@ -93,7 +93,7 @@ public class NyARSquareContourDetector_ARToolKit extends NyARSquareContourDetect
         * 抽出した正方形候補を格納するリスト\r
         * @throws NyARException\r
         */\r
-       public final void detectMarkerCB(NyARBinRaster i_raster, DetectMarkerCallback i_callback) throws NyARException\r
+       public final void detectMarkerCB(NyARBinRaster i_raster, IDetectMarkerCallback i_callback) throws NyARException\r
        {\r
                final NyARLabelingImage limage = this._limage;\r
 \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_Rle.java b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_Rle.java
index 92fcffa..c4c29b8 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_Rle.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/NyARSquareContourDetector_Rle.java
@@ -83,7 +83,7 @@ public class NyARSquareContourDetector_Rle extends NyARSquareContourDetector
 \r
        private final int[] __detectMarker_mkvertex = new int[4];\r
        \r
-       public void detectMarkerCB(NyARBinRaster i_raster, DetectMarkerCallback i_callback) throws NyARException\r
+       public void detectMarkerCB(NyARBinRaster i_raster, IDetectMarkerCallback i_callback) throws NyARException\r
        {\r
                final NyARRleLabelFragmentInfoStack flagment=this._stack;\r
                final NyARLabelOverlapChecker<NyARRleLabelFragmentInfoStack.RleLabelFragmentInfo> overlap = this._overlap_checker;\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
index e32b513..d6c514a 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARCustomSingleDetectMarker.java
@@ -56,7 +56,7 @@ public class NyARCustomSingleDetectMarker
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public double confidence;\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
index f442893..e2a1db2 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
@@ -78,7 +78,7 @@ public class NyARDetectMarker
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public NyARDetectMarkerResultStack result_stack=new NyARDetectMarkerResultStack(NyARDetectMarker.AR_SQUARE_MAX);\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
index b29cf0d..f9c5d59 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleARMarkerProcesser.java
@@ -54,7 +54,7 @@ public abstract class SingleARMarkerProcesser
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public final NyARSquare square=new NyARSquare();\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
index c70e0c5..252c35b 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
@@ -41,7 +41,7 @@ public abstract class SingleNyIdMarkerProcesser
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public final NyARSquare square=new NyARSquare();\r

diff --git a/trunk/test/jp/nyatla/nyartoolkit/dev/tracking/MarkerTracking_3dTrans.java b/trunk/test/jp/nyatla/nyartoolkit/dev/tracking/MarkerTracking_3dTrans.java
index b39a5fa..bc29937 100644 (file)
--- a/trunk/test/jp/nyatla/nyartoolkit/dev/tracking/MarkerTracking_3dTrans.java
+++ b/trunk/test/jp/nyatla/nyartoolkit/dev/tracking/MarkerTracking_3dTrans.java
@@ -27,7 +27,7 @@ public class MarkerTracking_3dTrans
        /**\r
         * detectMarkerのコールバック関数\r
         */\r
-       private class DetectSquareCB implements NyARSquareContourDetector.DetectMarkerCallback\r
+       private class DetectSquareCB implements NyARSquareContourDetector.IDetectMarkerCallback\r
        {\r
                //公開プロパティ\r
                public NyARSquare square=new NyARSquare();\r