git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@676 7cac0...

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
index e95ffe8..5aad4f4 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
@@ -4,6 +4,9 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.types.NyARBufferType;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARReality;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
 \r
 \r
 /**\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
index acdf285..da6de2a 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
@@ -1,10 +1,9 @@
-package jp.nyatla.nyartoolkit.dev.rpf.mklib;\r
+package jp.nyatla.nyartoolkit.rpf.mklib;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.RawbitSerialIdTable.IdentifyIdResult;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+\r
 /**\r
  * 未知の矩形を認識するサンプル。\r
  * 絶対的な寸法は求められないので、矩形の辺比率を推定して返します。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/RawbitSerialIdTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/RawbitSerialIdTable.java
index c03dde7..459699f 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/RawbitSerialIdTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/RawbitSerialIdTable.java
@@ -1,12 +1,12 @@
-package jp.nyatla.nyartoolkit.dev.rpf.mklib;\r
+package jp.nyatla.nyartoolkit.rpf.mklib;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.stack.NyARObjectStack;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARRectTargetStatus;\r
 import jp.nyatla.nyartoolkit.nyidmarker.*;\r
 import jp.nyatla.nyartoolkit.nyidmarker.data.NyIdMarkerDataEncoder_RawBit;\r
 import jp.nyatla.nyartoolkit.nyidmarker.data.NyIdMarkerData_RawBit;\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/INyARDisposable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/INyARDisposable.java
index 3c7e1d9..8be3cd0 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/INyARDisposable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/INyARDisposable.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.reality.nyartk;\r
 \r
 /**\r
  * オブジェクトの破棄タイミングを受け取るインタフェイスです。\r

diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
index 4cbd6d5..d276884 100644 (file)
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk;\r
+package jp.nyatla.nyartoolkit.rpf.reality.nyartk;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.types.stack.*;\r