チェンジセット 1627
- コミット日時:
- 2008/10/16 14:32:39 (3 ヶ月前)
- ファイル:
-
- as3/FLARToolKit/branches/2.0/samples/org/tarotaro/flash/ar/FLARPanoramaSphereLayer.as (更新) (1 diff)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARCode.as (更新) (3 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARMat.as (更新) (20 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquareDetector.as (更新) (11 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARVec.as (更新) (4 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingImage.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingImageBitmapData.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingLabelStack.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabeling_ARToolKit.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabeling_BitmapData.as (更新) (3 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/match/FLARMatchPatt_Color_WITHOUT_PCA.as (更新) (3 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/param/FLARCameraDistortionFactor.as (更新) (5 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/param/FLARPerspectiveProjectionMatrix.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/rasterreader/FLARBitmapDataReader.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/transmat/fitveccalc/FLARFitVecCalculator.as (更新) (4 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/transmat/optimize/FLARRotTransOptimize.as (更新) (2 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/detector/FLARDetectMarker.as (更新) (3 diffs)
- as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/detector/FLARSingleMarkerDetector.as (更新) (3 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/FLARToolKit/branches/2.0/samples/org/tarotaro/flash/ar/FLARPanoramaSphereLayer.as
r1623 r1627 99 99 //マーカの大きさから、ズームを判定する 100 100 //900-45000 101 trace(square.area);102 101 this._view.camera.zoom = 1 + square.label.area / 9000; 103 102 } else { as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARCode.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 114 114 var token:Array = i_stream.match(/\d+/g); 115 115 // パターンデータはGBRAで並んでる。 116 for (var h:int = 0;h < 4; h++) { 117 var l:int = 0; 118 for (var i3:int = 0;i3 < 3; i3++) { 119 for (var i2:int = 0;i2 < height; i2++) { 120 for (var i1:int = 0;i1 < width; i1++) { 116 117 var h:int; 118 var l:int = 0; 119 var i3:int; 120 var i2:int; 121 var i1:int; 122 var val:int; 123 var j:int; 124 for (h = 0;h < 4; h++) { 125 126 for (i3 = 0;i3 < 3; i3++) { 127 for (i2 = 0;i2 < height; i2++) { 128 for (i1 = 0;i1 < width; i1++) { 121 129 // 数値のみ読み出す 122 va r val:int= parseInt(token.shift());130 val = parseInt(token.shift()); 123 131 if (isNaN(val)) { 124 132 throw new Error(); … … 130 138 // throw new FLARException(); 131 139 // } 132 var j:int= 255 - val;140 j = 255 - val; 133 141 // j = 255-j; 134 142 // 標準ファイルのパターンはBGRでならんでるからRGBに並べなおす as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARMat.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 117 117 } 118 118 // 値コピー 119 for (var r:int = this.row - 1;r >= 0; r--) { 120 for (var c:int = this.clm - 1;c >= 0; c--) { 119 var r:int; 120 var c:int; 121 for (r = this.row - 1;r >= 0; r--) { 122 for (c = this.clm - 1;c >= 0; c--) { 121 123 this.m[r][c] = i_copy_from.m[r][c]; 122 124 } … … 214 216 ip = 0; 215 217 // For順変更禁止 218 var i:int; 216 219 for (n = 0;n < dimen; n++) { 217 220 ap_n = ap[n]; 218 221 // wcp = ap + n * rowa; 219 222 p = 0.0; 220 for ( var i:int= n;i < dimen; i++) {223 for (i = n;i < dimen; i++) { 221 224 // for(i = n, wap = wcp, p = 222 225 // 0.0; i < dimen ; i++, wap += … … 305 308 FLARException.trap("未チェックのパス"); 306 309 // For順変更禁止 307 for (var r:int = 0; r < dest.row; r++) { 308 for (var c:int = 0; c < dest.clm; c++) { 310 var r:int; 311 var c:int; 312 for (r = 0; r < dest.row; r++) { 313 for (c = 0; c < dest.clm; c++) { 309 314 dest.m[r][c] = source.m[c][r]; 310 315 } … … 323 328 FLARException.trap("未チェックのパス"); 324 329 // For順変更禁止 325 for (var r:int = 0; r < unit.getRow(); r++) { 326 for (var c:int = 0; c < unit.getClm(); c++) { 330 var r:int; 331 var c:int; 332 for (r = 0; r < unit.getRow(); r++) { 333 for (c = 0; c < unit.getClm(); c++) { 327 334 if (r == c) { 328 335 unit.m[r][c] = 1.0; … … 561 568 562 569 // out = output.getArray(); 563 for (var i:int = 0; i < row; i++) { 564 for (var j:int = 0; j < row; j++) { 570 var i:int; 571 var j:int; 572 var k:int; 573 for (i = 0; i < row; i++) { 574 for (j = 0; j < row; j++) { 565 575 if (j < i) { 566 576 FLARException.trap("未チェックのパス"); … … 575 585 output.m[i][j] = 0; 576 586 // *out = 0.0; 577 for ( var k:int= 0; k < clm; k++) {587 for (k = 0; k < clm; k++) { 578 588 output.m[i][j] += (in1[k] * in2[k]);// *out += *(in1++) 579 589 // * *(in2++); … … 604 614 } 605 615 616 var i:int; 606 617 var k:int; 607 618 var j:int; 608 619 var out_m:Array = i_output.m; 609 620 var w:Number; 610 for ( var i:int= 0; i < clm; i++) {621 for (i = 0; i < clm; i++) { 611 622 for (j = 0; j < clm; j++) { 612 623 if (j < i) { … … 665 676 ev_array[0] = 0.0; 666 677 // ev->v[0] = 0.0; 667 for (var h:int = dim - 1; h > 0; h--) { 668 var j:int = h; 678 679 var h:int; 680 var j:int; 681 var k:int; 682 var i:int; 683 for (h = dim - 1; h > 0; h--) { 684 j = h; 669 685 while (j > 0 && Math.abs(ev_array[j]) > PCA_EPS * (Math.abs(dv_array[j - 1]) + Math.abs(dv_array[j]))) { 670 686 // while(j>0 && fabs(ev->v[j]) >EPS*(fabs(dv->v[j-1])+fabs(dv->v[j]))) … … 693 709 y = ev_array[j + 1]; 694 710 // y = ev->v[j+1]; 695 for ( var k:int= j; k < h; k++) {711 for (k = j; k < h; k++) { 696 712 if (Math.abs(x) >= Math.abs(y)) { 697 713 if (Math.abs(x) > PCA_VZERO) { … … 723 739 // ev->v[k+1]+= s * (c* w- 2* s *ev->v[k+1]); 724 740 725 for ( var i:int= 0; i < dim; i++) {741 for (i = 0; i < dim; i++) { 726 742 x = L_m[k][i]; 727 743 // x = a->m[k*dim+i]; … … 830 846 // m = output->m; 831 847 in_ = input.m; 848 832 849 var i:int; 850 var j:int; 851 var k:int; 833 852 ev_array = ev.getArray(); 834 853 for (i = 0; i < row; i++) { … … 842 861 // work = 1 / 843 862 // sqrt(fabs(ev->v[i])); 844 for ( var j:int= 0; j < clm; j++) {863 for (j = 0; j < clm; j++) { 845 864 sum = 0.0; 846 865 m1 = u.m[i]; 847 866 // m1 = &(u->m[i*row]); 848 867 // m2=input.getPointer(j);//m2 = &(input->m[j]); 849 for ( var k:int= 0; k < row; k++) {868 for (k = 0; k < row; k++) { 850 869 sum += m1[k] + in_[k][j];// sum += *m1 * *m2; 851 870 // m1.incPtr(); //m1++; … … 936 955 // m2 = output->m; 937 956 var i:int; 957 var j:int; 938 958 for (i = 0;i < min; i++) { 939 959 if (ev_array[i] < PCA_VZERO) { … … 941 961 break; 942 962 } 943 for ( var j:int= 0;j < min; j++) {963 for (j = 0;j < min; j++) { 944 964 m2[i][j] = m1[i][j];// *(m2++) = *(m1++); 945 965 } … … 1077 1097 sum = 0.0; 1078 1098 var ev_array:Array = ev.getArray(); 1079 for (var i:int = 0;i < ev.getClm(); i++) { 1099 1100 var i:int; 1101 for (i = 0;i < ev.getClm(); i++) { 1080 1102 // for( i = 0; i < ev->clm; i++ 1081 1103 // ){ … … 1107 1129 var mmax:int; 1108 1130 1109 for (var k:int = 0;k < dimen - 1; k++) { 1131 var k:int; 1132 var i:int; 1133 var j:int; 1134 for (k = 0;k < dimen - 1; k++) { 1110 1135 mmax = k; 1111 for ( var i:int= k + 1;i < dimen; i++) {1136 for (i = k + 1;i < dimen; i++) { 1112 1137 // if (Math.abs(arMatrixDet_MATRIX_get(ap, i, k, rowa)) > 1113 1138 // Math.abs(arMatrixDet_MATRIX_get(ap, mmax, k, rowa))){ … … 1117 1142 } 1118 1143 if (mmax != k) { 1119 for ( var j:int= k;j < dimen; j++) {1144 for (j = k;j < dimen; j++) { 1120 1145 work = ap[k][j]; 1121 1146 // work = MATRIX(ap, k, j, rowa); … … 1195 1220 var a_vec_k:Array; 1196 1221 1197 for (var k:int = 0;k < dim - 2; k++) { 1222 var k:int; 1223 var i:int; 1224 var j:int; 1225 for (k = 0;k < dim - 2; k++) { 1198 1226 1199 1227 a_vec_k = this.m[k]; … … 1216 1244 } 1217 1245 1218 for ( var i:int= k + 1;i < dim; i++) {1246 for (i = k + 1;i < dim; i++) { 1219 1247 s = 0.0; 1220 for ( var j:int= k + 1;j < i; j++) {1248 for (j = k + 1;j < i; j++) { 1221 1249 FLARException.trap("未チェックのパス"); 1222 1250 s += this.m[j][i] * a_vec_k[j];// s += a_array[j][i] *vec.v[j];//s +=a.get(j*dim+i) *v.get(j);//s +=a->m[j*dim+i] * v[j]; as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquareDetector.as
r1606 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 166 166 overlap.reset(label_num); 167 167 168 var vertex1:int; 169 var square_ptr:FLARSquare; 168 170 for (;i < label_num; i++) { 169 171 label_pt = labels[i]; … … 195 197 } 196 198 //頂点候補のインデクスを取得 197 v ar vertex1:int= scanVertex(xcoord, ycoord, coord_num);199 vertex1 = scanVertex(xcoord, ycoord, coord_num); 198 200 199 201 // 頂点候補(vertex1)を先頭に並べなおした配列を作成する。 … … 201 203 202 204 // 領域を準備する。 203 var square_ptr:FLARSquare= o_square_stack.prePush() as FLARSquare;205 square_ptr = o_square_stack.prePush() as FLARSquare; 204 206 205 207 // 頂点情報を取得 … … 240 242 var y:int; 241 243 var ret:int = 0; 242 for (var i:int = 1;i < i_coord_num; i++) { 244 var i:int; 245 for (i = 1; i < i_coord_num; i++) { 243 246 x = i_xcoord[i] - sx; 244 247 y = i_ycoord[i] - sy; … … 279 282 var dmax:int = 0; 280 283 var v1:int = i_vertex1_index; 281 for (var i:int = 1 + i_vertex1_index; i < end_of_coord; i++) { 284 var d:int; 285 var i:int; 286 for (i = 1 + i_vertex1_index; i < end_of_coord; i++) { 282 287 // for(i=1;i<marker_info2->coord_num-1;i++) 283 288 // { 284 var d:int= (i_x_coord[i] - sx) * (i_x_coord[i] - sx) + (i_y_coord[i] - sy) * (i_y_coord[i] - sy);289 d = (i_x_coord[i] - sx) * (i_x_coord[i] - sx) + (i_y_coord[i] - sy) * (i_y_coord[i] - sy); 285 290 if (d > dmax) { 286 291 dmax = d; … … 381 386 // アウトパラメータを受け取るから初期化不要//new FLARMat(2,2); 382 387 const evec_array:Array = evec.getArray(); // double[][] 383 for (var i:int = 0; i < 4; i++) { 384 var w1:Number = (i_mkvertex[i + 1] - i_mkvertex[i] + 1) * 0.05 + 0.5; 385 var st:int = (i_mkvertex[i] + w1); 386 var ed:int = (i_mkvertex[i + 1] - w1); 387 var n:int = ed - st + 1; 388 389 var i:int; 390 var w1:Number; 391 var st:int; 392 var ed:int; 393 var n:int; 394 var l_line_i:FLARLinear; 395 for (i = 0; i < 4; i++) { 396 w1 = (i_mkvertex[i + 1] - i_mkvertex[i] + 1) * 0.05 + 0.5; 397 st = (i_mkvertex[i] + w1); 398 ed = (i_mkvertex[i + 1] - w1); 399 n = ed - st + 1; 388 400 if (n < 2) { 389 401 // nが2以下でmatrix.PCAを計算することはできないので、エラー … … 397 409 // 主成分分析 398 410 input.matrixPCA(evec, ev, mean); 399 var l_line_i:FLARLinear= l_line[i];411 l_line_i = l_line[i]; 400 412 l_line_i.run = evec_array[0][1]; 401 413 // line[i][0] = evec->m[1]; … … 409 421 const l_imvertex:Array = o_square.imvertex; 410 422 // FLARIntPoint[] 423 424 var l_line_2:FLARLinear; 411 425 for (i = 0; i < 4; i++) { 412 426 l_line_i = l_line[i]; 413 var l_line_2:FLARLinear= l_line[(i + 3) % 4];427 l_line_2 = l_line[(i + 3) % 4]; 414 428 w1 = l_line_2.run * l_line_i.rise - l_line_i.run * l_line_2.rise; 415 429 if (w1 == 0.0) { … … 478 492 const c:Number = lx_coord[ed] * ly_coord[st] - ly_coord[ed] * lx_coord[st]; 479 493 var dmax:Number = 0; 480 for (var i:int = st + 1; i < ed; i++) { 481 var d:Number = a * lx_coord[i] + b * ly_coord[i] + c; 494 495 var i:int; 496 var d:Number; 497 for (i = st + 1; i < ed; i++) { 498 d = a * lx_coord[i] + b * ly_coord[i] + c; 482 499 if (d * d > dmax) { 483 500 dmax = d * d; … … 552 569 const px1:int = int(i_label.pos_x); 553 570 const py1:int = int(i_label.pos_y); 554 for (var i:int = this._length - 1;i >= 0; i--) { 555 var px2:int = int(label_pt[i].pos_x); 556 var py2:int = int(label_pt[i].pos_y); 557 var d:int = (px1 - px2) * (px1 - px2) + (py1 - py2) * (py1 - py2); 571 572 var i:int; 573 var px2:int; 574 var py2:int; 575 var d:int; 576 for (i = this._length - 1;i >= 0; i--) { 577 px2 = int(label_pt[i].pos_x); 578 py2 = int(label_pt[i].pos_y); 579 d = (px1 - px2) * (px1 - px2) + (py1 - py2) * (py1 - py2); 558 580 if (d < label_pt[i].area / 4) { 559 581 // 対象外 as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARVec.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 109 109 throw new FLARException();// exit(); 110 110 } 111 for (var i:int = i_start;i < this.clm; i++) { 111 var i:int; 112 for (i = i_start;i < this.clm; i++) { 112 113 FLARException.trap("未チェックのパス"); 113 114 result += this.v[i] * y.v[i];// result += x->v[i] * y->v[i]; … … 129 130 var s:Number; 130 131 var t:Number; 132 var i:int; 131 133 s = Math.sqrt(this.vecInnerproduct(this, i_start)); 132 134 // double[] x_array=x.getArray(); … … 141 143 t = 1 / Math.sqrt(this.v[i_start] * s);// t = 1 / sqrt(x->v[0] * s); 142 144 } 143 for ( var i:int= i_start; i < this.clm; i++) {145 for (i = i_start; i < this.clm; i++) { 144 146 FLARException.trap("未チェックのパス"); 145 147 this.v[i] *= t;// x->v[i] *= t; as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingImage.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 108 108 const clip1:int = i_label.clip_r; 109 109 // p1=ShortPointer.wrap(limage,j*xsize+clip.get());//p1 =&(limage[j*xsize+clip[0]]); 110 for (var i:int = i_label.clip_l; i <= clip1; i++) { // for( i = clip[0]; i <=clip[1]; i++, p1++ ) { 110 111 var i:int; 112 for (i = i_label.clip_l; i <= clip1; i++) { // for( i = clip[0]; i <=clip[1]; i++, p1++ ) { 111 113 w = limage_j[i]; 112 114 if (w > 0 && index_table[w - 1] == i_label_id) { as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingImageBitmapData.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 112 112 const clip1:int = i_label.clip_r; 113 113 // p1=ShortPointer.wrap(limage,j*xsize+clip.get());//p1 =&(limage[j*xsize+clip[0]]); 114 for (var i:int = i_label.clip_l; i <= clip1; i++) { // for( i = clip[0]; i <=clip[1]; i++, p1++ ) { 114 var i:int; 115 for (i = i_label.clip_l; i <= clip1; i++) { // for( i = clip[0]; i <=clip[1]; i++, p1++ ) { 115 116 // w = limage_j[i]; 116 117 w = this._labeled.getPixel(i, i_label.clip_t); as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabelingLabelStack.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 67 67 var h:int = len * 13 / 10; 68 68 var item:Array = this._items; // FLARLabelingLabel[] 69 70 var swaps:int; 71 var temp:FLARLabelingLabel; 69 72 for(;;) { 70 var swaps:int= 0;73 swaps = 0; 71 74 for (var i:int = 0;i + h < len; i++) { 72 75 if (item[i + h].area > item[i].area) { 73 var temp:FLARLabelingLabel= item[i + h];76 temp = item[i + h]; 74 77 item[i + h] = item[i]; 75 78 item[i] = temp; as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabeling_ARToolKit.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 51 51 // NyLabelingImageのイメージ初期化(枠書き) 52 52 var img:Array = i_destination_image.getBufferReader().getBuffer() as Array; // int[][] 53 for (var i:int = 0; i < size.w; i++) { 53 54 var i:int; 55 for (i = 0; i < size.w; i++) { 54 56 img[0][i] = 0; 55 57 img[size.h - 1][i] = 0; as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/labeling/FLARLabeling_BitmapData.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 117 117 // label_list.reserv(256); 118 118 var labels:Array = label_list.getArray(); 119 var label:FLARLabelingLabel; 119 120 while (!currentRect.isEmpty()) { 120 121 hLineRect.y = currentRect.top; … … 122 123 hSearchRect = hSearch.getColorBoundsRect(0xffffff, 0xffffff, true); 123 124 124 var label:FLARLabelingLabel = label_list.prePush() as FLARLabelingLabel;//labels[index++];125 label = label_list.prePush() as FLARLabelingLabel;//labels[index++]; 125 126 label_img.floodFill(hSearchRect.x, hLineRect.y, ++index); 126 127 labelRect = label_img.getColorBoundsRect(0xffffff, index, true); as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/match/FLARMatchPatt_Color_WITHOUT_PCA.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 165 165 var l_height:int = this.height; 166 166 linput = this.input; 167 168 var sum:int; 169 var i:int; 170 var k:int; 171 var sum2:Number; 167 172 for (var j:int = 0;j < 4; j++) { 168 var sum:int= 0;173 sum = 0; 169 174 pat_j = pat[j]; 170 for ( var i:int= l_height - 1;i >= 0; i--) {175 for (i = l_height - 1;i >= 0; i--) { 171 176 // for(int i=0;i<Config.AR_PATT_SIZE_Y;i++){ 172 177 input_i = linput[i]; 173 178 pat_j_i = pat_j[i]; 174 for ( var k:int= l_width - 1;k >= 0; k--) {179 for (k = l_width - 1;k >= 0; k--) { 175 180 pat_j_i_k = pat_j_i[k]; 176 181 input_i_k = input_i[k]; … … 184 189 } 185 190 } 186 var sum2:Number= sum / patpow[j] / datapow;191 sum2 = sum / patpow[j] / datapow; 187 192 // sum2 = sum / patpow[k][j]/ datapow; 188 193 if (sum2 > max) { as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/param/FLARCameraDistortionFactor.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 115 115 const d3:Number = this._f3; 116 116 const d2_w:Number = this._f2 / 100000000.0; 117 118 var d:Number; 117 119 for (var i:int = 0; i < i_size; i++) { 118 120 x = (i_in[i].x - d0) * d3; … … 122 124 o_out[i].y = d1; 123 125 } else { 124 var d:Number= 1.0 - d2_w * (x * x + y * y);126 d = 1.0 - d2_w * (x * x + y * y); 125 127 o_out[i].x = x * d + d0; 126 128 o_out[i].y = y * d + d1; … … 206 208 const d3:Number = this._f3; 207 209 const p:Number = this._f2 / 100000000.0; 208 for (var j:int = 0; j < i_num; j++) { 210 211 var j:int; 212 var i:int; 213 for (j = 0; j < i_num; j++) { 209 214 210 215 px = i_x_coord[i_start + j] - d0; … … 215 220 // Optimize//q = z0 = Math.sqrt(px*px+py*py); 216 221 217 for ( var i:int= 1; ; i++) {222 for (i = 1; ; i++) { 218 223 if (z0 != 0.0) { 219 224 // Optimize opttmp_1 as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/param/FLARPerspectiveProjectionMatrix.as
r1595 r1627 1 /*1 /* 2 2 * PROJECT: FLARToolKit 3 3 * -------------------------------------------------------------------------------- … … 108 108 var cpara:Array = o_cpara.getArray(); // double[][] 109 109 var trans:Array = o_trans.getArray(); // do