OSDN Git Service

[更新]NyARToolkit/2.1
authornyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Mon, 27 Oct 2008 15:19:44 +0000 (15:19 +0000)
committernyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Mon, 27 Oct 2008 15:19:44 +0000 (15:19 +0000)
readme.ja.txt
sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatIdeal2Observ.java [new file with mode: 0644]
sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatVertexCounter.java [new file with mode: 0644]
sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java

index 8c369da..c08e897 100644 (file)
@@ -1,7 +1,7 @@
 ARToolKit Java class library NyARToolkit.\r
 Copyright (C)2008 R.Iizuka\r
 \r
-version 2.0.0\r
+version 2.1.0\r
 \r
 http://nyatla.jp/nyartoolkit/\r
 airmail(at)ebony.plala.or.jp\r
@@ -10,13 +10,14 @@ airmail(at)ebony.plala.or.jp
 \r
 \r
 \r
-・NyARToolkit/2.0\r
+・NyARToolkit/2.1\r
 \r
 NyARToolkitは、Pure Javaで実装したARToolKitクラスライブラリです。\r
 \r
 ARToolKit 2.72.1をベースに構築されています。\r
 \r
-NyARToolkit/1.xと比較し、構造的な最適化がされ、可読性が向上しています。\r
+NyARToolkit/2.0系は、NyARToolkit/1.xと比較して構造的な最適化がされており、\r
+可読性と分離性が向上しています。\r
 \r
 \r
 \r
index 387fb4c..0433686 100644 (file)
@@ -12,7 +12,7 @@ import jp.nyatla.nyartoolkit.core.labeling.NyARLabelingLabelStack;
 import jp.nyatla.nyartoolkit.core.labeling.NyARLabeling_ARToolKit;\r
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
 import jp.nyatla.nyartoolkit.core.pca2d.INyARPca2d;\r
-import jp.nyatla.nyartoolkit.core.pca2d.NyARPca2d_MatrixPCA_O2;\r
+import jp.nyatla.nyartoolkit.core.pca2d.*;\r
 import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntPoint;\r
@@ -38,7 +38,8 @@ public class NyARQrCodeDetector implements INyARSquareDetector
        private final NyARLabelingImage _limage;\r
 \r
        private final NyARCameraDistortionFactor _dist_factor_ref;\r
-\r
+       private final double[] _xpos;\r
+       private final double[] _ypos;\r
        /**\r
         * 最大i_squre_max個のマーカーを検出するクラスを作成する。\r
         * \r
@@ -61,6 +62,9 @@ public class NyARQrCodeDetector implements INyARSquareDetector
                this._max_coord = number_of_coord;\r
                this._xcoord = new int[number_of_coord * 2];\r
                this._ycoord = new int[number_of_coord * 2];\r
+               this._xpos=new double[this._width+this._height];//最大辺長はthis._width+this._height\r
+               this._ypos=new double[this._width+this._height];//最大辺長はthis._width+this._height\r
+               \r
        }\r
 \r
        private final int _max_coord;\r
@@ -216,7 +220,7 @@ public class NyARQrCodeDetector implements INyARSquareDetector
                return;\r
        }\r
        private static int MAX_COORD_NUM=(320+240)*2;//サイズの1/2の長方形の編程度が目安(VGAなら(320+240)*2)\r
-       private final INyARPca2d _pca=new NyARPca2d_MatrixPCA_O2(MAX_COORD_NUM);\r
+       private final INyARPca2d _pca=new NyARPca2d_MatrixPCA_O2();\r
        private final NyARDoubleMatrix22 __getSquareLine_evec=new NyARDoubleMatrix22();\r
        private final NyARDoublePoint2d __getSquareLine_mean=new NyARDoublePoint2d();\r
        private final NyARDoublePoint2d __getSquareLine_ev=new NyARDoublePoint2d();\r
@@ -228,7 +232,6 @@ public class NyARQrCodeDetector implements INyARSquareDetector
         */\r
        private boolean getSquareLine(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARLinear[] o_line,NyARIntPoint[] o_imvertex) throws NyARException\r
        {\r
-               final NyARCameraDistortionFactor dist_factor=this._dist_factor_ref;  \r
                final NyARDoubleMatrix22 evec=this.__getSquareLine_evec;\r
                final NyARDoublePoint2d mean=this.__getSquareLine_mean;\r
                final NyARDoublePoint2d ev=this.__getSquareLine_ev;\r
@@ -243,8 +246,11 @@ public class NyARQrCodeDetector implements INyARSquareDetector
                                // nが2以下、又はMAX_COORD_NUM以上なら主成分分析をしない。\r
                                return false;\r
                        }\r
+                       //配列作成\r
+                       this._dist_factor_ref.observ2IdealBatch(i_xcoord, i_ycoord, st, n,this._xpos,this._ypos);\r
+                       \r
                        //主成分分析する。\r
-                       this._pca.pcaWithDistortionFactor(i_xcoord, i_ycoord, st, n,dist_factor, evec, ev,mean);\r
+                       this._pca.pca(this._xpos,this._ypos,n,evec, ev,mean);\r
                        final NyARLinear l_line_i = o_line[i];\r
                        l_line_i.run = evec.m01;// line[i][0] = evec->m[1];\r
                        l_line_i.rise = -evec.m00;// line[i][1] = -evec->m[0];\r
index 4d696fd..f22b964 100644 (file)
@@ -35,9 +35,11 @@ import jp.nyatla.nyartoolkit.core.labeling.*;
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
-import jp.nyatla.nyartoolkit.core.types.matrix.*;\r
-import jp.nyatla.nyartoolkit.core.pca2d.*;\r
-import jp.nyatla.nyartoolkit.core2.pca2d.NyARPca2d_SamplingPCA;\r
+\r
+\r
+import jp.nyatla.nyartoolkit.core2.types.NyARI64Linear;\r
+import jp.nyatla.nyartoolkit.core2.types.NyARI64Point2d;\r
+import jp.nyatla.nyartoolkit.core2.types.matrix.NyARI64Matrix22;\r
 import jp.nyatla.nyartoolkit.core.*;\r
 import jp.nyatla.nyartoolkit.sandbox.x2.*;\r
 \r
@@ -48,408 +50,463 @@ import jp.nyatla.nyartoolkit.sandbox.x2.*;
  */\r
 public class NyARSquareDetector_Quad implements INyARSquareDetector\r
 {\r
-       private static final double VERTEX_FACTOR = 1.0;// 線検出のファクタ\r
-\r
-       private static final int AR_AREA_MAX = 25000;// #define AR_AREA_MAX 100000\r
-\r
-       private static final int AR_AREA_MIN = 20;// #define AR_AREA_MIN 70\r
-       private final int _width;\r
-       private final int _height;\r
-\r
-       private final INyARLabeling _labeling;\r
-\r
-       private final NyARLabelingImage _limage;\r
-\r
-       private final OverlapChecker _overlap_checker = new OverlapChecker();\r
-       private final NyARCameraDistortionFactor _dist_factor=new NyARCameraDistortionFactor();\r
-\r
-       /**\r
-        * 最大i_squre_max個のマーカーを検出するクラスを作成する。\r
-        * \r
-        * @param i_param\r
-        */\r
-       public NyARSquareDetector_Quad(NyARCameraDistortionFactor i_dist_factor_ref,NyARIntSize i_size) throws NyARException\r
-       {\r
-               this._width = i_size.w/2;\r
-               this._height = i_size.h/2;\r
-               this._labeling = new NyARLabeling_ARToolKit_X2();\r
-               this._limage = new NyARLabelingImage(this._width, this._height);\r
-               this._labeling.attachDestination(this._limage);\r
-\r
-               // 輪郭の最大長は画面に映りうる最大の長方形サイズ。\r
-               int number_of_coord = (this._width + this._height) * 2;\r
-\r
-               // 輪郭バッファは頂点変換をするので、輪郭バッファの2倍取る。\r
-               this._max_coord = number_of_coord;\r
-               this._xcoord = new int[number_of_coord * 2];\r
-               this._ycoord = new int[number_of_coord * 2];\r
-               //PCA\r
-               this._pca=new NyARPca2d_SamplingPCA(20);\r
-               //内部的に1/4のサイズで取り扱う\r
-               this._dist_factor.copyFrom(i_dist_factor_ref);\r
-               this._dist_factor.changeScale(0.5);\r
-               \r
-       }\r
-\r
-       private final int _max_coord;\r
-       private final int[] _xcoord;\r
-       private final int[] _ycoord;\r
-\r
-       private void normalizeCoord(int[] i_coord_x, int[] i_coord_y, int i_index, int i_coord_num)\r
-       {\r
-               // vertex1を境界にして、後方に配列を連結\r
-               System.arraycopy(i_coord_x, 1, i_coord_x, i_coord_num, i_index);\r
-               System.arraycopy(i_coord_y, 1, i_coord_y, i_coord_num, i_index);\r
-       }\r
-\r
-       private final int[] __detectMarker_mkvertex = new int[5];\r
-\r
-       /**\r
-        * arDetectMarker2を基にした関数\r
-        * この関数はNyARSquare要素のうち、directionを除くパラメータを取得して返します。\r
-        * directionの確定は行いません。\r
-        * @param i_raster\r
-        * 解析する2値ラスタイメージを指定します。\r
-        * @param o_square_stack\r
-        * 抽出した正方形候補を格納するリスト\r
-        * @throws NyARException\r
-        */\r
-       public final void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException\r
-       {\r
-               final INyARLabeling labeling_proc = this._labeling;\r
-               final NyARLabelingImage limage = this._limage;\r
-\r
-               // 初期化\r
-\r
-               // マーカーホルダをリセット\r
-               o_square_stack.clear();\r
-\r
-               // ラベリング\r
-               labeling_proc.labeling(i_raster);\r
-\r
-               // ラベル数が0ならここまで\r
-               final int label_num = limage.getLabelStack().getLength();\r
-               if (label_num < 1) {\r
-                       return;\r
-               }\r
-\r
-               final NyARLabelingLabelStack stack = limage.getLabelStack();\r
-               final NyARLabelingLabel[] labels = (NyARLabelingLabel[])stack.getArray();\r
-               \r
-               \r
-               // ラベルを大きい順に整列\r
-               stack.sortByArea();\r
-\r
-               // デカいラベルを読み飛ばし\r
-               int i;\r
-               for (i = 0; i < label_num; i++) {\r
-                       // 検査対象内のラベルサイズになるまで無視\r
-                       if (labels[i].area <= AR_AREA_MAX) {\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               final int xsize = this._width;\r
-               final int ysize = this._height;\r
-               final int[] xcoord = this._xcoord;\r
-               final int[] ycoord = this._ycoord;\r
-               final int coord_max = this._max_coord;\r
-               final int[] mkvertex = this.__detectMarker_mkvertex;\r
-               final OverlapChecker overlap = this._overlap_checker;\r
-               int coord_num;\r
-               int label_area;\r
-               NyARLabelingLabel label_pt;\r
-\r
-               //重なりチェッカの最大数を設定\r
-               overlap.reset(label_num);\r
-\r
-               for (; i < label_num; i++) {\r
-                       label_pt = labels[i];\r
-                       label_area = label_pt.area;\r
-                       // 検査対象サイズよりも小さくなったら終了\r
-                       if (label_area < AR_AREA_MIN) {\r
-                               break;\r
-                       }\r
-                       // クリップ領域が画面の枠に接していれば除外\r
-                       if (label_pt.clip_l == 1 || label_pt.clip_r == xsize - 2) {// if(wclip[i*4+0] == 1 || wclip[i*4+1] ==xsize-2){\r
-                               continue;\r
-                       }\r
-                       if (label_pt.clip_t == 1 || label_pt.clip_b == ysize - 2) {// if( wclip[i*4+2] == 1 || wclip[i*4+3] ==ysize-2){\r
-                               continue;\r
-                       }\r
-                       // 既に検出された矩形との重なりを確認\r
-                       if (!overlap.check(label_pt)) {\r
-                               // 重なっているようだ。\r
-                               continue;\r
-                       }\r
-\r
-                       // 輪郭を取得\r
-                       coord_num = limage.getContour(i, coord_max, xcoord, ycoord);\r
-                       if (coord_num == coord_max) {\r
-                               // 輪郭が大きすぎる。\r
-                               continue;\r
-                       }\r
-                       //頂点候補のインデクスを取得\r
-                       final int vertex1 = scanVertex(xcoord, ycoord, coord_num);\r
-\r
-                       // 頂点候補(vertex1)を先頭に並べなおした配列を作成する。\r
-                       normalizeCoord(xcoord, ycoord, vertex1, coord_num);\r
-\r
-                       // 領域を準備する。\r
-                       NyARSquare square_ptr = (NyARSquare)o_square_stack.prePush();\r
-\r
-                       // 頂点情報を取得\r
-                       if (!getSquareVertex(xcoord, ycoord, vertex1, coord_num, label_area, mkvertex)) {\r
-                               o_square_stack.pop();// 頂点の取得が出来なかったので破棄\r
-                               continue;\r
-                       }\r
-                       // マーカーを検出\r
-                       if (!getSquareLine(mkvertex, xcoord, ycoord, square_ptr)) {\r
-                               // 矩形が成立しなかった。\r
-                               o_square_stack.pop();\r
-                               continue;\r
-                       }\r
-                       // 検出済の矩形の属したラベルを重なりチェックに追加する。\r
-                       overlap.push(label_pt);\r
-               }       \r
-               return;\r
-       }\r
-\r
-       /**\r
-        * 辺からの対角線が最長になる点を対角線候補として返す。\r
-        * \r
-        * @param i_xcoord\r
-        * @param i_ycoord\r
-        * @param i_coord_num\r
-        * @return\r
-        */\r
-       private int scanVertex(int[] i_xcoord, int[] i_ycoord, int i_coord_num)\r
-       {\r
-               final int sx = i_xcoord[0];\r
-               final int sy = i_ycoord[0];\r
-               int d = 0;\r
-               int w, x, y;\r
-               int ret = 0;\r
-               for (int i = 1; i < i_coord_num; i++) {\r
-                       x = i_xcoord[i] - sx;\r
-                       y = i_ycoord[i] - sy;\r
-                       w = x * x + y * y;\r
-                       if (w > d) {\r
-                               d = w;\r
-                               ret = i;\r
-                       }\r
-                       // ここでうまく終了条件入れられないかな。\r
-               }\r
-               return ret;\r
-       }\r
-\r
-       private final NyARFixedFloatVertexCounter __getSquareVertex_wv1 = new NyARFixedFloatVertexCounter();\r
-\r
-       private final NyARFixedFloatVertexCounter __getSquareVertex_wv2 = new NyARFixedFloatVertexCounter();\r
-\r
-       /**\r
-        * static int arDetectMarker2_check_square( int area, ARMarkerInfo2 *marker_info2, double factor ) 関数の代替関数 OPTIMIZED STEP [450->415] o_squareに頂点情報をセットします。\r
-        * \r
-        * @param i_x_coord\r
-        * @param i_y_coord\r
-        * @param i_vertex1_index\r
-        * @param i_coord_num\r
-        * @param i_area\r
-        * @param o_vertex\r
-        * 要素数はint[4]である事\r
-        * @return\r
-        */\r
-       private boolean getSquareVertex(int[] i_x_coord, int[] i_y_coord, int i_vertex1_index, int i_coord_num, int i_area, int[] o_vertex)\r
-       {\r
-               final NyARFixedFloatVertexCounter wv1 = this.__getSquareVertex_wv1;\r
-               final NyARFixedFloatVertexCounter wv2 = this.__getSquareVertex_wv2;\r
-               final int end_of_coord = i_vertex1_index + i_coord_num - 1;\r
-               final int sx = i_x_coord[i_vertex1_index];// sx = marker_info2->x_coord[0];\r
-               final int sy = i_y_coord[i_vertex1_index];// sy = marker_info2->y_coord[0];\r
-               int dmax = 0;\r
-               int v1 = i_vertex1_index;\r
-               for (int i = 1 + i_vertex1_index; i < end_of_coord; i++) {// for(i=1;i<marker_info2->coord_num-1;i++)\r
-                       // {\r
-                       final int d = (i_x_coord[i] - sx) * (i_x_coord[i] - sx) + (i_y_coord[i] - sy) * (i_y_coord[i] - sy);\r
-                       if (d > dmax) {\r
-                               dmax = d;\r
-                               v1 = i;\r
-                       }\r
-               }\r
-               final double thresh = (i_area / 0.75) * 0.01 * VERTEX_FACTOR;\r
-\r
-               o_vertex[0] = i_vertex1_index;\r
-\r
-               if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v1, thresh)) { // if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,0,v1,thresh,wv1,&wvnum1)<\r
-                                                                                                                                                                       // 0 ) {\r
-                       return false;\r
-               }\r
-               if (!wv2.getVertex(i_x_coord, i_y_coord, v1, end_of_coord, thresh)) {// if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,v1,marker_info2->coord_num-1,thresh,wv2,&wvnum2)\r
-                       // < 0) {\r
-                       return false;\r
-               }\r
-\r
-               int v2;\r
-               if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {// if(wvnum1 == 1 && wvnum2== 1) {\r
-                       o_vertex[1] = wv1.vertex[0];\r
-                       o_vertex[2] = v1;\r
-                       o_vertex[3] = wv2.vertex[0];\r
-               } else if (wv1.number_of_vertex > 1 && wv2.number_of_vertex == 0) {// }else if( wvnum1 > 1 && wvnum2== 0) {\r
-                       //頂点位置を、起点から対角点の間の1/2にあると予想して、検索する。\r
-                       v2 = (v1-i_vertex1_index)/2+i_vertex1_index;\r
-                       if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v2, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (!wv2.getVertex(i_x_coord, i_y_coord, v2, v1, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {\r
-                               o_vertex[1] = wv1.vertex[0];\r
-                               o_vertex[2] = wv2.vertex[0];\r
-                               o_vertex[3] = v1;\r
-                       } else {\r
-                               return false;\r
-                       }\r
-               } else if (wv1.number_of_vertex == 0 && wv2.number_of_vertex > 1) {\r
-                       //v2 = (v1-i_vertex1_index+ end_of_coord-i_vertex1_index) / 2+i_vertex1_index;\r
-                       v2 = (v1+ end_of_coord)/2;\r
-\r
-                       if (!wv1.getVertex(i_x_coord, i_y_coord, v1, v2, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (!wv2.getVertex(i_x_coord, i_y_coord, v2, end_of_coord, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {\r
-                               o_vertex[1] = v1;\r
-                               o_vertex[2] = wv1.vertex[0];\r
-                               o_vertex[3] = wv2.vertex[0];\r
-                       } else {\r
-                               return false;\r
-                       }\r
-               } else {\r
-                       return false;\r
-               }\r
-               o_vertex[4] = end_of_coord;\r
-               return true;\r
-       }\r
-\r
-       private final INyARPca2d _pca;\r
-       private final NyARDoubleMatrix22 __getSquareLine_evec=new NyARDoubleMatrix22();\r
-       private final NyARDoublePoint2d __getSquareLine_mean=new NyARDoublePoint2d();\r
-       private final NyARDoublePoint2d __getSquareLine_ev=new NyARDoublePoint2d();\r
-       /**\r
-        * arGetLine(int x_coord[], int y_coord[], int coord_num,int vertex[], double line[4][3], double v[4][2]) arGetLine2(int x_coord[], int y_coord[], int\r
-        * coord_num,int vertex[], double line[4][3], double v[4][2], double *dist_factor) の2関数の合成品です。 マーカーのvertex,lineを計算して、結果をo_squareに保管します。\r
-        * Optimize:STEP[424->391]\r
-        * \r
-        * @param i_cparam\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       private boolean getSquareLine(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARSquare o_square) throws NyARException\r
-       {\r
-               final NyARLinear[] l_line = o_square.line;\r
-               final NyARCameraDistortionFactor dist_factor=this._dist_factor;  \r
-               final NyARDoubleMatrix22 evec=this.__getSquareLine_evec;\r
-               final NyARDoublePoint2d mean=this.__getSquareLine_mean;\r
-               final NyARDoublePoint2d ev=this.__getSquareLine_ev;\r
-       \r
-               \r
-               for (int i = 0; i < 4; i++) {\r
-                       final double w1 = (double) (i_mkvertex[i + 1] - i_mkvertex[i] + 1) * 0.05 + 0.5;\r
-                       final int st = (int) (i_mkvertex[i] + w1);\r
-                       final int ed = (int) (i_mkvertex[i + 1] - w1);\r
-                       final int n = ed - st + 1;\r
-                       if (n < 2) {\r
-                               // nが2以下でmatrix.PCAを計算することはできないので、エラー\r
-                               return false;\r
-                       }\r
-                       //主成分分析する。\r
-                       this._pca.pcaWithDistortionFactor(i_xcoord, i_ycoord, st, n,dist_factor, evec, ev,mean);\r
-                       final NyARLinear l_line_i = l_line[i];\r
-                       l_line_i.run = evec.m01;// line[i][0] = evec->m[1];\r
-                       l_line_i.rise = -evec.m00;// line[i][1] = -evec->m[0];\r
-                       l_line_i.intercept = -(l_line_i.run * mean.x + l_line_i.rise * mean.y)*2;// line[i][2] = -(line[i][0]*mean->v[0] + line[i][1]*mean->v[1]);\r
-               }\r
-\r
-               final NyARDoublePoint2d[] l_sqvertex = o_square.sqvertex;\r
-               final NyARIntPoint[] l_imvertex = o_square.imvertex;\r
-               for (int i = 0; i < 4; i++) {\r
-                       final NyARLinear l_line_i = l_line[i];\r
-                       final NyARLinear l_line_2 = l_line[(i + 3) % 4];\r
-                       final double w1 = l_line_2.run * l_line_i.rise - l_line_i.run * l_line_2.rise;\r
-                       if (w1 == 0.0) {\r
-                               return false;\r
-                       }\r
-                       l_sqvertex[i].x = (l_line_2.rise * l_line_i.intercept - l_line_i.rise * l_line_2.intercept) / w1;\r
-                       l_sqvertex[i].y = (l_line_i.run * l_line_2.intercept - l_line_2.run * l_line_i.intercept) / w1;\r
-                       // 頂点インデクスから頂点座標を得て保存\r
-                       l_imvertex[i].x = i_xcoord[i_mkvertex[i]]*2;\r
-                       l_imvertex[i].y = i_ycoord[i_mkvertex[i]]*2;\r
-               }\r
-               return true;\r
-       }\r
+    private static int PCA_LENGTH = 20;\r
+    private static double VERTEX_FACTOR = 1.0;// 線検出のファクタ\r
+\r
+    private static int AR_AREA_MAX = 25000;// #define AR_AREA_MAX 100000\r
+\r
+    private static int AR_AREA_MIN = 20;// #define AR_AREA_MIN 70\r
+    private int _width;\r
+    private int _height;\r
+\r
+    private INyARLabeling _labeling;\r
+\r
+    private NyARLabelingImage _limage;\r
+\r
+    private OverlapChecker _overlap_checker = new OverlapChecker();\r
+    private NyARFixedFloatObserv2IdealMap _dist_factor;\r
+    /**\r
+     * 最大i_squre_max個のマーカーを検出するクラスを作成する。\r
+     * \r
+     * @param i_param\r
+     */\r
+    public NyARSquareDetector_Quad(NyARCameraDistortionFactor i_dist_factor_ref, NyARIntSize i_size) throws NyARException\r
+    {\r
+        this._width = i_size.w / 2;\r
+        this._height = i_size.h / 2;\r
+        this._labeling = new NyARLabeling_ARToolKit_X2();\r
+        this._limage = new NyARLabelingImage(this._width, this._height);\r
+        this._labeling.attachDestination(this._limage);\r
+\r
+        // 輪郭の最大長は画面に映りうる最大の長方形サイズ。\r
+        int number_of_coord = (this._width + this._height) * 2;\r
+\r
+        // 輪郭バッファは頂点変換をするので、輪郭バッファの2倍取る。\r
+        this._max_coord = number_of_coord;\r
+        this._xcoord = new int[number_of_coord * 2];\r
+        this._ycoord = new int[number_of_coord * 2];\r
+\r
+        //1/4サイズの歪みマップを作る\r
+        NyARCameraDistortionFactor quadfactor = new NyARCameraDistortionFactor();\r
+        quadfactor.copyFrom(i_dist_factor_ref);\r
+        quadfactor.changeScale(0.5);\r
+        this._dist_factor = new NyARFixedFloatObserv2IdealMap(quadfactor, i_size);\r
+        //PCA\r
+        this._pca = new NyARFixedFloatPca2d();\r
+        this._xpos = new int[PCA_LENGTH];//最大辺長はthis._width+this._height\r
+        this._ypos = new int[PCA_LENGTH];//最大辺長はthis._width+this._height\r
+\r
+    }\r
+\r
+    private int _max_coord;\r
+    private int[] _xcoord;\r
+    private int[] _ycoord;\r
+\r
+    private void normalizeCoord(int[] i_coord_x, int[] i_coord_y, int i_index, int i_coord_num)\r
+    {\r
+        // vertex1を境界にして、後方に配列を連結\r
+        System.arraycopy(i_coord_x, 1, i_coord_x, i_coord_num, i_index);\r
+        System.arraycopy(i_coord_y, 1, i_coord_y, i_coord_num, i_index);\r
+    }\r
+\r
+    private int[] __detectMarker_mkvertex = new int[5];\r
+\r
+    /**\r
+     * arDetectMarker2を基にした関数\r
+     * この関数はNyARSquare要素のうち、directionを除くパラメータを取得して返します。\r
+     * directionの確定は行いません。\r
+     * @param i_raster\r
+     * 解析する2値ラスタイメージを指定します。\r
+     * @param o_square_stack\r
+     * 抽出した正方形候補を格納するリスト\r
+     * @throws NyARException\r
+     */\r
+    public void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException\r
+    {\r
+        INyARLabeling labeling_proc = this._labeling;\r
+        NyARLabelingImage limage = this._limage;\r
+\r
+        // 初期化\r
+\r
+        // マーカーホルダをリセット\r
+        o_square_stack.clear();\r
+\r
+        // ラベリング\r
+        labeling_proc.labeling(i_raster);\r
+\r
+        // ラベル数が0ならここまで\r
+        int label_num = limage.getLabelStack().getLength();\r
+        if (label_num < 1)\r
+        {\r
+            return;\r
+        }\r
+\r
+        NyARLabelingLabelStack stack = limage.getLabelStack();\r
+        NyARLabelingLabel[] labels = (NyARLabelingLabel[])stack.getArray();\r
+\r
+\r
+        // ラベルを大きい順に整列\r
+        stack.sortByArea();\r
+\r
+        // デカいラベルを読み飛ばし\r
+        int i;\r
+        for (i = 0; i < label_num; i++)\r
+        {\r
+            // 検査対象内のラベルサイズになるまで無視\r
+            if (labels[i].area <= AR_AREA_MAX)\r
+            {\r
+                break;\r
+            }\r
+        }\r
+\r
+        int xsize = this._width;\r
+        int ysize = this._height;\r
+        int[] xcoord = this._xcoord;\r
+        int[] ycoord = this._ycoord;\r
+        int coord_max = this._max_coord;\r
+        int[] mkvertex = this.__detectMarker_mkvertex;\r
+        OverlapChecker overlap = this._overlap_checker;\r
+        int coord_num;\r
+        int label_area;\r
+        NyARLabelingLabel label_pt;\r
+\r
+        //重なりチェッカの最大数を設定\r
+        overlap.reset(label_num);\r
+\r
+        for (; i < label_num; i++)\r
+        {\r
+            label_pt = labels[i];\r
+            label_area = label_pt.area;\r
+            // 検査対象サイズよりも小さくなったら終了\r
+            if (label_area < AR_AREA_MIN)\r
+            {\r
+                break;\r
+            }\r
+            // クリップ領域が画面の枠に接していれば除外\r
+            if (label_pt.clip_l == 1 || label_pt.clip_r == xsize - 2)\r
+            {// if(wclip[i*4+0] == 1 || wclip[i*4+1] ==xsize-2){\r
+                continue;\r
+            }\r
+            if (label_pt.clip_t == 1 || label_pt.clip_b == ysize - 2)\r
+            {// if( wclip[i*4+2] == 1 || wclip[i*4+3] ==ysize-2){\r
+                continue;\r
+            }\r
+            // 既に検出された矩形との重なりを確認\r
+            if (!overlap.check(label_pt))\r
+            {\r
+                // 重なっているようだ。\r
+                continue;\r
+            }\r
+\r
+            // 輪郭を取得\r
+            coord_num = limage.getContour(i, coord_max, xcoord, ycoord);\r
+            if (coord_num == coord_max)\r
+            {\r
+                // 輪郭が大きすぎる。\r
+                continue;\r
+            }\r
+            //頂点候補のインデクスを取得\r
+            int vertex1 = scanVertex(xcoord, ycoord, coord_num);\r
+\r
+            // 頂点候補(vertex1)を先頭に並べなおした配列を作成する。\r
+            normalizeCoord(xcoord, ycoord, vertex1, coord_num);\r
+\r
+            // 領域を準備する。\r
+            NyARSquare square_ptr = (NyARSquare)o_square_stack.prePush();\r
+\r
+            // 頂点情報を取得\r
+            if (!getSquareVertex(xcoord, ycoord, vertex1, coord_num, label_area, mkvertex))\r
+            {\r
+                o_square_stack.pop();// 頂点の取得が出来なかったので破棄\r
+                continue;\r
+            }\r
+            // マーカーを検出\r
+            if (!getSquareLine(mkvertex, xcoord, ycoord, square_ptr))\r
+            {\r
+                // 矩形が成立しなかった。\r
+                o_square_stack.pop();\r
+                continue;\r
+            }\r
+            // 検出済の矩形の属したラベルを重なりチェックに追加する。\r
+            overlap.push(label_pt);\r
+        }\r
+        return;\r
+    }\r
+\r
+    /**\r
+     * 辺からの対角線が最長になる点を対角線候補として返す。\r
+     * \r
+     * @param i_xcoord\r
+     * @param i_ycoord\r
+     * @param i_coord_num\r
+     * @return\r
+     */\r
+    private int scanVertex(int[] i_xcoord, int[] i_ycoord, int i_coord_num)\r
+    {\r
+        int sx = i_xcoord[0];\r
+        int sy = i_ycoord[0];\r
+        int d = 0;\r
+        int w, x, y;\r
+        int ret = 0;\r
+        for (int i = 1; i < i_coord_num; i++)\r
+        {\r
+            x = i_xcoord[i] - sx;\r
+            y = i_ycoord[i] - sy;\r
+            w = x * x + y * y;\r
+            if (w > d)\r
+            {\r
+                d = w;\r
+                ret = i;\r
+            }\r
+            // ここでうまく終了条件入れられないかな。\r
+        }\r
+        return ret;\r
+    }\r
+\r
+    private NyARVertexCounter __getSquareVertex_wv1 = new NyARVertexCounter();\r
+\r
+    private NyARVertexCounter __getSquareVertex_wv2 = new NyARVertexCounter();\r
+\r
+    /**\r
+     * static int arDetectMarker2_check_square( int area, ARMarkerInfo2 *marker_info2, double factor ) 関数の代替関数 OPTIMIZED STEP [450->415] o_squareに頂点情報をセットします。\r
+     * \r
+     * @param i_x_coord\r
+     * @param i_y_coord\r
+     * @param i_vertex1_index\r
+     * @param i_coord_num\r
+     * @param i_area\r
+     * @param o_vertex\r
+     * 要素数はint[4]である事\r
+     * @return\r
+     */\r
+    private boolean getSquareVertex(int[] i_x_coord, int[] i_y_coord, int i_vertex1_index, int i_coord_num, int i_area, int[] o_vertex)\r
+    {\r
+        NyARVertexCounter wv1 = this.__getSquareVertex_wv1;\r
+        NyARVertexCounter wv2 = this.__getSquareVertex_wv2;\r
+        int end_of_coord = i_vertex1_index + i_coord_num - 1;\r
+        int sx = i_x_coord[i_vertex1_index];// sx = marker_info2->x_coord[0];\r
+        int sy = i_y_coord[i_vertex1_index];// sy = marker_info2->y_coord[0];\r
+        int dmax = 0;\r
+        int v1 = i_vertex1_index;\r
+        for (int i = 1 + i_vertex1_index; i < end_of_coord; i++)\r
+        {// for(i=1;i<marker_info2->coord_num-1;i++)\r
+            // {\r
+            int d = (i_x_coord[i] - sx) * (i_x_coord[i] - sx) + (i_y_coord[i] - sy) * (i_y_coord[i] - sy);\r
+            if (d > dmax)\r
+            {\r
+                dmax = d;\r
+                v1 = i;\r
+            }\r
+        }\r
+        double thresh = (i_area / 0.75) * 0.01 * VERTEX_FACTOR;\r
+\r
+        o_vertex[0] = i_vertex1_index;\r
+\r
+        if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v1, thresh))\r
+        { // if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,0,v1,thresh,wv1,&wvnum1)<\r
+            // 0 ) {\r
+            return false;\r
+        }\r
+        if (!wv2.getVertex(i_x_coord, i_y_coord, v1, end_of_coord, thresh))\r
+        {// if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,v1,marker_info2->coord_num-1,thresh,wv2,&wvnum2)\r
+            // < 0) {\r
+            return false;\r
+        }\r
+\r
+        int v2;\r
+        if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1)\r
+        {// if(wvnum1 == 1 && wvnum2== 1) {\r
+            o_vertex[1] = wv1.vertex[0];\r
+            o_vertex[2] = v1;\r
+            o_vertex[3] = wv2.vertex[0];\r
+        }\r
+        else if (wv1.number_of_vertex > 1 && wv2.number_of_vertex == 0)\r
+        {// }else if( wvnum1 > 1 && wvnum2== 0) {\r
+            //頂点位置を、起点から対角点の間の1/2にあると予想して、検索する。\r
+            v2 = (v1 - i_vertex1_index) / 2 + i_vertex1_index;\r
+            if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v2, thresh))\r
+            {\r
+                return false;\r
+            }\r
+            if (!wv2.getVertex(i_x_coord, i_y_coord, v2, v1, thresh))\r
+            {\r
+                return false;\r
+            }\r
+            if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1)\r
+            {\r
+                o_vertex[1] = wv1.vertex[0];\r
+                o_vertex[2] = wv2.vertex[0];\r
+                o_vertex[3] = v1;\r
+            }\r
+            else\r
+            {\r
+                return false;\r
+            }\r
+        }\r
+        else if (wv1.number_of_vertex == 0 && wv2.number_of_vertex > 1)\r
+        {\r
+            //v2 = (v1-i_vertex1_index+ end_of_coord-i_vertex1_index) / 2+i_vertex1_index;\r
+            v2 = (v1 + end_of_coord) / 2;\r
+\r
+            if (!wv1.getVertex(i_x_coord, i_y_coord, v1, v2, thresh))\r
+            {\r
+                return false;\r
+            }\r
+            if (!wv2.getVertex(i_x_coord, i_y_coord, v2, end_of_coord, thresh))\r
+            {\r
+                return false;\r
+            }\r
+            if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1)\r
+            {\r
+                o_vertex[1] = v1;\r
+                o_vertex[2] = wv1.vertex[0];\r
+                o_vertex[3] = wv2.vertex[0];\r
+            }\r
+            else\r
+            {\r
+                return false;\r
+            }\r
+        }\r
+        else\r
+        {\r
+            return false;\r
+        }\r
+        o_vertex[4] = end_of_coord;\r
+        return true;\r
+    }\r
+    private int[] _xpos;\r
+    private int[] _ypos;\r
+    private NyARFixedFloatPca2d _pca;\r
+    private NyARI64Matrix22 __getSquareLine_evec = new NyARI64Matrix22();\r
+    private NyARI64Point2d __getSquareLine_mean = new NyARI64Point2d();\r
+    private NyARI64Point2d __getSquareLine_ev = new NyARI64Point2d();\r
+    private NyARI64Linear[] __getSquareLine_i64liner = NyARI64Linear.createArray(4);\r
+    /**\r
+     * arGetLine(int x_coord[], int y_coord[], int coord_num,int vertex[], double line[4][3], double v[4][2]) arGetLine2(int x_coord[], int y_coord[], int\r
+     * coord_num,int vertex[], double line[4][3], double v[4][2], double *dist_factor) の2関数の合成品です。 マーカーのvertex,lineを計算して、結果をo_squareに保管します。\r
+     * Optimize:STEP[424->391]\r
+     * \r
+     * @param i_cparam\r
+     * @return\r
+     * @throws NyARException\r
+     */\r
+    private boolean getSquareLine(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARSquare o_square) throws NyARException\r
+    {\r
+        NyARLinear[] l_line = o_square.line;\r
+        NyARI64Matrix22 evec = this.__getSquareLine_evec;\r
+        NyARI64Point2d mean = this.__getSquareLine_mean;\r
+        NyARI64Point2d ev = this.__getSquareLine_ev;\r
+        NyARI64Linear[] i64liner = this.__getSquareLine_i64liner;\r
+\r
+\r
+        for (int i = 0; i < 4; i++)\r
+        {\r
+            double w1 = (double)(i_mkvertex[i + 1] - i_mkvertex[i] + 1) * 0.05 + 0.5;\r
+            int st = (int)(i_mkvertex[i] + w1);\r
+            int ed = (int)(i_mkvertex[i + 1] - w1);\r
+            int n = ed - st + 1;\r
+            if (n < 2)\r
+            {\r
+                // nが2以下でmatrix.PCAを計算することはできないので、エラー\r
+                return false;\r
+            }\r
+            //配列作成\r
+            n = this._dist_factor.observ2IdealSampling(i_xcoord, i_ycoord, st, n, this._xpos, this._ypos, PCA_LENGTH);\r
+\r
+            //主成分分析する。\r
+            this._pca.pcaF16(this._xpos, this._ypos, n, evec, ev, mean);\r
+            NyARI64Linear l_line_i = i64liner[i];\r
+            l_line_i.run = evec.m01;// line[i][0] = evec->m[1];\r
+            l_line_i.rise = -evec.m00;// line[i][1] = -evec->m[0];\r
+            l_line_i.intercept = -((l_line_i.run * mean.x + l_line_i.rise * mean.y) >> 16);// line[i][2] = -(line[i][0]*mean->v[0] + line[i][1]*mean->v[1]);\r
+        }\r
+\r
+        NyARDoublePoint2d[] l_sqvertex = o_square.sqvertex;\r
+        NyARIntPoint[] l_imvertex = o_square.imvertex;\r
+        for (int i = 0; i < 4; i++)\r
+        {\r
+            NyARI64Linear l_line_i = i64liner[i];\r
+            NyARI64Linear l_line_2 = i64liner[(i + 3) % 4];\r
+            long w1 = (l_line_2.run * l_line_i.rise - l_line_i.run * l_line_2.rise) >> 16;\r
+            if (w1 == 0)\r
+            {\r
+                return false;\r
+            }\r
+            l_sqvertex[i].x = (double)((l_line_2.rise * l_line_i.intercept - l_line_i.rise * l_line_2.intercept) / w1) *2/ 65536.0;\r
+            l_sqvertex[i].y = (double)((l_line_i.run * l_line_2.intercept - l_line_2.run * l_line_i.intercept) / w1) *2/ 65536.0;\r
+            // 頂点インデクスから頂点座標を得て保存\r
+            l_imvertex[i].x = i_xcoord[i_mkvertex[i]]*2;\r
+            l_imvertex[i].y = i_ycoord[i_mkvertex[i]]*2;\r
+            l_line[i].run = (double)l_line_i.run / 65536.0;\r
+            l_line[i].rise = (double)l_line_i.rise / 65536.0;\r
+            l_line[i].intercept = (double)l_line_i.intercept*2 / 65536.0;\r
+        }\r
+        return true;\r
+    }\r
 }\r
 \r
 \r
-\r
 /**\r
  * ラベル同士の重なり(内包関係)を調べるクラスです。 \r
  * ラベルリストに内包するラベルを蓄積し、それにターゲットのラベルが内包されているか を確認します。\r
  */\r
 class OverlapChecker\r
 {\r
-       private NyARLabelingLabel[] _labels = new NyARLabelingLabel[32];\r
-\r
-       private int _length;\r
-\r
-       /**\r
-        * 最大i_max_label個のラベルを蓄積できるようにオブジェクトをリセットする\r
-        * \r
-        * @param i_max_label\r
-        */\r
-       public void reset(int i_max_label)\r
-       {\r
-               if (i_max_label > this._labels.length) {\r
-                       this._labels = new NyARLabelingLabel[i_max_label];\r
-               }\r
-               this._length = 0;\r
-       }\r
-\r
-       /**\r
-        * チェック対象のラベルを追加する。\r
-        * \r
-        * @param i_label_ref\r
-        */\r
-       public void push(NyARLabelingLabel i_label_ref)\r
-       {\r
-               this._labels[this._length] = i_label_ref;\r
-               this._length++;\r
-       }\r
-\r
-       /**\r
-        * 現在リストにあるラベルと重なっているかを返す。\r
-        * \r
-        * @param i_label\r
-        * @return 何れかのラベルの内側にあるならばfalse,独立したラベルである可能性が高ければtrueです.\r
-        */\r
-       public boolean check(NyARLabelingLabel i_label)\r
-       {\r
-               // 重なり処理かな?\r
-               final NyARLabelingLabel[] label_pt = this._labels;\r
-               final int px1 = (int) i_label.pos_x;\r
-               final int py1 = (int) i_label.pos_y;\r
-               for (int i = this._length - 1; i >= 0; i--) {\r
-                       final int px2 = (int) label_pt[i].pos_x;\r
-                       final int py2 = (int) label_pt[i].pos_y;\r
-                       final int d = (px1 - px2) * (px1 - px2) + (py1 - py2) * (py1 - py2);\r
-                       if (d < label_pt[i].area / 4) {\r
-                               // 対象外\r
-                               return false;\r
-                       }\r
-               }\r
-               // 対象\r
-               return true;\r
-       }\r
-}
\ No newline at end of file
+    private NyARLabelingLabel[] _labels = new NyARLabelingLabel[32];\r
+\r
+    private int _length;\r
+\r
+    /**\r
+     * 最大i_max_label個のラベルを蓄積できるようにオブジェクトをリセットする\r
+     * \r
+     * @param i_max_label\r
+     */\r
+    public void reset(int i_max_label)\r
+    {\r
+        if (i_max_label > this._labels.length)\r
+        {\r
+            this._labels = new NyARLabelingLabel[i_max_label];\r
+        }\r
+        this._length = 0;\r
+    }\r
+\r
+    /**\r
+     * チェック対象のラベルを追加する。\r
+     * \r
+     * @param i_label_ref\r
+     */\r
+    public void push(NyARLabelingLabel i_label_ref)\r
+    {\r
+        this._labels[this._length] = i_label_ref;\r
+        this._length++;\r
+    }\r
+\r
+    /**\r
+     * 現在リストにあるラベルと重なっているかを返す。\r
+     * \r
+     * @param i_label\r
+     * @return 何れかのラベルの内側にあるならばfalse,独立したラベルである可能性が高ければtrueです.\r
+     */\r
+    public boolean check(NyARLabelingLabel i_label)\r
+    {\r
+        // 重なり処理かな?\r
+        NyARLabelingLabel[] label_pt = this._labels;\r
+        int px1 = (int)i_label.pos_x;\r
+        int py1 = (int)i_label.pos_y;\r
+        for (int i = this._length - 1; i >= 0; i--)\r
+        {\r
+            int px2 = (int)label_pt[i].pos_x;\r
+            int py2 = (int)label_pt[i].pos_y;\r
+            int d = (px1 - px2) * (px1 - px2) + (py1 - py2) * (py1 - py2);\r
+            if (d < label_pt[i].area / 4)\r
+            {\r
+                // 対象外\r
+                return false;\r
+            }\r
+        }\r
+        // 対象\r
+        return true;\r
+    }\r
+}\r
+\r
+\r
diff --git a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatIdeal2Observ.java b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatIdeal2Observ.java
new file mode 100644 (file)
index 0000000..dce3668
--- /dev/null
@@ -0,0 +1,52 @@
+package jp.nyatla.nyartoolkit.sandbox.x2;\r
+\r
+import jp.nyatla.nyartoolkit.core.param.*;\r
+import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
+import jp.nyatla.nyartoolkit.core2.types.NyARFixedFloat16Point2d;\r
+\r
+public class NyARFixedFloatIdeal2Observ\r
+{\r
+       private double[] _factor=new double[4];\r
+       public NyARFixedFloatIdeal2Observ(NyARCameraDistortionFactor i_distfactor)\r
+       {\r
+               i_distfactor.getValue(this._factor);\r
+               return;\r
+       }       \r
+       public void ideal2ObservBatch(final NyARDoublePoint2d[] i_in, NyARFixedFloat16Point2d[] o_out, int i_size)\r
+       {\r
+               double x, y;\r
+               final double d0 = this._factor[0];\r
+               final double d1 = this._factor[1];\r
+               final double d3 = this._factor[3];\r
+               final double d2_w = this._factor[2] / 100000000.0;\r
+               for (int i = 0; i < i_size; i++) {\r
+                       x = (i_in[i].x - d0) * d3;\r
+                       y = (i_in[i].y - d1) * d3;\r
+                       if (x == 0.0 && y == 0.0) {\r
+                               o_out[i].x = (long)(d0*NyMath.FIXEDFLOAT16_1);\r
+                               o_out[i].y = (long)(d1*NyMath.FIXEDFLOAT16_1);\r
+                       } else {\r
+                               final double d = 1.0 - d2_w * (x * x + y * y);\r
+                               o_out[i].x = (long)((x * d + d0)*NyMath.FIXEDFLOAT16_1);\r
+                               o_out[i].y = (long)((y * d + d1)*NyMath.FIXEDFLOAT16_1);\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       public void ideal2Observ(final NyARFixedFloat16Point2d i_in, NyARFixedFloat16Point2d o_out)\r
+       {\r
+               final double f0=this._factor[0];\r
+               final double f1=this._factor[1];\r
+               final double x = (((double)i_in.x/NyMath.FIXEDFLOAT16_1) - f0) * this._factor[3];\r
+               final double y = (((double)i_in.y/NyMath.FIXEDFLOAT16_1) - f1) * this._factor[3];\r
+               if (x == 0.0 && y == 0.0) {\r
+                       o_out.x = (long)(f0*NyMath.FIXEDFLOAT16_1);\r
+                       o_out.y = (long)(f1*NyMath.FIXEDFLOAT16_1);\r
+               } else {\r
+                       final double d = 1.0 - this._factor[2] / 100000000.0 * (x * x + y * y);\r
+                       o_out.x = (long)((x * d + f0)*NyMath.FIXEDFLOAT16_1);\r
+                       o_out.y = (long)((y * d + f1)*NyMath.FIXEDFLOAT16_1);\r
+               }\r
+               return;\r
+       }       \r
+}\r
diff --git a/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatVertexCounter.java b/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatVertexCounter.java
new file mode 100644 (file)
index 0000000..afa8b93
--- /dev/null
@@ -0,0 +1,66 @@
+package jp.nyatla.nyartoolkit.sandbox.x2;\r
+\r
+public final class NyARFixedFloatVertexCounter\r
+{\r
+       public final int[] vertex = new int[6];// 5まで削れる\r
+\r
+       public int number_of_vertex;\r
+\r
+       private long thresh_16f;\r
+\r
+       private int[] x_coord;\r
+\r
+       private int[] y_coord;\r
+\r
+       public boolean getVertex(int[] i_x_coord, int[] i_y_coord, int st, int ed, long i_thresh)\r
+       {\r
+               this.number_of_vertex = 0;\r
+               this.thresh_16f = i_thresh;\r
+               this.x_coord = i_x_coord;\r
+               this.y_coord = i_y_coord;\r
+               return get_vertex(st, ed);\r
+       }\r
+\r
+       /**\r
+        * static int get_vertex( int x_coord[], int y_coord[], int st, int ed,double thresh, int vertex[], int *vnum) 関数の代替関数\r
+        * \r
+        * @param x_coord\r
+        * @param y_coord\r
+        * @param st\r
+        * @param ed\r
+        * @param thresh\r
+        * @return\r
+        */\r
+       private boolean get_vertex(int st, int ed)\r
+       {\r
+               int v1 = 0;\r
+               final int[] lx_coord = this.x_coord;\r
+               final int[] ly_coord = this.y_coord;\r
+               final int a = ly_coord[ed] - ly_coord[st];\r
+               final int b = lx_coord[st] - lx_coord[ed];\r
+               final int c = lx_coord[ed] * ly_coord[st] - ly_coord[ed] * lx_coord[st];\r
+               long dmax = 0;\r
+               for (int i = st + 1; i < ed; i++) {\r
+                       final long d = a * lx_coord[i] + b * ly_coord[i] + c;\r
+                       if (d * d > dmax) {\r
+                               dmax = d * d;\r
+                               v1 = i;\r
+                       }\r
+               }\r
+               if ((dmax<<16) / (long)(a * a + b * b) > this.thresh_16f) {\r
+                       if (!get_vertex(st, v1)) {\r
+                               return false;\r
+                       }\r
+                       if (number_of_vertex > 5) {\r
+                               return false;\r
+                       }\r
+                       vertex[number_of_vertex] = v1;// vertex[(*vnum)] = v1;\r
+                       number_of_vertex++;// (*vnum)++;\r
+\r
+                       if (!get_vertex(v1, ed)) {\r
+                               return false;\r
+                       }\r
+               }\r
+               return true;\r
+       }\r
+}\r
index 53cb4a3..f53c3e0 100644 (file)
@@ -402,70 +402,6 @@ public class NyARSquareDetector_X2 implements INyARSquareDetector
                return true;\r
        }\r
 }\r
-final class NyARFixedFloatVertexCounter\r
-{\r
-       public final int[] vertex = new int[6];// 5まで削れる\r
-\r
-       public int number_of_vertex;\r
-\r
-       private long thresh_16f;\r
-\r
-       private int[] x_coord;\r
-\r
-       private int[] y_coord;\r
-\r
-       public boolean getVertex(int[] i_x_coord, int[] i_y_coord, int st, int ed, long i_thresh)\r
-       {\r
-               this.number_of_vertex = 0;\r
-               this.thresh_16f = i_thresh;\r
-               this.x_coord = i_x_coord;\r
-               this.y_coord = i_y_coord;\r
-               return get_vertex(st, ed);\r
-       }\r
-\r
-       /**\r
-        * static int get_vertex( int x_coord[], int y_coord[], int st, int ed,double thresh, int vertex[], int *vnum) 関数の代替関数\r
-        * \r
-        * @param x_coord\r
-        * @param y_coord\r
-        * @param st\r
-        * @param ed\r
-        * @param thresh\r
-        * @return\r
-        */\r
-       private boolean get_vertex(int st, int ed)\r
-       {\r
-               int v1 = 0;\r
-               final int[] lx_coord = this.x_coord;\r
-               final int[] ly_coord = this.y_coord;\r
-               final int a = ly_coord[ed] - ly_coord[st];\r
-               final int b = lx_coord[st] - lx_coord[ed];\r
-               final int c = lx_coord[ed] * ly_coord[st] - ly_coord[ed] * lx_coord[st];\r
-               long dmax = 0;\r
-               for (int i = st + 1; i < ed; i++) {\r
-                       final long d = a * lx_coord[i] + b * ly_coord[i] + c;\r
-                       if (d * d > dmax) {\r
-                               dmax = d * d;\r
-                               v1 = i;\r
-                       }\r
-               }\r
-               if ((dmax<<16) / (long)(a * a + b * b) > this.thresh_16f) {\r
-                       if (!get_vertex(st, v1)) {\r
-                               return false;\r
-                       }\r
-                       if (number_of_vertex > 5) {\r
-                               return false;\r
-                       }\r
-                       vertex[number_of_vertex] = v1;// vertex[(*vnum)] = v1;\r
-                       number_of_vertex++;// (*vnum)++;\r
-\r
-                       if (!get_vertex(v1, ed)) {\r
-                               return false;\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-}\r
 \r
 \r
 /**\r