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

diff --git a/sample/sandbox/.classpath b/sample/sandbox/.classpath
index 6299a65..5fb2d39 100644 (file)
--- a/sample/sandbox/.classpath
+++ b/sample/sandbox/.classpath
@@ -2,6 +2,7 @@
 <classpath>\r
        <classpathentry kind="src" path="src.sandbox"/>\r
        <classpathentry kind="src" path="src.dev"/>\r
+       <classpathentry kind="src" path="test"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.jmf"/>\r

diff --git a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java b/utils/j2se/test/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java
similarity index 100%
rename from sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java
rename to utils/j2se/test/jp/nyatla/nyartoolkit/rpf/sample/Test_RealityTarget.java

diff --git a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java b/utils/j2se/test/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java
similarity index 100%
rename from sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java
rename to utils/j2se/test/jp/nyatla/nyartoolkit/rpf/sample/Test_TrackTerget.java

diff --git a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
index 9f8b22d..f2f8771 100644 (file)
--- a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
+++ b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
@@ -88,7 +88,7 @@ public class NyarToolkitLinkTest extends Frame implements JmfCaptureListener
                NyARCode ar_code = new NyARCode(16, 16);
                ar_param.loadARParamFromFile(PARAM_FILE);
                ar_param.changeScreenSize(320, 240);
-               this._raster = new JmfNyARRaster_RGB(320, 240,this._capture.getCaptureFormat());
+               this._raster = new JmfNyARRaster_RGB(this._capture.getCaptureFormat());
                this._nya = new NyARSingleDetectMarker(ar_param, ar_code, 80.0,this._raster.getBufferType());
                ar_code.loadARPattFromFile(CARCODE_FILE);
                //キャプチャイメージ用のラスタを準備

diff --git a/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLDrawUtil.java b/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLDrawUtil.java
index ffb78a7..fbf988f 100644 (file)
--- a/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLDrawUtil.java
+++ b/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLDrawUtil.java
@@ -13,7 +13,6 @@ import jp.nyatla.nyartoolkit.core.types.NyARBufferType;
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 \r
 import com.sun.opengl.util.j2d.TextRenderer;\r
-import com.sun.opengl.util.texture.Texture;\r
 \r
 /**\r
  * OpenGL向けの描画関数を提供します。\r

diff --git a/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java b/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
index 4ab92b5..cfd4643 100644 (file)
--- a/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
+++ b/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
@@ -30,14 +30,6 @@
  */\r
 package jp.nyatla.nyartoolkit.jogl.utils;\r
 \r
-import java.awt.Font;\r
-import java.nio.*;\r
-import javax.media.opengl.GL;\r
-\r
-import com.sun.opengl.util.j2d.TextRenderer;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.INyARRaster;\r
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.param.NyARPerspectiveProjectionMatrix;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r

diff --git a/utils/qt/.classpath b/utils/qt/.classpath
index 0333a09..8de7502 100644 (file)
--- a/utils/qt/.classpath
+++ b/utils/qt/.classpath
@@ -6,6 +6,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
-       <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/QTJava.zip"/>\r
+       <classpathentry kind="lib" path="C:/Program Files (x86)/QuickTime/QTSystem/QTJava.zip"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r