チェンジセット 1755
- コミット日時:
- 2008/10/30 01:26:56 (2 ヶ月前)
- ファイル:
-
- as3/FLARToolKit/trunk/samples/Data (更新) (1 prop)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/FLARCubeMarkerDetectorSample.as (追加)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/FLARMultiMarkerDetectorSample.as (追加)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/MultiMarkerDetectorSample.as (削除)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/detector (削除)
- as3/FLARToolKit/trunk/samples/org/tarotaro/flash/ar/layers/FLARCubeMarkerLayer.as (追加)
- as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/core/types/FLARIntSize.as (更新) (2 diffs)
- as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/CubeMarker.as (更新) (5 diffs)
- as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/CubeMarkerDetector.as (削除)
- as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/CubeMarkerDirection.as (更新) (1 diff)
- as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/FLARCubeMarkerDetector.as (追加)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/FLARToolKit/trunk/samples/Data
- 属性の設定値: svn:ignore (変更前)
*.jpg
(変更後)
*.jpg
saito-marker.png
saito.pat
- 属性の設定値: svn:ignore (変更前)
as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/core/types/FLARIntSize.as
r1752 r1755 31 31 package org.libspark.flartoolkit.core.types { 32 32 33 public class FLARIntSize {33 public class FLARIntSize{ 34 34 35 35 public var h:int; … … 77 77 } 78 78 79 overridepublic function toString():String79 public function toString():String 80 80 { 81 return "(width=" + _size.w + " , height=" + this._size.h + ")";81 return "(width=" + w + " , height=" + h + ")"; 82 82 } 83 83 } as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/CubeMarker.as
r1752 r1755 35 35 36 36 import org.libspark.flartoolkit.core.FLARCode; 37 import org.libspark.flartoolkit.FLARException; 37 38 38 39 /** … … 82 83 var code:FLARCode = this[key] as FLARCode; 83 84 if (code != null && code != this.top) { 84 if ( cw != code.getWidth() || ch != code.getHeight()) {85 if (!this.checkResolution(this.top,code)) { 85 86 // 違う解像度のが混ざっている。 86 throw new FLARException( );87 throw new FLARException("コード[" + key + "]の解像度が不正です。"); 87 88 } 88 89 } 89 90 } 91 } 92 93 private function checkResolution(src:FLARCode,dest:FLARCode):Boolean 94 { 95 const cw:int = src.getWidth(); 96 const ch:int = src.getHeight(); 97 return (cw == dest.getWidth() && ch == dest.getHeight()); 90 98 } 91 99 … … 94 102 public function set top(value:FLARCode):void 95 103 { 96 _top = value; 104 if (_top == null || this.checkResolution(_top, value)) _top = value; 105 else throw new FLARException("コード[top]の解像度が不正です。"); 97 106 } 98 107 … … 101 110 public function set bottom(value:FLARCode):void 102 111 { 103 _bottom = value; 112 if (_bottom == null || this.checkResolution(_bottom, value)) _bottom = value; 113 else throw new FLARException("コード[bottom]の解像度が不正です。"); 104 114 } 105 115 … … 129 139 public function set right(value:FLARCode):void 130 140 { 131 _right = value; 141 if (_right == null || this.checkResolution(_right, value)) _right = value; 142 else throw new FLARException("コード[right]の解像度が不正です。"); 132 143 } 133 144 as3/FLARToolKit/trunk/src/org/libspark/flartoolkit/detector/CubeMarkerDirection.as
r1752 r1755 38 38 * @author 太郎(tarotaro.org) 39 39 */ 40 public finalclass CubeMarkerDirection40 public class CubeMarkerDirection 41 41 { 42 43 public function CubeMarkerDirection() 44 { 45 public const TOP:String = "top"; 46 public const BOTTOM:String = "bottom"; 47 public const LEFT:String = "left"; 48 public const RIGHT:String = "right"; 49 public const FRONT:String = "front"; 50 public const BACK:String = "back"; 51 } 52 42 public static const TOP:String = "top"; 43 public static const BOTTOM:String = "bottom"; 44 public static const LEFT:String = "left"; 45 public static const RIGHT:String = "right"; 46 public static const FRONT:String = "front"; 47 public static const BACK:String = "back"; 53 48 } 54 49
