チェンジセット 1787
- コミット日時:
- 2008/11/04 02:33:35 (2 ヶ月前)
- ファイル:
-
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/CubeFace.as (追加)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/CubeMarkerDirection.as (削除)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/CubeMarkerMatchResultTemporaryHolder.as (更新) (6 diffs)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/FLARCubeMarkerDetector.as (更新) (9 diffs)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/layers/FLARCubeMarkerLayer.as (更新) (2 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/CubeMarkerMatchResultTemporaryHolder.as
r1774 r1787 75 75 { 76 76 trace("top:", topConf, "front:", frontConf, "back:", backConf, "left:", leftConf, "right:", rightConf); 77 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.TOP;77 _currentMaxConfidenceMarkerDirection = CubeFace.TOP; 78 78 _currentMaxConfidence = topConf; 79 79 _currentMaxConfidenceDirection = topDir; … … 81 81 82 82 if (bottomConf > _currentMaxConfidence) { 83 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.BOTTOM;83 _currentMaxConfidenceMarkerDirection = CubeFace.BOTTOM; 84 84 _currentMaxConfidence = bottomConf; 85 85 _currentMaxConfidenceDirection = bottomDir; … … 87 87 } 88 88 if (frontConf > _currentMaxConfidence) { 89 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.FRONT;89 _currentMaxConfidenceMarkerDirection = CubeFace.FRONT; 90 90 _currentMaxConfidence = frontConf; 91 91 _currentMaxConfidenceDirection = frontDir; … … 93 93 } 94 94 if (backConf > _currentMaxConfidence) { 95 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.BACK;95 _currentMaxConfidenceMarkerDirection = CubeFace.BACK; 96 96 _currentMaxConfidence = backConf; 97 97 _currentMaxConfidenceDirection = backDir; … … 99 99 } 100 100 if (leftConf > _currentMaxConfidence) { 101 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.LEFT;101 _currentMaxConfidenceMarkerDirection = CubeFace.LEFT; 102 102 _currentMaxConfidence = leftConf; 103 103 _currentMaxConfidenceDirection = leftDir; … … 105 105 } 106 106 if (rightConf > _currentMaxConfidence) { 107 _currentMaxConfidenceMarkerDirection = Cube MarkerDirection.RIGHT;107 _currentMaxConfidenceMarkerDirection = CubeFace.RIGHT; 108 108 _currentMaxConfidence = rightConf; 109 109 _currentMaxConfidenceDirection = rightDir; as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector/FLARCubeMarkerDetector.as
r1774 r1787 130 130 immidateEndConfidence:Number = 0.9,endConfidence:Number = 0.8) { 131 131 132 DETECT_FLAGS[Cube MarkerDirection.TOP] = 1;133 DETECT_FLAGS[Cube MarkerDirection.BOTTOM] = 2;134 DETECT_FLAGS[Cube MarkerDirection.FRONT] = 4;135 DETECT_FLAGS[Cube MarkerDirection.BACK] = 8;136 DETECT_FLAGS[Cube MarkerDirection.LEFT] = 16;137 DETECT_FLAGS[Cube MarkerDirection.RIGHT] = 32;132 DETECT_FLAGS[CubeFace.TOP] = 1; 133 DETECT_FLAGS[CubeFace.BOTTOM] = 2; 134 DETECT_FLAGS[CubeFace.FRONT] = 4; 135 DETECT_FLAGS[CubeFace.BACK] = 8; 136 DETECT_FLAGS[CubeFace.LEFT] = 16; 137 DETECT_FLAGS[CubeFace.RIGHT] = 32; 138 138 139 139 //閾値を設定 … … 172 172 this._detectFlag = 0; 173 173 if (this._marker == null) return; 174 this._detectFlag |= this._marker.top == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.TOP];175 this._detectFlag |= this._marker.bottom == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.BOTTOM];176 this._detectFlag |= this._marker.front == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.FRONT];177 this._detectFlag |= this._marker.back == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.BACK];178 this._detectFlag |= this._marker.left == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.LEFT];179 this._detectFlag |= this._marker.right == null ? 0 : DETECT_FLAGS[Cube MarkerDirection.RIGHT];174 this._detectFlag |= this._marker.top == null ? 0 : DETECT_FLAGS[CubeFace.TOP]; 175 this._detectFlag |= this._marker.bottom == null ? 0 : DETECT_FLAGS[CubeFace.BOTTOM]; 176 this._detectFlag |= this._marker.front == null ? 0 : DETECT_FLAGS[CubeFace.FRONT]; 177 this._detectFlag |= this._marker.back == null ? 0 : DETECT_FLAGS[CubeFace.BACK]; 178 this._detectFlag |= this._marker.left == null ? 0 : DETECT_FLAGS[CubeFace.LEFT]; 179 this._detectFlag |= this._marker.right == null ? 0 : DETECT_FLAGS[CubeFace.RIGHT]; 180 180 } 181 181 … … 275 275 276 276 //１．まずはTOPから 277 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.TOP]) {277 if (detectFlagTemp & DETECT_FLAGS[CubeFace.TOP]) { 278 278 _match_patt.evaluate(this._marker.top); 279 279 result.topConf = _match_patt.getConfidence(); … … 283 283 //即時終了条件1に一致 284 284 return this.createDetectedResult 285 (result.topConf, result.topDir, square, Cube MarkerDirection.TOP);285 (result.topConf, result.topDir, square, CubeFace.TOP); 286 286 } 287 287 } 288 288 289 289 //２．次はFRONT 290 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.FRONT]) {290 if (detectFlagTemp & DETECT_FLAGS[CubeFace.FRONT]) { 291 291 _match_patt.evaluate(this._marker.front); 292 292 result.frontConf = _match_patt.getConfidence(); … … 296 296 //即時終了条件1に一致 297 297 return this.createDetectedResult 298 (result.frontConf, result.frontDir, square, Cube MarkerDirection.FRONT);298 (result.frontConf, result.frontDir, square, CubeFace.FRONT); 299 299 } 300 300 } 301 301 302 302 //３．次はBACK 303 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.BACK]) {303 if (detectFlagTemp & DETECT_FLAGS[CubeFace.BACK]) { 304 304 _match_patt.evaluate(this._marker.back); 305 305 result.backConf = _match_patt.getConfidence(); … … 309 309 //即時終了条件1に一致 310 310 return this.createDetectedResult 311 (result.backConf, result.backDir, square, Cube MarkerDirection.BACK);311 (result.backConf, result.backDir, square, CubeFace.BACK); 312 312 } 313 313 } 314 314 315 315 //４．次はLEFT 316 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.LEFT]) {316 if (detectFlagTemp & DETECT_FLAGS[CubeFace.LEFT]) { 317 317 _match_patt.evaluate(this._marker.left); 318 318 result.leftConf = _match_patt.getConfidence(); … … 322 322 //即時終了条件1に一致 323 323 return this.createDetectedResult 324 (result.leftConf, result.leftDir, square, Cube MarkerDirection.LEFT);324 (result.leftConf, result.leftDir, square, CubeFace.LEFT); 325 325 } 326 326 } 327 327 328 328 //５．次はRIGHT 329 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.RIGHT]) {329 if (detectFlagTemp & DETECT_FLAGS[CubeFace.RIGHT]) { 330 330 _match_patt.evaluate(this._marker.right); 331 331 result.rightConf = _match_patt.getConfidence(); … … 335 335 //即時終了条件1に一致 336 336 return this.createDetectedResult 337 (result.rightConf, result.rightDir, square, Cube MarkerDirection.RIGHT);337 (result.rightConf, result.rightDir, square, CubeFace.RIGHT); 338 338 } 339 339 } 340 340 341 341 //６．最後はBOTTOM 342 if (detectFlagTemp & DETECT_FLAGS[Cube MarkerDirection.BOTTOM]) {342 if (detectFlagTemp & DETECT_FLAGS[CubeFace.BOTTOM]) { 343 343 _match_patt.evaluate(this._marker.bottom); 344 344 result.bottomConf = _match_patt.getConfidence(); … … 348 348 //即時終了条件1に一致 349 349 return this.createDetectedResult 350 (result.bottomConf, result.bottomDir, square, Cube MarkerDirection.BOTTOM);350 (result.bottomConf, result.bottomDir, square, CubeFace.BOTTOM); 351 351 } 352 352 } as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/layers/FLARCubeMarkerLayer.as
r1774 r1787 50 50 import org.tarotaro.flash.ar.detector.CubeMarker; 51 51 import org.tarotaro.flash.ar.detector.CubeMarkerDetectedResult; 52 import org.tarotaro.flash.ar.detector.Cube MarkerDirection;52 import org.tarotaro.flash.ar.detector.CubeFace; 53 53 import org.tarotaro.flash.ar.detector.FLARCubeMarkerDetector; 54 54 … … 114 114 if (r != null && r.confidence > this._confidence) { 115 115 trace(r.markerDirection, r.confidence); 116 if (r.markerDirection == Cube MarkerDirection.FRONT) {116 if (r.markerDirection == CubeFace.FRONT) { 117 117 this._detector.getTransmationMatrix(r, this._resultMat); 118 118 this._baseNode.setTransformMatrix(this._resultMat);
