From 5b73a3a016709ff3652be0389a185f3f80172b2d Mon Sep 17 00:00:00 2001
From: nyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Date: Thu, 25 Sep 2008 15:14:14 +0000
Subject: [PATCH] =?utf8?q?[=E3=83=90=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83?=
 =?utf8?q?=E3=83=97]NyARToolkit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@180 7cac0a50-4618-4814-88d0-24b83990f816
---
 trunk/sample/toys/.classpath                            | 11 +++++++++++
 trunk/sample/toys/.project                              | 17 +++++++++++++++++
 .../toys/vertexdetect}/NyARQrCodeDetector.java          |  8 ++++----
 .../toys}/x2/GLNyARSingleDetectMarker_X2.java           |  2 +-
 .../nyatla/nyartoolkit/toys}/x2/JavaSimpleLite_X2.java  |  2 +-
 .../nyartoolkit/toys}/x2/NyARLabeling_ARToolKit_X2.java |  3 ++-
 .../nyatla/nyartoolkit/toys}/x2/NyARRotMatrix_X2.java   |  3 ++-
 .../nyartoolkit/toys}/x2/NyARRotTransOptimize_X2.java   |  3 ++-
 .../jp/nyatla/nyartoolkit/toys}/x2/NyARSinTable.java    |  2 +-
 .../nyartoolkit/toys}/x2/NyARSingleDetectMarker_X2.java |  5 +++--
 .../jp/nyatla/nyartoolkit/toys}/x2/NyARTransMat_X2.java |  4 +++-
 .../jp/nyatla/nyartoolkit/toys}/x2/RawFileTest_X2.java  |  8 ++++----
 .../jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java |  4 ++--
 13 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 trunk/sample/toys/.classpath
 create mode 100644 trunk/sample/toys/.project
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel/x2 => sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect}/NyARQrCodeDetector.java (96%)
 rename trunk/sample/{jogl/jp/nyatla/nyartoolkit/jogl/sample => toys/jp/nyatla/nyartoolkit/toys}/x2/GLNyARSingleDetectMarker_X2.java (95%)
 rename trunk/sample/{jogl/jp/nyatla/nyartoolkit/jogl/sample => toys/jp/nyatla/nyartoolkit/toys}/x2/JavaSimpleLite_X2.java (96%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARLabeling_ARToolKit_X2.java (96%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARRotMatrix_X2.java (95%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARRotTransOptimize_X2.java (96%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARSinTable.java (94%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARSingleDetectMarker_X2.java (95%)
 rename trunk/{src/jp/nyatla/nyartoolkit/nymodel => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/NyARTransMat_X2.java (93%)
 rename trunk/{src/jp/nyatla/nyartoolkit/sample => sample/toys/jp/nyatla/nyartoolkit/toys}/x2/RawFileTest_X2.java (90%)

diff --git a/trunk/sample/toys/.classpath b/trunk/sample/toys/.classpath
new file mode 100644
index 0000000..3a077b2
--- /dev/null
+++ b/trunk/sample/toys/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry path="" kind="src"/>
+	<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+	<classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>
+	<classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>
+	<classpathentry path="/NyARToolkit.utils.jogl" combineaccessrules="false" kind="src"/>
+	<classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>
+	<classpathentry path="C:/Program Files/Java/jogl/lib/jogl.jar" kind="lib"/>
+	<classpathentry path="bin" kind="output"/>
+</classpath>
diff --git a/trunk/sample/toys/.project b/trunk/sample/toys/.project
new file mode 100644
index 0000000..d9db447
--- /dev/null
+++ b/trunk/sample/toys/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>NyARToolkit.toys</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
index e176121..530ea0c 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARQrCodeDetector.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/vertexdetect/NyARQrCodeDetector.java
@@ -29,14 +29,14 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.vertexdetect;
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.labeling.*;
 import jp.nyatla.nyartoolkit.core.raster.*;
 import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.param.*;
 import jp.nyatla.nyartoolkit.core.*;
-
+import jp.nyatla.nyartoolkit.toys.x2.*;
 
 /**
  * 矩形座標をPCAではなく、頂点座標そのものからSquare位置を計算するクラス
@@ -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_;
 		
 	}
-/*
+
 	private void getSquare(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARSquare o_square)
 	{
 		final NyARCameraDistortionFactor dist_factor=this._dist_factor_ref;		
@@ -255,7 +255,7 @@ public class NyARQrCodeDetector implements INyARSquareDetector
 		getLine(vertex[0],vertex[3],o_square.line[3]);	
 		return;
 	}
-*/
+
 	/**
 	 * 辺からの対角線が最長になる点を対角線候補として返す。
 	 * 
diff --git a/trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
similarity index 95%
rename from trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
index 4cded6d..f0d5bb1 100644
--- a/trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/GLNyARSingleDetectMarker_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/GLNyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.jogl.sample.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.NyARCode;
diff --git a/trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
similarity index 96%
rename from trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
index e2b2859..c11308a 100644
--- a/trunk/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/x2/JavaSimpleLite_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/JavaSimpleLite_X2.java
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  * 
  */
-package jp.nyatla.nyartoolkit.jogl.sample.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
index 14f2156..66189c8 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARLabeling_ARToolKit_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.raster.*;
@@ -37,6 +37,7 @@ import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.labeling.*;
 
 /**
+ * 計算部から浮動小数点計算を除外したNyARLabeling_ARToolKit
  * NyARLabeling_ARToolKitと同じ処理をするけど、エリア計算にintを使う。 
  * 画面サイズが1600ｘ1600を超えると挙動が怪しくなる。
  * 
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
index 249bc2f..4a123ff 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotMatrix_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotMatrix_X2.java
@@ -29,13 +29,14 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;
 import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;
 import jp.nyatla.nyartoolkit.core.param.*;
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;
 
 
 
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
similarity index 96%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
index 0ec2979..961f737 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARRotTransOptimize_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 
 import jp.nyatla.nyartoolkit.NyARException;
@@ -38,6 +38,7 @@ import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.*;
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.*;
 import jp.nyatla.nyartoolkit.core.types.*;
 import jp.nyatla.nyartoolkit.core.transmat.optimize.*;
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;
 
 /**
  * 基本姿勢と実画像を一致するように、角度を微調整→平行移動量を再計算
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
similarity index 94%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
index 284430e..c5b1dd9 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSinTable.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSinTable.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 /**
  * 単純Sinテーブル
  *
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
index b3a0e24..ae1eb0e 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.*;
@@ -42,6 +42,7 @@ import jp.nyatla.nyartoolkit.core.transmat.*;
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.NyARRasterFilter_ARToolkitThreshold;
 
+
 /**
  * 画像からARCodeに最も一致するマーカーを1個検出し、その変換行列を計算するクラスです。
  * 
@@ -86,7 +87,7 @@ public class NyARSingleDetectMarker_X2
 	{
 		final NyARIntSize scr_size=i_param.getScreenSize();		
 		// 解析オブジェクトを作る
-		this._square_detect = new NyARQrCodeDetector(i_param.getDistortionFactor(),scr_size);
+		this._square_detect = new NyARSquareDetector(i_param.getDistortionFactor(),scr_size);
 		this._transmat = new NyARTransMat_X2(i_param);
 		// 比較コードを保存
 		this._code = i_code;
diff --git a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
similarity index 93%
rename from trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
index 8cada57..0297113 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/NyARTransMat_X2.java
@@ -29,12 +29,14 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.nymodel.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.*;
 import jp.nyatla.nyartoolkit.core.transmat.*;
 import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.NyARFitVecCalculator;
+import jp.nyatla.nyartoolkit.toys.x2.NyARSinTable;
+
 
 
 /**
diff --git a/trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
similarity index 90%
rename from trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
rename to trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
index e2e25f7..bcad2e6 100644
--- a/trunk/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
+++ b/trunk/sample/toys/jp/nyatla/nyartoolkit/toys/x2/RawFileTest_X2.java
@@ -29,7 +29,7 @@
  *	<airmail(at)ebony.plala.or.jp>
  * 
  */
-package jp.nyatla.nyartoolkit.sample.x2;
+package jp.nyatla.nyartoolkit.toys.x2;
 
 import java.io.*;
 import java.util.*;
@@ -48,11 +48,11 @@ import jp.nyatla.nyartoolkit.nymodel.x2.*;
  */
 public class RawFileTest_X2
 {
-	private final String code_file = "../Data/patt.hiro";
+	private final String code_file = "../../Data/patt.hiro";
 
-	private final String data_file = "../Data/320x240ABGR.raw";
+	private final String data_file = "../../Data/320x240ABGR.raw";
 
-	private final String camera_file = "../Data/camera_para.dat";
+	private final String camera_file = "../../Data/camera_para.dat";
 
 	public RawFileTest_X2()
 	{
diff --git a/trunk/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java b/trunk/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java
index dadbfff..2f7d9e8 100644
--- a/trunk/test/jp/nyatla/nyartoolkit/dev/CopyOfLabelingCamera.java
+++ b/trunk/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.*;
 
-- 
2.11.0