チェンジセット 1606

コミット日時:

2008/10/13 02:42:22 (3 ヶ月前)

コミッタ:

saqoosha

ログメッセージ:

FLARSquare.label プロパティ追加。

ファイル:

• as3/FLARToolKit/branches/2.0/ChangeLog (更新) (1 diff)
• as3/FLARToolKit/branches/2.0/bin/FLARToolKit.swc (更新) (変更前)
• as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquare.as (更新) (2 diffs)
• as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquareDetector.as (更新) (1 diff)

as3/FLARToolKit/branches/2.0/ChangeLog

@@ -2 +2 @@
-
-        * FLARSingleMarkerDetector: Added "getSquare" function.
+        
+        * FLARSquare: Added "label" property.
-
-

as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquare.as

@@ -30 +30 @@
-
-package org.libspark.flartoolkit.core {
+        import org.libspark.flartoolkit.core.labeling.FLARLabelingLabel;
-        import org.libspark.flartoolkit.core.types.FLARDoublePoint2d;
-        import org.libspark.flartoolkit.core.types.FLARIntPoint;
@@ -46 +47 @@
-                public var sqvertex:Array = new Array(4);
-                public var imvertex:Array = new Array(4);
+                public var label:FLARLabelingLabel;
-
-                public function FLARSquare() {

as3/FLARToolKit/branches/2.0/src/org/libspark/flartoolkit/core/FLARSquareDetector.as

@@ -217 +217 @@
-                                // 検出済の矩形の属したラベルを重なりチェックに追加する。
-                                overlap.push(label_pt);
+                                
+                                // 後から参照できるように
+                                square_ptr.label = label_pt;
-                        }       
-                        return;