From 7cdd0148660a4eb3977c5246027537d9ddb7b504 Mon Sep 17 00:00:00 2001 From: nyatla Date: Wed, 26 Aug 2009 07:38:10 +0000 Subject: [PATCH] =?utf8?q?[Backup]NyARToolkit=20for=20Java=20=E5=9F=BA?= =?utf8?q?=E6=9C=AC=E9=83=A8=E5=88=86=E3=81=AE=E6=9C=80=E9=81=A9=E5=8C=96e?= =?utf8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@278 7cac0a50-4618-4814-88d0-24b83990f816 --- .../jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java | 2 +- .../nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java | 1 + .../jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java | 2 +- .../nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java | 3 --- .../core/squaredetect/NyARSquareDetector_ARToolKit.java | 2 -- .../nyartoolkit/core/{ => squaredetect}/NyARVertexCounter.java | 2 +- .../nyartoolkit/core/squaredetect/SquareContourDetector.java | 1 - .../jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java | 8 +------- .../nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java | 8 +------- .../nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java | 8 +------- .../nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java | 8 +------- trunk/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java | 1 + 12 files changed, 9 insertions(+), 37 deletions(-) rename trunk/src/jp/nyatla/nyartoolkit/core/{ => squaredetect}/NyARVertexCounter.java (95%) diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java index 31a3bd5..ca7e70a 100644 --- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java +++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java @@ -1,7 +1,6 @@ package jp.nyatla.nyartoolkit.sandbox.qrcode; import jp.nyatla.nyartoolkit.NyARException; -import jp.nyatla.nyartoolkit.core.NyARVertexCounter; import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingImage; import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingLabel; import jp.nyatla.nyartoolkit.core.labeling.artoolkit.NyARLabelingLabelStack; @@ -12,6 +11,7 @@ import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster; import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack; +import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter; import jp.nyatla.nyartoolkit.core.types.*; import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix22; diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java index 5bc4185..0b11b44 100644 --- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java +++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java @@ -39,6 +39,7 @@ import jp.nyatla.nyartoolkit.core.raster.*; import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack; +import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter; import jp.nyatla.nyartoolkit.core.types.*; import jp.nyatla.nyartoolkit.core.param.*; diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java index 25f61fe..6d7ca11 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java +++ b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/LabelOverlapChecker.java @@ -49,7 +49,7 @@ public class LabelOverlapChecker public LabelOverlapChecker(int i_max_label,Class i_element_type) { this._element_type=i_element_type; - this._labels = (T[])Array.newInstance(i_element_type, 32); + this._labels = (T[])Array.newInstance(i_element_type, i_max_label); } /** diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java index a6cc58d..e01843c 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java +++ b/trunk/src/jp/nyatla/nyartoolkit/core/labeling/rlelabeling/NyARLabeling_Rle.java @@ -224,9 +224,6 @@ public class NyARLabeling_Rle final int prev_id =rle_prev[index_prev].fid; RleLabelFragmentInfoStack.RleLabelFragmentInfo prev_ptr = f_array[prev_id]; if (id != prev_id){ - if(prev_ptr.area==0){ - System.out.println("ERRRR"); - } label_count--; //prevとcurrentのフラグメントidを書き換える。 for(int i2=index_prev;i2 * */ -package jp.nyatla.nyartoolkit.core; +package jp.nyatla.nyartoolkit.core.squaredetect; /** * get_vertex関数を切り離すためのクラス diff --git a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java index 82b0437..9d8db11 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java +++ b/trunk/src/jp/nyatla/nyartoolkit/core/squaredetect/SquareContourDetector.java @@ -1,7 +1,6 @@ package jp.nyatla.nyartoolkit.core.squaredetect; import jp.nyatla.nyartoolkit.NyARException; -import jp.nyatla.nyartoolkit.core.NyARVertexCounter; import jp.nyatla.nyartoolkit.core.param.NyARCameraDistortionFactor; import jp.nyatla.nyartoolkit.core.param.NyARObserv2IdealMap; import jp.nyatla.nyartoolkit.core.pca2d.INyARPca2d; diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java index 5f101ae..757b875 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java +++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerData.java @@ -1,12 +1,6 @@ /* - * PROJECT: NyARToolkit + * PROJECT: NyARToolkit(Extension) * -------------------------------------------------------------------------------- - * This work is based on the original ARToolKit developed by - * Hirokazu Kato - * Mark Billinghurst - * HITLab, University of Washington, Seattle - * http://www.hitl.washington.edu/artoolkit/ - * * The NyARToolkit is Java version ARToolkit class library. * Copyright (C)2008 R.Iizuka * diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java index 3c49a16..b6beeff 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java +++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java @@ -1,12 +1,6 @@ /* - * PROJECT: NyARToolkit + * PROJECT: NyARToolkit(Extension) * -------------------------------------------------------------------------------- - * This work is based on the original ARToolKit developed by - * Hirokazu Kato - * Mark Billinghurst - * HITLab, University of Washington, Seattle - * http://www.hitl.washington.edu/artoolkit/ - * * The NyARToolkit is Java version ARToolkit class library. * Copyright (C)2008 R.Iizuka * diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java index 3692599..2962b69 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java +++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java @@ -1,12 +1,6 @@ /* - * PROJECT: NyARToolkit + * PROJECT: NyARToolkit(Extension) * -------------------------------------------------------------------------------- - * This work is based on the original ARToolKit developed by - * Hirokazu Kato - * Mark Billinghurst - * HITLab, University of Washington, Seattle - * http://www.hitl.washington.edu/artoolkit/ - * * The NyARToolkit is Java version ARToolkit class library. * Copyright (C)2008 R.Iizuka * diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java index 3d1505d..3b99f92 100644 --- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java +++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerData_RawBit.java @@ -1,12 +1,6 @@ /* - * PROJECT: NyARToolkit + * PROJECT: NyARToolkit(Extension) * -------------------------------------------------------------------------------- - * This work is based on the original ARToolKit developed by - * Hirokazu Kato - * Mark Billinghurst - * HITLab, University of Washington, Seattle - * http://www.hitl.washington.edu/artoolkit/ - * * The NyARToolkit is Java version ARToolkit class library. * Copyright (C)2008 R.Iizuka * diff --git a/trunk/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java b/trunk/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java index 5a18d4d..83ff9c5 100644 --- a/trunk/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java +++ b/trunk/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java @@ -39,6 +39,7 @@ import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.*; import jp.nyatla.nyartoolkit.core.squaredetect.INyARSquareDetector; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquare; import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareStack; +import jp.nyatla.nyartoolkit.core.squaredetect.NyARVertexCounter; import jp.nyatla.nyartoolkit.core.transmat.*; import jp.nyatla.nyartoolkit.core.types.*; import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix22; -- 2.11.0