[更新]NyARToolkit for Java

コミットミス追加
1.NyARCode,NyARPattのデータフォーマット標準化
2.パターンマッチ処理の最適化
3.NyARPattの最適化

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

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java
index 13baa54..5d16323 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java
@@ -171,7 +171,7 @@ public class NyARSingleDetectMarker_Quad
                this._detected_square = (NyARSquare)l_square_list.getItem(square_index);\r
                this._detected_direction = direction;\r
                this._detected_confidence = confidence;\r
-               return false;\r
+               return result;\r
        }\r
 \r
        /**\r

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
index e5b2875..d81288c 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
@@ -141,6 +141,7 @@ public class NyARSingleDetectMarker_X2
                if (number_of_square < 1) {\r
                        return false;\r
                }\r
+               boolean result=false;\r
                NyARMatchPattResult mr=this.__detectMarkerLite_mr;\r
                int square_index = 0;\r
                int direction = NyARSquare.DIRECTION_UNKNOWN;\r
@@ -162,13 +163,14 @@ public class NyARSingleDetectMarker_X2
                        square_index = i;\r
                        direction = mr.direction;\r
                        confidence = c2;\r
+                       result=true;\r
                }\r
                \r
                // マーカー情報を保存\r
                this._detected_square = (NyARSquare)l_square_list.getItem(square_index);\r
                this._detected_direction = direction;\r
                this._detected_confidence = confidence;\r
-               return true;\r
+               return result;\r
        }\r
 \r
        /**\r