[バックアップ]NyARToolkit

diff --git a/sample/toys/.classpath b/sample/toys/.classpath
new file mode 100644 (file)
index 0000000..3a077b2
--- /dev/null
+++ b/sample/toys/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry path="" kind="src"/>\r
+       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
+       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
+       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
+       <classpathentry path="/NyARToolkit.utils.jogl" combineaccessrules="false" kind="src"/>\r
+       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
+       <classpathentry path="C:/Program Files/Java/jogl/lib/jogl.jar" kind="lib"/>\r
+       <classpathentry path="bin" kind="output"/>\r
+</classpath>\r

diff --git a/sample/toys/.project b/sample/toys/.project
new file mode 100644 (file)
index 0000000..d9db447
--- /dev/null
+++ b/sample/toys/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>NyARToolkit.toys</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java b/sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
index e176121..530ea0c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
@@ -29,14 +29,14 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.vertexdetect;\r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.labeling.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.*;\r
-\r
+import jp.nyatla.nyartoolkit.toys.x2.*;\r
 \r
 /**\r
  * 矩形座標をPCAではなく、頂点座標そのものからSquare位置を計算するクラス\r
@@ -235,7 +235,7 @@ public class NyARQrCodeDetector implements INyARSquareDetector
                o_line.intercept=(i_v1.y+(o_line.run/o_line.rise)*(i_v1.x))*rise_;\r
                \r
        }\r
-/*\r
+\r
        private void getSquare(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARSquare o_square)\r
        {\r
                final NyARCameraDistortionFactor dist_factor=this._dist_factor_ref;             \r
@@ -255,7 +255,7 @@ public class NyARQrCodeDetector implements INyARSquareDetector
                getLine(vertex[0],vertex[3],o_square.line[3]);  \r
                return;\r
        }\r
-*/\r
+\r
        /**\r
         * 辺からの対角線が最長になる点を対角線候補として返す。\r
         * \r

diff --git a/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
similarity index 95%
rename from sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
index 4cded6d..f0d5bb1 100644 (file)
--- a/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.jogl.sample.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.NyARCode;\r

diff --git a/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
similarity index 96%
rename from sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
index e2b2859..c11308a 100644 (file)
--- a/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
@@ -24,7 +24,7 @@
  * THE SOFTWARE.\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.jogl.sample.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import java.awt.event.WindowAdapter;\r
 import java.awt.event.WindowEvent;\r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
index 14f2156..66189c8 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r
@@ -37,6 +37,7 @@ import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.labeling.*;\r
 \r
 /**\r
+ * 計算部から浮動小数点計算を除外したNyARLabeling_ARToolKit\r
  * NyARLabeling_ARToolKitと同じ処理をするけど、エリア計算にintを使う。 \r
  * 画面サイズが1600ｘ1600を超えると挙動が怪しくなる。\r
  * \r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
index 249bc2f..4a123ff 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
@@ -29,13 +29,14 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;\r
 \r
 \r
 \r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
index 0ec2979..961f737 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
@@ -38,6 +38,7 @@ import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.*;
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.optimize.*;\r
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;\r
 \r
 /**\r
  * 基本姿勢と実画像を一致するように、角度を微調整→平行移動量を再計算\r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
similarity index 94%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
index 284430e..c5b1dd9 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 /**\r
  * 単純Sinテーブル\r
  *\r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
index b3a0e24..ae1eb0e 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.*;\r
@@ -42,6 +42,7 @@ import jp.nyatla.nyartoolkit.core.transmat.*;
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.NyARRasterFilter_ARToolkitThreshold;\r
 \r
+\r
 /**\r
  * 画像からARCodeに最も一致するマーカーを1個検出し、その変換行列を計算するクラスです。\r
  * \r
@@ -86,7 +87,7 @@ public class NyARSingleDetectMarker_X2
        {\r
                final NyARIntSize scr_size=i_param.getScreenSize();             \r
                // 解析オブジェクトを作る\r
-               this._square_detect = new NyARQrCodeDetector(i_param.getDistortionFactor(),scr_size);\r
+               this._square_detect = new NyARSquareDetector(i_param.getDistortionFactor(),scr_size);\r
                this._transmat = new NyARTransMat_X2(i_param);\r
                // 比較コードを保存\r
                this._code = i_code;\r

diff --git a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
similarity index 93%
rename from src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
index 8cada57..0297113 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
@@ -29,12 +29,14 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.nymodel.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.NyARFitVecCalculator;\r
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;\r
+\r
 \r
 \r
 /**\r

diff --git a/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
similarity index 90%
rename from src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
rename to sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
index e2e25f7..bcad2e6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
+++ b/sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.sample.x2;\r
+package jp.nyatla.nyartoolkit.toys.x2;\r
 \r
 import java.io.*;\r
 import java.util.*;\r
@@ -48,11 +48,11 @@ import jp.nyatla.nyartoolkit.nymodel.x2.*;
  */\r
 public class RawFileTest_X2\r
 {\r
-       private final String code_file = "../Data/patt.hiro";\r
+       private final String code_file = "../../Data/patt.hiro";\r
 \r
-       private final String data_file = "../Data/320x240ABGR.raw";\r
+       private final String data_file = "../../Data/320x240ABGR.raw";\r
 \r
-       private final String camera_file = "../Data/camera_para.dat";\r
+       private final String camera_file = "../../Data/camera_para.dat";\r
 \r
        public RawFileTest_X2()\r
        {\r

diff --git a/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java b/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java
index dadbfff..2f7d9e8 100644 (file)
--- a/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java
+++ b/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java
@@ -11,9 +11,9 @@ import javax.media.format.*;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.jmf.utils.*;
-import jp.nyatla.nyartoolkit.nymodel.x2.NyARLabeling_ARToolKit_X2;
 import jp.nyatla.nyartoolkit.core.*;
-import jp.nyatla.nyartoolkit.nymodel.x2.NyARTransMat_X2;
+import jp.nyatla.nyartoolkit.toys.x2.NyARLabeling_ARToolKit_X2;
+import jp.nyatla.nyartoolkit.toys.x2.NyARTransMat_X2;
 
 import java.awt.*;