From f3311fddc2c31aae4f50b86315fb7b70139ca51b Mon Sep 17 00:00:00 2001
From: nyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Date: Sat, 13 Sep 2008 15:35:20 +0000
Subject: [PATCH] =?utf8?q?[=E6=9B=B4=E6=96=B0]NyARToolkit/nyatla=E3=83=96?=
 =?utf8?q?=E3=83=A9=E3=83=B3=E3=83=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@144 7cac0a50-4618-4814-88d0-24b83990f816
---
 .../jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java   | 13 +------------
 .../src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java |  9 +++++++++
 .../test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java      |  8 ++++----
 .../nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java

diff --git a/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java b/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java
index f982cf2..90820f1 100644
--- a/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java
+++ b/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java
@@ -40,9 +40,6 @@ import javax.media.opengl.GLCanvas;
 import com.sun.opengl.util.Animator;
 
 import jp.nyatla.nyartoolkit.core.NyARCode;
-import jp.nyatla.nyartoolkit.core.raster.NyARGlayscaleRaster;
-import jp.nyatla.nyartoolkit.core.rasteranalyzer.threshold.NyARRasterThresholdAnalyzer_SlidePTile;
-import jp.nyatla.nyartoolkit.core2.NyARRasterFilter_RgbAve;
 
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCameraCapture;
 import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;
@@ -199,7 +196,7 @@ public class JavaSimpleLite implements GLEventListener, JmfCaptureListener
 			//画像チェックしてマーカー探して、背景を書く
 			boolean is_marker_exist;
 			synchronized (_cap_image) {
-				is_marker_exist = _nya.detectMarkerLite(_cap_image, threshold);
+				is_marker_exist = _nya.detectMarkerLite(_cap_image, 110);
 				//背景を書く
 				_glnya.drawBackGround(_cap_image, 1.0);
 			}
@@ -223,19 +220,11 @@ public class JavaSimpleLite implements GLEventListener, JmfCaptureListener
 		}
 
 	}
-	int threshold;
-	final NyARRasterThresholdAnalyzer_SlidePTile th=new NyARRasterThresholdAnalyzer_SlidePTile(15);
-	final NyARGlayscaleRaster gs=new NyARGlayscaleRaster(320,240);
-	final NyARRasterFilter_RgbAve togs=new NyARRasterFilter_RgbAve();
 	public void onUpdateBuffer(Buffer i_buffer)
 	{
 		try {
 			synchronized (_cap_image) {
 				_cap_image.setBuffer(i_buffer, true);
-				//閾値計算(めんどくさいから一時的に自動調整にしとく。)
-				togs.doFilter(_cap_image, gs);
-				th.analyzeRaster(gs);
-				threshold=110;//th.getThreshold();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java
new file mode 100644
index 0000000..f46c128
--- /dev/null
+++ b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java
@@ -0,0 +1,9 @@
+package jp.nyatla.nyartoolkit.core;
+
+import jp.nyatla.nyartoolkit.NyARException;
+import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster;
+
+public interface INyARSquareDetector
+{
+	public void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException;
+}
diff --git a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
index 0bf5e40..9221943 100644
--- a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
+++ b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
@@ -21,12 +21,12 @@ import java.awt.*;
 import jp.nyatla.nyartoolkit.core.labeling.*;
 import jp.nyatla.nyartoolkit.core.labeling.types.*;
 import jp.nyatla.nyartoolkit.core.raster.*;
-import jp.nyatla.nyartoolkit.core.rasteranalyzer.*;
-import jp.nyatla.nyartoolkit.core.rasteranalyzer.threshold.*;
 import jp.nyatla.nyartoolkit.core.rasterfilter.*;
-import jp.nyatla.nyartoolkit.core.rasterfilter.gs2bin.*;
 import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.*;
-import jp.nyatla.nyartoolkit.core2.NyARRasterFilter_RgbAve;
+import jp.nyatla.nyartoolkit.core2.rasteranalyzer.*;
+import jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold.*;
+import jp.nyatla.nyartoolkit.core2.rasterfilter.gs2bin.*;
+import jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs.NyARRasterFilter_RgbAve;
 import jp.nyatla.utils.j2se.LabelingBufferdImage;
 
 public class LabelingCamera extends Frame implements JmfCaptureListener {
diff --git a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java
index b49acaf..3cf02eb 100644
--- a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java
+++ b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java
@@ -6,9 +6,9 @@ import java.io.FileInputStream;
 
 import jp.nyatla.nyartoolkit.core.raster.*;
 import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster_BGRA;
-import jp.nyatla.nyartoolkit.core.rasteranalyzer.*;
 import jp.nyatla.nyartoolkit.core.labeling.*;
 import jp.nyatla.nyartoolkit.core.labeling.types.*;
+import jp.nyatla.nyartoolkit.core2.rasteranalyzer.*;
 import jp.nyatla.utils.j2se.*;
 
 public class LabelingTest extends Frame
-- 
2.11.0