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

diff --git a/sample/jogl/.classpath b/sample/jogl/.classpath
index 28a80f7..eb36b63 100644 (file)
--- a/sample/jogl/.classpath
+++ b/sample/jogl/.classpath
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" path="JavaSimpleLite"/>\r
-       <classpathentry kind="src" path="JavaSimpleLite2"/>\r
-       <classpathentry kind="src" path="JavaSimpleLite_ImageSource"/>\r
-       <classpathentry kind="src" path="SingleARMarker"/>\r
-       <classpathentry kind="src" path="SingleNyIdMarker"/>\r
        <classpathentry kind="src" path="src.rpf"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
@@ -14,5 +9,6 @@
        <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/gluegen-rt.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/jogl.jar"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.j2se"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ARMarker.java b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ARMarker.java
index db1cdb3..4c78f8b 100644 (file)
--- a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ARMarker.java
+++ b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_ARMarker.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.Color;\r
 import java.awt.Font;\r
@@ -16,10 +16,10 @@ import jp.nyatla.nyartoolkit.core.param.NyARParam;
 \r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.ARTKMarkerTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.ARTKMarkerTable;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_AsyncIdMarker.java b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_AsyncIdMarker.java
index b9061e6..99e72d2 100644 (file)
--- a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_AsyncIdMarker.java
+++ b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_AsyncIdMarker.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.Color;\r
 import java.awt.Font;\r
@@ -14,12 +14,12 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.ASyncIdMarkerTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.RawbitSerialIdTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.ASyncIdMarkerTable.IResultListener;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.ASyncIdMarkerTable;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.RawbitSerialIdTable;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.ASyncIdMarkerTable.IResultListener;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_CreditCardDetect.java b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_CreditCardDetect.java
index de1d046..5871072 100644 (file)
--- a/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_CreditCardDetect.java
+++ b/sample/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/sample/Test_NyARRealityGl_CreditCardDetect.java
@@ -1,4 +1,4 @@
-package jp.nyatla.nyartoolkit.dev.rpf.sample;\r
+package jp.nyatla.nyartoolkit.rpf.sample;\r
 \r
 import java.awt.Color;\r
 import java.awt.Font;\r
@@ -20,12 +20,12 @@ import jp.nyatla.nyartoolkit.core.types.NyARIntPoint2d;
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
 import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.ARTKMarkerTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.CardDetect;\r
-import jp.nyatla.nyartoolkit.dev.rpf.mklib.RawbitSerialIdTable;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTarget;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARRealityTargetList;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.ARTKMarkerTable;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.CardDetect;\r
+import jp.nyatla.nyartoolkit.rpf.mklib.RawbitSerialIdTable;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTargetList;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Jmf;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDevice;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureDeviceList;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r

diff --git a/sample/sandbox/.classpath b/sample/sandbox/.classpath
index 5fb2d39..b46162f 100644 (file)
--- a/sample/sandbox/.classpath
+++ b/sample/sandbox/.classpath
@@ -9,5 +9,6 @@
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.jogl"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/jogl.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.j2se"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/utils/jmf/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Jmf.java b/utils/jmf/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Jmf.java
index 338637f..80eadb9 100644 (file)
--- a/utils/jmf/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Jmf.java
+++ b/utils/jmf/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Jmf.java
@@ -6,11 +6,8 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor;\r
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.NyARRasterFilter_Rgb2Gs_RgbAve;\r
 import jp.nyatla.nyartoolkit.core.rasterreader.NyARPerspectiveRasterReader;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSampler;\r
-import jp.nyatla.nyartoolkit.dev.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTracker;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource;\r
-import jp.nyatla.nyartoolkit.dev.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource;\r
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource_Reference;\r
 import jp.nyatla.nyartoolkit.jmf.utils.JmfNyARRaster_RGB;\r
 \r
 /**\r

diff --git a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
index 22357c9..7590039 100644 (file)
--- a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
+++ b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
@@ -38,6 +38,7 @@ import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
+import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARRleLabelFragmentInfo;
 import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARRleLabelFragmentInfoPtrStack;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;
 import jp.nyatla.nyartoolkit.core.raster.*;
@@ -57,7 +58,7 @@ public class LabelingViewer extends Frame implements JmfCaptureListener
                {
                        super(i_size);
                }
-               protected void onSquareDetect(NyARIntPoint2d[] i_coord,int i_coor_num,int[] i_vertex_index,Object i_param) throws NyARException
+               protected void onSquareDetect(NyARIntCoordinates i_coord,int[] i_vertex_index)  throws NyARException
                {
                        
                }
@@ -95,7 +96,7 @@ public class LabelingViewer extends Frame implements JmfCaptureListener
                NyARParam ar_param = new NyARParam();
                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._detect=new SquareDetector(ar_param.getScreenSize());
                this._filter    = new NyARRasterFilter_Rgb2Gs_RgbAve(_raster.getBufferType());
                //キャプチャイメージ用のラスタを準備
@@ -127,13 +128,13 @@ public class LabelingViewer extends Frame implements JmfCaptureListener
                        try{
                                NyARIntRect rect=new NyARIntRect();
                                rect.x=100;rect.y=100;rect.w=220;rect.h=140;
-                               this._detect.detectMarker(gs,rect,110,null);
+                               this._detect.detectMarker(gs,rect,110);
                        }catch(Exception e){
                                e.printStackTrace();
                        }
                        NyARRleLabelFragmentInfoPtrStack ls=(NyARRleLabelFragmentInfoPtrStack)this._detect._probe()[0];
                        for(int i=0;i<ls.getLength();i++){
-                               NyARRleLabelFragmentInfoPtrStack.RleLabelFragmentInfo label=ls.getItem(i);
+                               NyARRleLabelFragmentInfo label=ls.getItem(i);
 //                             if(label.area==0){break;}
                                Graphics g2=img.getGraphics();
                                g2.setColor(Color.RED);

diff --git a/utils/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/gl/NyARRealityGl.java b/utils/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/gl/NyARRealityGl.java
index 3ac74aa..f4765e9 100644 (file)
--- a/utils/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/gl/NyARRealityGl.java
+++ b/utils/jogl/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/gl/NyARRealityGl.java
@@ -3,16 +3,12 @@ package jp.nyatla.nyartoolkit.rpf.reality.nyartk.gl;
 import javax.media.opengl.GL;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.param.NyARFrustum;\r
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.param.NyARPerspectiveProjectionMatrix;\r
-import jp.nyatla.nyartoolkit.core.raster.INyARRaster;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
 import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
 import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix44;\r
-import jp.nyatla.nyartoolkit.dev.rpf.reality.nyartk.NyARReality;\r
-import jp.nyatla.nyartoolkit.dev.rpf.realitysource.nyartk.NyARRealitySource;\r
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARReality;\r
+import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;\r
 import jp.nyatla.nyartoolkit.jogl.utils.NyARGLDrawUtil;\r
 import jp.nyatla.nyartoolkit.jogl.utils.NyARGLUtil;\r
 \r

diff --git a/utils/qt/.classpath b/utils/qt/.classpath
index 8de7502..4fe3b6c 100644 (file)
--- a/utils/qt/.classpath
+++ b/utils/qt/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" path="src.sample"/>\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