From: nyatla
Date: Sat, 29 Jan 2011 14:34:01 +0000 (+0000)
Subject: git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@808 7cac0...
X-Git-Url: http://git.osdn.net/view?p=nyartoolkit-and%2Fnyartoolkit-and.git;a=commitdiff_plain;h=01fcfa9219a4ed84155c7c51257d3d502dc7739f;hp=ff9ebf7efe05f8cd3167983fabd4fefc28f7d62b
git-svn-id: svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@808 7cac0a50-4618-4814-88d0-24b83990f816
---
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
index 91f14e2..fdb5580 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ARTKMarkerTable.java
@@ -15,9 +15,7 @@ import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.*;
* ãã¼ã«ãã¿ã¼ã³ã«IDçªå·ã¨ã¡ã¿ãã¼ã¿ãé¢é£ä»ãããã¼ãã«ãæã¡ããã¿ã¼ã³ã®ä¸è´æ¤ç´¢æ©è½ãæä¾ãã¾ãã
* ãã¼ãã«ã«ã¯ãARToolKitãã©ã¼ãããã®ãã¼ã«ãã¿ã¼ã³ã¨ãIDçªå·ãã¦ã¼ã¶å®ç¾©ã®ãã¼ã¿ã®ã»ãããæ ¼ç´ãã¾ãã
* ãã®ã¯ã©ã¹ã¯ããã¼ãã«ã®æä½æ©è½ã¨ããã¼ãã«è¦ç´ ã®æ¤ç´¢æ©è½ãæä¾ãã¾ãã
- * ãµã³ãã«-
- * ãã®ã¯ã©ã¹ã®ãµã³ãã«ã¯ã{@link Test_NyARRealityGl_ARMarker}ãè¦ã¦ãã ããã
- *
+
*/
public class ARTKMarkerTable
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
index a5a608b..cd1c382 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/ASyncIdMarkerTable.java
@@ -21,9 +21,6 @@ import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;
* ä½ããæ¯åå¤é¨ãµã¼ãã«åãåãããã¨ããã©ã¼ãã³ã¹ã®å£åãæ¿ããã®ã§ãå®éã«ã¯çµæããã£ãã·ã¥
* ãããªã©ã®å¯¾çãå¿
è¦ã«ãªãã¾ãã
*
- * ãµã³ãã«-
- * ãã®ã¯ã©ã¹ã®ãµã³ãã«ã¯ã{@link Test_NyARRealityGl_AsyncIdMarker}ãè¦ã¦ãã ããã
- *
*/
public class ASyncIdMarkerTable
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
index 85d3512..4125eb7 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/mklib/CardDetect.java
@@ -1,8 +1,8 @@
package jp.nyatla.nyartoolkit.rpf.mklib;
-import jp.nyatla.nyartoolkit.NyARException;
+import jp.nyatla.nyartoolkit.*;
import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;
-import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;
+import jp.nyatla.nyartoolkit.rpf.reality.nyartk.*;
/**
* æªç¥ã®ç©å½¢ãèªèãããµã³ãã«ã
* 絶対çãªå¯¸æ³ã¯æ±ããããªãã®ã§ãç©å½¢ã®è¾ºæ¯çãæ¨å®ãã¦è¿ãã¾ãã
@@ -22,9 +22,6 @@ import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;
* ãã³ã-
* æ¢ç¥ã®ã«ã¼ããèªèãããã®ãªãã°ãæ¯çæ¨å®å¾ã«ã¿ã¼ã²ããã®æ¨¡æ§ãããã®çµ¶å¯¾ãµã¤ãºãç¹å®ããã¨è¯ãããããã¾ããã
*
- * ãµã³ãã«-
- * ãã®ã¯ã©ã¹ã®ãµã³ãã«ã¯ã{@link Test_NyARRealityGl_CreditCardDetect}ãè¦ã¦ãã ããã
- *
*/
public class CardDetect
{
@@ -34,7 +31,7 @@ public class CardDetect
*/
public static class UnknownRectInfo
{
- /** å
é¨ä½¿ç¨ãæ¨å®ãã¦ãã{@link RealityTarget}ã®ã·ãªã¢ã«IDã*/
+ /** å
é¨ä½¿ç¨ãæ¨å®ãã¦ãã{@link NyARRealityTarget}ã®ã·ãªã¢ã«IDã*/
public long _target_serial;
/**ãå
é¨ä½¿ç¨ãæååæ°ã®ã«ã¦ã³ã¿*/
public int _success_point;
@@ -52,15 +49,15 @@ public class CardDetect
this._target_serial=NyARRealityTarget.INVALID_REALITY_TARGET_ID;
}
}
- /** {@link #UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ã ãã®ã¿ã¼ã²ãããæ¨å®ããã«ã¯ãããæ£é¢ããæ®å½±ãå¿
è¦ã§ãã*/
+ /** {@link UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ã ãã®ã¿ã¼ã²ãããæ¨å®ããã«ã¯ãããæ£é¢ããæ®å½±ãå¿
è¦ã§ãã*/
public final static int MORE_FRONT_CENTER=0;
- /** {@link #UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãç©å½¢æ¯çãæ¨å®ä¸ã§ãã*/
+ /** {@link UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãç©å½¢æ¯çãæ¨å®ä¸ã§ãã*/
public final static int ESTIMATE_NOW=1;
- /** {@link #UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãç©å½¢æ¯çãæ¨å®å®äºãio_resultã®ã¡ã³ãå¤æ°ãå©ç¨å¯è½ã§ãã*/
+ /** {@link UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãç©å½¢æ¯çãæ¨å®å®äºãio_resultã®ã¡ã³ãå¤æ°ãå©ç¨å¯è½ã§ãã*/
public final static int ESTIMATE_COMPLETE=2;
- /**ã{@link #UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãæ¨å®ã«å¤±æãã¾ãããå¤ãªå½¢ã®RECTã ã£ãã®ããã*/
+ /**ã{@link UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãæ¨å®ã«å¤±æãã¾ãããå¤ãªå½¢ã®RECTã ã£ãã®ããã*/
public final static int FAILED_ESTIMATE=3;
- /** {@link #UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãæ¨å®ã«å¤±æãã¾ãããå
¥åå¤ãééã£ã¦ããï¼*/
+ /** {@link UnknownRectInfo}ã®ã¹ãã¼ã¿ã¹å¤ãæ¨å®ã«å¤±æãã¾ãããå
¥åå¤ãééã£ã¦ããï¼*/
public final static int FAILED_TARGET_MISSMATCH=4;
/**
* ãã®é¢æ°ã¯ãi_targetã®ç©å½¢æ¯çãæ¨å®ãã¾ãã
@@ -74,15 +71,15 @@ public class CardDetect
* {@link UnknownRectInfo#last_status}ã®ã¹ãã¼ã¿ã¹å¤ã«ã¤ãã¦ã
* ã¹ãã¼ã¿ã¹å¤ã®æå³ã«ãããã¢ããªã±ã¼ã·ã§ã³ãä½ãããã¹ãããå¤ããã¾ãã
*
- * - {@link MORE_FRONT_CENTER}
+ *
- {@link #MORE_FRONT_CENTER}
* å
¥åãããã¿ã¼ã²ããã§ã¯æ¯çæ¨å®ãé£ãããããæ£é¢ããæ®å½±ããªããå¿
è¦ãããã
- *
- {@link ESTIMATE_NOW}
+ *
- {@link #ESTIMATE_NOW}
* å
¥åãããã¿ã¼ã²ããã§æ¯çæ¨å®ä¸ã§ãããæ¨å®ãç¶ç¶ããããã«ã次ã®ç»åãå
¥åããã
- *
- {@link ESTIMATE_COMPLETE}
+ *
- {@link #ESTIMATE_COMPLETE}
* æ¯çæ¨å®ã«æåãããã¡ã³ãå¤æ°ãèªåºãå¯è½ã
- *
- {@link FAILED_ESTIMATE}
+ *
- {@link #FAILED_ESTIMATE}
* æ¯çæ¨å®ã«å¤±æãããæ¯çæ¨å®ãç¶ç¶ã§ããªãã®ã§ãã¢ããªã±ã¼ã·ã§ã³ã¯ãã®ã¿ã¼ã²ããã{@link NyARRealityTarget#RT_DEAD}ã¸é·ç§»ãããã¹ãã§ããã
- *
- {@link FAILED_TARGET_MISSMATCH}
+ *
- {@link #FAILED_TARGET_MISSMATCH}
* ï¼åç®ä»¥éã®èªèã§ãã¿ã¼ã²ããã¨è¨é²ãªãã¸ã§ã¯ãã®ã·ãªã¢ã«IDãä¸è´ããªããæ£ããçµã¿åããã§å
¥åããã¹ãã
*
*
@@ -150,11 +147,15 @@ public class CardDetect
return;
}
/**
- * p1->p2ã¨p2->p3ã®ä½ãè§ã®sinå¤ã®çµ¶å¯¾å¤ãå¾ã¾ãã
+ * ãã®é¢æ°ã¯ããã¯ãã«(p1-<p2)ã¨(p2-<p3)ã®ä½ãè§ã®sinå¤ã®çµ¶å¯¾å¤ãå¾ã¾ãã
* @param p1
+ * ç¹1
* @param p2
+ * ç¹2
* @param p3
+ * ç¹3
* @return
+ * sinå¤(0<=n<=1)
*/
public final static double getAbsSin(NyARDoublePoint2d p1,NyARDoublePoint2d p2,NyARDoublePoint2d p3)
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
index f32a942..2e9c84e 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARReality.java
@@ -67,9 +67,6 @@ import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.NyARTargetStatus;
* è¦ããªããã®ã¨æ¶å¤±ããè
ã¯Deadã¹ãã¼ã¿ã¹ã§çµäºãã¾ããUnknownã¹ãã¼ã¿ã¹ã¨Knownã¹ãã¼ã¿ã¹ã®éãã¯ãå¤é¨æ
å ±ï¼ãã¼ã«ãã¿ã¼ã³ã«é¢ããç©çç¥èï¼
* ã®æç¡ã§ããKnownã¹ãã¼ã¿ã¹ã®ã¿ã¼ã²ããã¯ããå¤ãã®å¤é¨æ
å ±ã«ãããUnknownã¹ãã¼ã¿ã¹ã®ã¿ã¼ã²ãããããå¤ãã®æ
å ±ãæä¾ãã¾ãã
*
- * ãµã³ãã«-
- * {@link Test_NyARRealityGl_ARMarker}ãã{@link Test_NyARRealityGl_IdMarker}ãåèã«ãªãã¾ãã
- *
*/
public class NyARReality
{
@@ -495,7 +492,7 @@ public class NyARReality
* RTã¿ã¼ã²ããã®ã·ãªã¢ã«çªå·ã示ãå¤ããã®å¤ã¯ã{@link NyARRealityTarget#getSerialId()}ã§å¾ãããå¤ã§ãã
* @param i_dir
* ãã®RTã¿ã¼ã²ããããARToolKitã®directionã§ã©ã®æ¹ä½ã§ãããã示ãå¤
- * @param i_marker_size
+ * @param i_marker_width
* ãã¼ã«ã¼ã®é«ã/å¹
ããããã§ãããã示ãå¤[mmåä½]
* @return
* æåããã¨ãtrueãè¿ãã¾ãã
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
index 9da40ba..5d381f1 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/reality/nyartk/NyARRealityTargetList.java
@@ -23,7 +23,7 @@ public class NyARRealityTargetList extends NyARPointerStack
/**
* ãã®é¢æ°ã¯ãã·ãªã¢ã«çªå·ããã¼ã«ããªã¹ãããã¿ã¼ã²ãããæ¢ç´¢ãã¾ãã
* @param i_serial
- * æ¤ç´¢ããã·ãªã¢ã«IDã{@link RealityTarget}ãåç
§ã
+ * æ¤ç´¢ããã·ãªã¢ã«IDã{@link NyARRealityTarget}ãåç
§ã
* @return
* è¦ã¤ããã¨ããã®ãªãã¸ã§ã¯ãã®åç
§å¤ãç¡ããã°null
*/
@@ -41,7 +41,7 @@ public class NyARRealityTargetList extends NyARPointerStack
/**
* ãã®é¢æ°ã¯ãã·ãªã¢ã«çªå·ããã¼ã«ããªã¹ãããã¿ã¼ã²ãããæ¢ç´¢ãã¦ããã®ã¤ã³ãã¯ã¹çªå·ãè¿ãã¾ãã
* @param i_serial
- * æ¤ç´¢ããã·ãªã¢ã«IDã{@link RealityTarget}ãåç
§ã
+ * æ¤ç´¢ããã·ãªã¢ã«IDã{@link NyARRealityTarget}ãåç
§ã
* @return
* ãªã¹ãä¸ã®ã¤ã³ãã¯ã¹çªå·ã
*/
@@ -61,7 +61,7 @@ public class NyARRealityTargetList extends NyARPointerStack
* é
åãµã¤ãºãååã§ãªãå ´åãè¦ã¤ãã£ãé ã«ãé
åã®ä¸éã¾ã§è¦ç´ ãè¿ãã¾ãã
* @param i_type
* æ¤ç´¢ããRTã¿ã¼ã²ããã®ã¹ãã¼ã¿ã¹å¤ã{@link NyARRealityTarget}ã§å®ç¾©ããããRT_ããå§ã¾ãã¹ãã¼ã¿ã¹ã¿ã¤ãå¤ãæå®ãã¾ãã
- * @param o_list
+ * @param o_result
* é¸æããã¿ã¼ã²ãããæ ¼ç´ããé
åã§ãã
* @return
* é¸æã§ããã¿ã¼ã²ããã®åæ°ã§ãão_resultã®lengthã¨åãå ´åãåããã¼ããçºçããå¯è½æ§ãããã¾ãã
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
index 9dba59c..4407ed2 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource.java
@@ -71,8 +71,8 @@ public abstract class NyARRealitySource
this._tracksource.syncResource();
}
/**
- * RGBã½ã¼ã¹ã©ã¹ã¿{@link #_rgb_source}ãåç
§ãã{@link PerspectiveRasterReader}ãè¿ãã¾ãã
- * @return [read only] {@link #_rgb_source}ã«ãªã³ã¯ãã{@link PerspectiveRasterReader}ãªãã¸ã§ã¯ã
+ * RGBã½ã¼ã¹ã©ã¹ã¿{@link #_rgb_source}ãåç
§ãã{@link NyARPerspectiveRasterReader}ãè¿ãã¾ãã
+ * @return [read only] {@link #_rgb_source}ã«ãªã³ã¯ãã{@link NyARPerspectiveRasterReader}ãªãã¸ã§ã¯ã
*/
public NyARPerspectiveRasterReader refPerspectiveRasterReader()
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Reference.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Reference.java
index 4ad645f..5ee0840 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Reference.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/realitysource/nyartk/NyARRealitySource_Reference.java
@@ -58,7 +58,7 @@ public class NyARRealitySource_Reference extends NyARRealitySource
}
/**
* ææããã©ã¹ã¿ãèªåºãå¯è½ã§ããããè¿ãã¾ãããã®ã¯ã©ã¹ã®å ´åã«ã¯ã常ã«trueã§ãã
- * @see {@link NyARRealitySource#isReady()}
+ * @see NyARRealitySource#isReady()
*/
public final boolean isReady()
{
@@ -66,7 +66,7 @@ public class NyARRealitySource_Reference extends NyARRealitySource
}
/**
* RGBã½ã¼ã¹ã¨ãã©ãã«ã®ãªã½ã¼ã¹ã¨ã®å
容ã®åæãåãã¾ãã
- * @see {@link NyARRealitySource#syncResource()}
+ * @see NyARRealitySource#syncResource()
*/
public final void syncResource() throws NyARException
{
@@ -75,7 +75,7 @@ public class NyARRealitySource_Reference extends NyARRealitySource
}
/**
* RGBã½ã¼ã¹ã¨ãã©ãã«ã®ã°ã¬ã¼ã¹ã±ã¼ã«ç»åã¨ã®åæãåãã¾ãã
- * @see {@link NyARRealitySource#makeTrackSource()}
+ * @see NyARRealitySource#makeTrackSource()
*/
public final NyARTrackerSource makeTrackSource() throws NyARException
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
index 5a2a24f..9419000 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/sampler/lrlabel/LowResolutionLabelingSampler.java
@@ -1,9 +1,9 @@
package jp.nyatla.nyartoolkit.rpf.sampler.lrlabel;
import jp.nyatla.nyartoolkit.*;
-import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARLabeling_Rle;
-import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARRleLabelFragmentInfo;
+import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.*;
import jp.nyatla.nyartoolkit.core.raster.*;
+import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.*;
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
index a436ecd..83d3e74 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTracker.java
@@ -7,11 +7,36 @@ import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.*;
import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status.*;
-
-
/**
- * ãã®ã¯ã©ã¹ã¯ãåè§å½¢ã®ãã©ããã³ã°ã¯ã©ã¹ã§ããç»é¢å
ã«ããè¤æ°ã®ç©å½¢ããã¿ã¼ã²ããã¨ãã¦èå¥ãã¦ã追跡ãã¾ãã
- * @author nyatla
+ * ãã®ã¯ã©ã¹ã¯ãç»åä¸ã®åè§å½¢ããã©ããã³ã°ãã¦ããã®ç¶æ
ãå
¬éãã¾ãã
+ * å
¥åãã¼ã¿ã¯ãå°ç¨ç»åãã¼ã¿ã³ã³ããã®{@link NyARTrackerSource}ã¯ã©ã¹ã使ãã¾ãã
+ * ã¯ã©ã¹ã¯ãã©ããã³ã°ãã¦ããã¿ã¼ã²ãã(ãã©ãã¯ã¿ã¼ã²ãã)ã®ãªã¹ããææããå
¬éãã¾ãã
+ * ã¦ã¼ã¶ã¯ããã®ãªã¹ããåç
§ããç·¨éãããã¨ã§ããã©ãã¯ã¿ã¼ã²ããã®ç¶æ
ãå¾ããã¨ãã§ãã¾ãã
+ * ã¢ã«ã´ãªãºã -
+ * ãã©ãã«ã¯æ¢ç¥ãµã³ãã«ãªã¹ãã¨æªç¥ãµã³ãã«ãªã¹ãã®ï¼ã¤ã®ãªã¹ããæã£ã¦ãã¾ãã
+ * ãã®ãã©ããã³ã°ã¢ã«ã´ãªãºã ã§ã¯ããµã³ããªã³ã°ã¨ãã©ããã³ã°ã®ï¼æ®µæ§æã§ããããã®ãªã¹ããç·¨éãã¦å¦çãé²ãã¾ãã
+ *
ãµã³ããªã³ã° -
+ * ãµã³ããªã³ã°ã¯ãã©ã¹ãªã³ã°ãã輪éç·ããåè§å½¢ï¼ãµã³ãã«ï¼ãè¦ã¤ããæ¢ç¥ã®ãã®ã¨æªç¥ã®ãã®ã«åé¢ããä½æ¥ã§ãã
+ * å¤å®ã¯ãã¿ã¼ã²ããã®ãªã¹ãã¨ãµã³ãã«ã®å¤ãæ¯è¼ãã¦è¡ãã¾ããæ¢ç¥ã®ã¿ã¼ã²ããã¯æ¢ç¥ãµã³ãã«ãªã¹ãã¸ä¿åãã
+ * æªç¥ã®ãã®ã¯ãã®ã¾ã¾æ°ããã¿ã¼ã²ããã¨ãã¦ãã¿ã¼ã²ãããªã¹ãã¸ç»é²ãã¾ãã
+ * ããã§ãã©ã¹ãªã³ã°ã軽éãªç»åï¼1/2^nã®ã¨ãã¸ç»åï¼ã«å¯¾ãã¦è¡ããã¨ã§ãè² è·è»½æ¸ãéæãã¾ãã
+ *
+ * ãã©ããã³ã°
+ * ãã©ããã³ã°ã¯å°ã
è¤éã§ãããã©ããã³ã°ã¯ã4ã¤ã®ã¹ãã¼ã¸ããããåã¹ãã¼ã¸ã§å¿
è¦ãªæ
å ±ã®ã¿ããã©ãã¯ã¿ã¼ã²ããããæ½åºãã¾ãã
+ * 4ã¤ã®ã¿ã¼ã²ããã¯ãnew,ignore,contoure,rectã§ãã
+ *
+ * - new - æ°è¦ã¿ã¼ã²ããã§ããcontourã¿ã¼ã²ããã¸é·ç§»ããã®ãå¾
ã£ã¦ãã¾ããå¾ãããæ
å ±ã¯ã2Dç»åä¸ã§ã®ã¯ãªããç¯å²ã®ã¿ã§ãã
+ *
- ignore - åæãå¿
è¦ã¨ããªãã¿ã¼ã²ããã§ããä¸å®æéãçµéããã¨ãèªåçã«æ¶å¤±ãã¾ããå¾ãããæ
å ±ã¯ã2Dç»åä¸ã§ã®ã¯ãªããç¯å²ã®ã¿ã§ãã
+ *
- contur - 輪éç·ã¾ã§åæããã¿ã¼ã²ããã§ããrectã¿ã¼ã²ããã¸é·ç§»ããã®ãå¾
ã£ã¦ãã¾ããå¾ãããæ
å ±ã¯ã2Dç»åä¸ã§ã®ã¯ãªããç¯å²ã輪éç·æ
å ±ã§ãã
+ *
- rect - ç©å½¢é ç¹ã¾ã§åæããã¿ã¼ã²ããã§ããå¾ãããæ
å ±ã¯ã2Dç»åä¸ã§ã®ã¯ãªããç¯å²ãç©å½¢ã®é ç¹åº§æ¨ã§ãã
+ *
+ *
+ * ã¾ãã¯ããã«ããã©ãã«ã¯ãµã³ããªã³ã°ã§å¾ãããæ¢ç¥ãµã³ãã«ãé©åãªã¿ã¼ã²ããã«ãã£ã¹ããããã¾ãã
+ * å
¨ã¦ã®ãã£ã¹ããããå®äºããå¾ã«ããã£ã¹ããããããæ
å ±ãå
ã«ãåã¿ã¼ã²ããã®ç¶æ
ãæ´æ°ãã¾ãã
+ * ã¹ãã¼ã¸ã«ãã£ã¦ã¯ããã£ã¹ããããè¡ãããªãã£ãå ´åã§ããã¹ãã¼ã¸ç¬èªã®ãµã³ããªã³ã°æ¹æ³ã§ç¶æ
ãæ´æ°ããå ´åãããã¾ãã
+ * é常ã¯ãnew,contur,rectã®é ã§é·ç§»ãã¾ããåã¹ãã¼ã¸ã«ç½®ãããã¿ã¼ã²ããã®æ°ã調æ´ãããã¨ã§ãè² è·éãã³ã³ããã¼ã«ãããã¨ãã§ãã¾ãã
+ * ignoreã¯åæã®å¿
è¦ãªãã¿ã¼ã²ãããæå³çã«ç¡è¦ããããã®ã¹ãã¼ã¸ã§ããèªèã«å¤±æããã¿ã¼ã²ããããæ¶å¤±ããã¿ã¼ã²ãããªã©ãããã«éããããæ¶æ»
ãã¦ããã¾ãã
+ *
*
*/
public class NyARTracker
@@ -26,7 +51,7 @@ public class NyARTracker
private NyARTargetPool target_pool;
/**
* ã¿ã¼ã²ãããªã¹ãã§ãããã®ããããã£ã¯å
é¨åãã§ãã
- * refTrackTargeté¢æ°ãä»ãã¦ã¢ã¯ã»ã¹ãã¦ãã ããã
+ * {@link #refTrackTarget}é¢æ°ãä»ãã¦ã¢ã¯ã»ã¹ãã¦ãã ããã
*/
public NyARTargetList _targets;
@@ -49,40 +74,45 @@ public class NyARTracker
private int _number_of_rect;
/**
- * newã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ãnewã¹ãã¼ã¿ã¹ã®ã¿ã¼ã²ããæ°ãè¿ãã¾ãã
* @return
+ * newã¿ã¼ã²ããã®æ°
*/
public final int getNumberOfNew()
{
return this._number_of_new;
}
/**
- * ignoreã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ãignoreã¹ãã¼ã¿ã¹ã®ã¿ã¼ã²ããæ°ãè¿ãã¾ãã
* @return
+ * ignoreã¿ã¼ã²ããã®æ°
*/
public final int getNumberOfIgnore()
{
return this._number_of_ignore;
}
/**
- * contourã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ãcontourã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
* @return
+ * contourã¿ã¼ã²ããã®æ°
*/
public final int getNumberOfContur()
{
return this._number_of_contoure;
}
/**
- * rectã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ãrectã¿ã¼ã²ããã®æ°ãè¿ãã¾ãã
* @return
+ * rectã¿ã¼ã²ããã®æ°
*/
public final int getNumberOfRect()
{
return this._number_of_rect;
}
/**
- * ã¿ã¼ã²ãããªã¹ãã®åç
§å¤ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ãã¿ã¼ã²ãããªã¹ãã®åç
§å¤ãè¿ãã¾ãã
* @return
+ * [read only]ã¿ã¼ã²ãããªã¹ãã®åç
§å¤
*/
public final NyARTargetList refTrackTarget()
{
@@ -90,6 +120,7 @@ public class NyARTracker
}
/**
* ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ã¹ãã¼ã¸ãã¨ã®ã¿ã¼ã²ããã®æ大æ°ãæå®ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãçæãã¾ãã
* @param i_max_new
* Newãã©ãã¯ã¿ã¼ã²ããã®æ大æ°ãæå®ãã¾ãã
* @param i_max_cont
@@ -138,8 +169,11 @@ public class NyARTracker
}
/**
- * Trackerã®ç¶æ
ãæ´æ°ãã¾ãã
- * @param i_source
+ * ãã®é¢æ°ã¯ã{@link NyARTrackerSource}ã®æ
å ±ãããã¤ã³ã¹ã¿ã³ã¹ã®ç¶æ
ãæ´æ°ãã¾ãã
+ * é¢æ°ã®å®è¡å¾ã«ãã¤ã³ã¹ã¿ã³ã¹ã®ææãããã©ãã¯ã¿ã¼ã²ããã®ç¶æ
ã¯æ´æ°ããã¾ãã
+ * ãã®é¢æ°ã¯ã{@link NyARTrackerSource#makeSampleOut}ãå¼ã³åºãã¦ãã©ãã¯ã½ã¼ã¹å
ã®ç»åãåæããã¾ãã
+ * @param i_s
+ * åºæ¬ç»åã«ã¤ã¡ã¼ã¸ãæ¸ãè¾¼ãã ã³ã³ãããæå®ãã¾ãã
* @throws NyARException
*/
public void progress(NyARTrackerSource i_s) throws NyARException
@@ -355,7 +389,7 @@ public class NyARTracker
* @param i_sample
* @throws NyARException
*/
- public final static void updateNewStatus(NyARTargetList i_list,NyARNewTargetStatusPool i_pool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
+ private final static void updateNewStatus(NyARTargetList i_list,NyARNewTargetStatusPool i_pool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
{
NyARTarget d_ptr;
NyARTarget[] i_nes=i_list.getArray();
@@ -401,7 +435,7 @@ public class NyARTracker
* @param index
* @throws NyARException
*/
- public static void updateContureStatus(NyARTargetList i_list,INyARVectorReader i_vecreader,NyARContourTargetStatusPool i_stpool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
+ private static void updateContureStatus(NyARTargetList i_list,INyARVectorReader i_vecreader,NyARContourTargetStatusPool i_stpool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
{
NyARTarget[] crd=i_list.getArray();
NyARTarget d_ptr;
@@ -437,7 +471,7 @@ public class NyARTracker
d_ptr._ref_status=st;
}
}
- public static void updateRectStatus(NyARTargetList i_list,INyARVectorReader i_vecreader,NyARRectTargetStatusPool i_stpool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
+ private static void updateRectStatus(NyARTargetList i_list,INyARVectorReader i_vecreader,NyARRectTargetStatusPool i_stpool,LowResolutionLabelingSamplerOut.Item[] source,int[] index) throws NyARException
{
NyARTarget[] rct=i_list.getArray();
NyARTarget d_ptr;
@@ -593,10 +627,15 @@ public class NyARTracker
this._number_of_ignore--;
return;
}
-
/**
- * ãã®ã¿ã¼ã²ããã®ã¹ãã¼ã¿ã¹ããIgnoreStatusã¸å¤æ´ãã¾ãã
- * @throws NyARException
+ * ãã®é¢æ°ã¯ãæå®ããã¿ã¼ã²ããã®ã¹ãã¼ã¿ã¹ããignoreã«ãã¾ãã
+ * @param i_target
+ * é·ç§»ããããã©ãã¯ã¿ã¼ã²ãããæå®ãã¾ãã
+ * ãã®ã¿ã¼ã²ããã®ã¹ãã¼ã¿ã¹ã¯ã{@link NyARTargetStatus#ST_NEW},{@link NyARTargetStatus#ST_CONTURE},{@link NyARTargetStatus#ST_RECT}ã®ä½ããã§ããå¿
è¦ãããã¾ãã
+ * ãã®ãªãã¸ã§ã¯ãã¯ãã¤ã³ã¹ã¿ã³ã¹ã«ææããã¦ããå¿
è¦ãããã¾ãã
+ * @param i_life
+ * ignoreã«é·ç§»ããå¾ã®ãçåæéããµã¤ã¯ã«æ°ã§æå®ãã¾ãã
+ * @throws NyARException
*/
public final void changeStatusToIgnore(NyARTarget i_target,int i_life) throws NyARException
{
@@ -675,10 +714,17 @@ public class NyARTracker
}
/**
- * ãµã³ãã«ãæ ¼ç´ããã¹ã¿ãã¯ã§ãããã®ã¯ã©ã¹ã¯ãä¸æçãªãªã¹ããä½ãããã«ä½¿ãã¾ãã
+ * ãã®ã¯ã©ã¹ã¯ããµã³ãã«ã®åç
§å¤ãæ ¼ç´ããã¹ã¿ãã¯ã§ãã
+ * {@link NyARTracker}ãã使ãã¾ããã¦ã¼ã¶ã使ããã¨ã¯ããã¾ããã
*/
final class SampleStack extends NyARPointerStack
{
+ /**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * @param i_size
+ * ãªã¹ãã®æ大æ°
+ * @throws NyARException
+ */
public SampleStack(int i_size) throws NyARException
{
super();
@@ -688,16 +734,35 @@ final class SampleStack extends NyARPointerStack
* ç¶æ¿ã¯ã©ã¹ã§ã¯ã_rbraster,_base_raster,_vec_readerã¡ã³ãå¤æ°ã®å®ä½ã¨ãabstracté¢æ°ãå®è£
ãã¦ãã ããã
*
*/
public abstract class NyARTrackerSource
{
+ /** ãã³ãç»å(Robertsç»å)ã®è§£å度å¤ã1/n表è¨*/
protected int _rob_resolution;
//ç¶æ¿ã¯ã©ã¹ã§è¨å®ãããã¹ããªãã¸ã§ã¯ã
+
+ /**ããã³ãç»åãæ ¼ç´ãããªãã¸ã§ã¯ããç¶æ¿ã¯ã©ã¹ã§å²ãå½ã¦ããã¨ã*/
protected NyARGrayscaleRaster _rbraster;
+ /**ãåºæ¬GSç»åãæ ¼ç´ãããªãã¸ã§ã¯ããç¶æ¿ã¯ã©ã¹ã§å²ãå½ã¦ããã¨ã*/
protected NyARGrayscaleRaster _base_raster;
- protected INyARVectorReader _vec_reader;
+ /** åºæ¬ç»åã«å¯¾ããç»ç´ ãã¯ãã«èªåºããªãã¸ã§ã¯ããç¶æ¿ã¯ã©ã¹ã§å²ãå½ã¦ããã¨ã*/
+ protected INyARVectorReader _vec_reader;
+ /** ãµã³ããªã³ã°ã¢ã¦ããæ ¼ç´ãããªãã¸ã§ã¯ããç¶æ¿ã¯ã©ã¹ã§å²ãå½ã¦ããã¨ã*/
protected LowResolutionLabelingSamplerOut _sample_out;
/**
- * Robertsã¨ãã¸ç»åã®è§£å度ãæå®ããã
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã³ãç»åã®è§£å度å¤ãæå®ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãä½æãã¾ãã
* @param i_rob_resolution
+ * ãã³ãç»åã®è§£å度å¤ã
*/
protected NyARTrackerSource(int i_rob_resolution)
{
this._rob_resolution=i_rob_resolution;
}
/**
- * åºæ¬GSç»åã«å¯¾ããVectorèªã¿åãæ©ãè¿ãã¾ãã
- * ãã®ã¤ã³ã¹ã¿ã³ã¹ã¯ãåºæ¬GSç»åã¨åæãã¦ããªããã¨ãããã¾ãã
- * åºæ¬GSç»åã«å¤æ´ãå ããå ´åã¯ãgetSampleOut,ã¾ãã¯syncResourceé¢æ°ãå®è¡ãã¦åæãã¦ããå®è¡ãã¦ãã ããã
+ * ãã®é¢æ°ã¯ãVectorèªã¿åããªãã¸ã§ã¯ããè¿ãã¾ãã
+ * ãã®ãªãã¸ã§ã¯ãã¯ã使ç¨åã«ã¤ã³ã¹ã¿ã³ã¹ã®åæãå¿
è¦ãªäºãããã¾ãã
+ * åºæ¬GSç»åã«å¤æ´ãå ããå¾ã«{@link NyARTracker#progress}ãå®è¡ããã«ä½¿ç¨ããå ´åã¯ã
+ * {@link #makeSampleOut},ã¾ãã¯{@link #syncResource}é¢æ°ãå®è¡ãã¦ãã使ç¨ãã¦ãã ããã
* @return
+ * åºæ¬ç»åããã³ãç»åãå
ã«ããVectorãªã¼ã
*/
public final INyARVectorReader getBaseVectorReader()
{
@@ -39,46 +50,51 @@ public abstract class NyARTrackerSource
}
/**
- * ã¨ãã¸ç»åãè¿ãã¾ãã
- * ãã®ã¤ã³ã¹ã¿ã³ã¹ã¯ãåºæ¬GSç»åã¨åæãã¦ããªããã¨ãããã¾ãã
- * åºæ¬GSç»åã«å¤æ´ãå ããå ´åã¯ãmakeSampleOut,ã¾ãã¯syncResourceé¢æ°ãå®è¡ãã¦åæãã¦ããå®è¡ãã¦ãã ããã
- * ç¶æ¿ã¯ã©ã¹ã§ã¯ãã¨ãã¸ç»åãè¿å´ãã¦ãã ããã
+ * ãã®é¢æ°ã¯ããã³ãç»å(ã¨ãã¸ç»å)ã®åç
§å¤ãè¿ãã¾ãã
+ * ãã®ãªãã¸ã§ã¯ãã¯ã使ç¨åã«ã¤ã³ã¹ã¿ã³ã¹ã®åæãå¿
è¦ãªäºãããã¾ãã
+ * åºæ¬GSç»åã«å¤æ´ãå ããå¾ã«{@link NyARTracker#progress}ãå®è¡ããã«ä½¿ç¨ããå ´åã¯ã
+ * {@link #makeSampleOut},ã¾ãã¯{@link #syncResource}é¢æ°ãå®è¡ãã¦ãã使ç¨ãã¦ãã ããã
* @return
+ * ãã³ãç»åã®ãªãã¸ã§ã¯ãã
*/
public final NyARGrayscaleRaster refEdgeRaster()
{
return this._rbraster;
}
/**
- * åºæºç»åãè¿ãã¾ãã
- * ç¶æ¿ã¯ã©ã¹ã§ã¯ãåºæ¬ç»åãè¿å´ãã¦ãã ããã
+ * ãã®é¢æ°ã¯ãåºæºç»åã®åç
§å¤ãè¿ãã¾ãã
* @return
+ * åºæ¬ç»åã®ãªãã¸ã§ã¯ãã
*/
public final NyARGrayscaleRaster refBaseRaster()
{
return this._base_raster;
}
/**
- * æå¾ã«ä½æãã{@link LowResolutionLabelingSamplerOut}ã¸ã®ãã¤ã³ã¿ãè¿ãã¾ãã
- * ãã®é¢æ°ã¯ã{@link NyARTracker#progress}ãã¾ãã¯{@link #syncResource}ã®å¾ã«å¼ã³åºããã¨ãæ³å®ãã¦ãã¾ãã
- * ãã以å¤ã®ã¿ã¤ãã³ã°ã§ã¯ãè¿å´å¤ã®å
容ãåæãã¦ããªããã¨ãããã®ã§æ³¨æãã¦ãã ããã
+ * ãã®é¢æ°ã¯ã{@link LowResolutionLabelingSamplerOut}ãªãã¸ã§ã¯ãã®åç
§å¤ãè¿ãã¾ãã
+ * ã¸ã®ãã¤ã³ã¿ãè¿ãã¾ãã
+ * ãã®ãªãã¸ã§ã¯ãã¯ã使ç¨åã«ã¤ã³ã¹ã¿ã³ã¹ã®åæãå¿
è¦ãªäºãããã¾ãã
+ * åºæ¬GSç»åã«å¤æ´ãå ããå¾ã«{@link NyARTracker#progress}ãå®è¡ããã«ä½¿ç¨ããå ´åã¯ã
+ * {@link #makeSampleOut}ã®æ»ãå¤ã使ããã{@link #syncResource}é¢æ°ãå®è¡ãã¦ãã使ç¨ãã¦ãã ããã
* @return
+ * ç¾å¨ã®SampleOutãªãã¸ã§ã¯ãã®åç
§å¤
*/
public final LowResolutionLabelingSamplerOut refLastSamplerOut()
{
return this._sample_out;
}
/**
- * åºæºç»åã¨å
é¨ç¶æ
ãåæãã¾ãã(é常ãã¢ããªã±ã¼ã·ã§ã³ãããã®é¢æ°ã使ç¨ãããã¨ã¯ããã¾ããã)
- * ã¨ãã¸ç»åãã{@link _sample_out}ãæ´æ°ããé¢æ°ãå®è£
ãã¦ãã ããã
+ * ãã®é¢æ°ã¯ãåºæºç»åã¨å
é¨ç¶æ
ãåæãã¾ãã
+ * é常ãã¦ã¼ã¶ããã®é¢æ°ã使ç¨ãããã¨ã¯ããã¾ããã
+ * å®è£
ã¯ã©ã¹ã§ã¯ã{@link #_sample_out}ãæ´æ°ããé¢æ°ãå®è£
ãã¦ãã ããã
* @throws NyARException
*/
public abstract void syncResource() throws NyARException;
/**
- * SampleOutãè¨ç®ãã¦ãåç
§å¤ãè¿ãã¾ãã
- * ãã®é¢æ°ã¯ã{@link NyARTracker#progress}ãå¼ã³åºãã¾ãã
- * ç¶æ¿ã¯ã©ã¹ã§ã¯ãã¨ãã¸ç»å{@link _rbraster}ãã{@link _sample_out}ãæ´æ°ãã¦ãè¿å´ããé¢æ°ãå®è£
ãã¦ãã ããã
+ * ãã®é¢æ°ã¯ãã¤ã³ã¹ã¿ã³ã¹ã®ã¡ã³ããåæããå¾ã«ãSampleOutãè¨ç®ãã¦ãåç
§å¤ãè¿ãã¾ãã
+ * ãã®é¢æ°ã¯ã{@link NyARTracker#progress}ãå¼ã³åºãã¾ããé常ãã¦ã¼ã¶ã使ç¨ãããã¨ã¯ããã¾ããã
+ * å®è£
ã¯ã©ã¹ã§ã¯ãã¤ã³ã¹ã¿ã³ã¹ã®åæå¾ã«ã{@link #_sample_out}ãæ´æ°ããé¢æ°ãå®è£
ãã¦ãã ããã
* @throws NyARException
*/
public abstract LowResolutionLabelingSamplerOut makeSampleOut() throws NyARException;
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
index a678c39..3104d9c 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARTrackerSource_Reference.java
@@ -8,8 +8,17 @@ import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSampler;
import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;
/**
- * NyARTrackerSourceã®ãªãã¡ã¬ã³ã¹å®è£
ã§ãã
+ * ãã®ã¯ã©ã¹ã¯ãNyARTrackerSourceã®ãªãã¡ã¬ã³ã¹å®è£
ã§ãã
* å
¨ã¦ã®ç»åå¦çãå¦çç³»ã®ã½ããã¦ã§ã¢ã§å®è£
ãã¾ãã
+ * åºæ¬çãªä½¿ãæ¹ -
+ * ãã®ã¯ã©ã¹ã¯ã次ã®ãããªæé ã§ä½¿ãã¾ãã
+ *
+ * - {@link #refBaseRaster}é¢æ°ã§ãåºæ¬ã°ã¬ã¼ã¹ã±ã¼ã«ç»åãå¾ãã
+ *
- åºæ¬ã°ã¬ã¼ã¹ã±ã¼ã«ç»åã«ãæ°ããã¤ã¡ã¼ã¸ãæ¸è¾¼ãã
+ *
- {@link NyARTracker#progress}é¢æ°ã«å
¥åããã
+ *
+ * ã¤ã³ã¹ã¿ã³ã¹ã®ææããã©ã¹ã¿éã®åæã¯ã{@link NyARTracker#progress}ãã³ã¼ã«ãã{@link #makeSampleOut}é¢æ°ã§è¡ãã¾ãã
+ *
*/
public class NyARTrackerSource_Reference extends NyARTrackerSource
{
@@ -20,6 +29,8 @@ public class NyARTrackerSource_Reference extends NyARTrackerSource
private NyARGrayscaleRaster _rb_source;
private NegativeSqRoberts _rfilter=new NegativeSqRoberts(NyARBufferType.INT1D_GRAY_8);
/**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã³ãç»å
* @param i_number_of_sample
* ãµã³ãã©ãæ¤åºããæ大æ°ã
*ãé常100~200以ä¸ãæå®ãã¾ãã(QVGAç»åãããã100åãåºæºã«ãã¾ãã)
@@ -65,7 +76,9 @@ public class NyARTrackerSource_Reference extends NyARTrackerSource
this._base_raster.wrapBuffer(i_ref_source.getBuffer());
}
-
+ /**
+ * ãã®é¢æ°ã¯ãåºæºç»åã¨å
é¨ç¶æ
ãåæãã¾ãã é常ãã¦ã¼ã¶ããã®é¢æ°ã使ç¨ãããã¨ã¯ããã¾ããã
+ */
public void syncResource() throws NyARException
{
//å
é¨ç¶æ
ã®åæ
@@ -75,8 +88,7 @@ public class NyARTrackerSource_Reference extends NyARTrackerSource
/**
* SampleOutãè¨ç®ãã¦è¿ãã¾ãã
* ãã®é¢æ°ã¯ãNyARTrackerãå¼ã³åºãã¾ãã
- * @param samplerout
- * @throws NyARException
+ * é常ãã¦ã¼ã¶ããã®é¢æ°ã使ç¨ãããã¨ã¯ããã¾ããã
*/
public LowResolutionLabelingSamplerOut makeSampleOut() throws NyARException
{
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_Base.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_Base.java
index 6d750cf..63c749b 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_Base.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_Base.java
@@ -13,36 +13,39 @@ import jp.nyatla.nyartoolkit.core.utils.NyARMath;
import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;
/**
- * NyARVectorReaderã¤ã³ã¿ãã§ã¤ã¹ã®ãã¡ãç»ç´ å½¢å¼ã«ä¾åããªãé¢æ°ãå®è£
ããã¯ã©ã¹ã
+ * ãã®ã¯ã©ã¹ã¯ãNyARVectorReaderã¤ã³ã¿ãã§ã¤ã¹ã®ãã¡ãç»ç´ å½¢å¼ã«ä¾åããªãé¢æ°ãå®è£
ããæ½è±¡ã¯ã©ã¹ã§ãã
+ * {@link #getAreaVector33}ã¨{@link #getAreaVector22}é¢æ°ãæªå®è£
ã§ãã
* æ´¾çã¯ã©ã¹ã§ç»ç´ ã¢ã¯ã»ã¹é¢æ°ãå®è£
ãã¦ãæçµçãªã¯ã©ã¹ã«ä»ä¸ãã¾ãã
- *
*/
public abstract class NyARVectorReader_Base implements INyARVectorReader
{
private VecLinearCoordinates.VecLinearCoordinatePoint[] _tmp_coord_pos;
private int _rob_resolution;
+ /** åç
§ããåºæ¬GSç»åã®åç
§å¤*/
protected NyARGrayscaleRaster _ref_base_raster;
+ /** åç
§ãããã³ãç»åã®åç
§å¤*/
private NyARGrayscaleRaster _ref_rob_raster;
+ /** åç
§ããæªã¿ç¯æ£ãªãã¸ã§ã¯ãã®åç
§å¤*/
protected NyARCameraDistortionFactor _factor;
/**
- * ç¶æ¿ãå¿
é ã¨ãããããã³ã³ã¹ãã©ã¯ã¿ãé è½ã
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ç¶æ¿ãå¿
é ã¨ãããããé è½ãã¾ãã
*/
protected NyARVectorReader_Base()
{
-
}
/**
+ * ãã®é¢æ°ã¯ãã¤ã³ã¹ã¿ã³ã¹ãåæåãã¾ãã
* ç¶æ¿ã¯ã©ã¹ã®ã³ã³ã¹ãã©ã¯ã¿ããå¼ã³åºãã
* @param i_ref_raster
- * åºæ¬ç»å
+ * åºæ¬GSç»åã®åç
§å¤ã
* @param i_ref_raster_distortion
* æªã¿è§£é¤ãªãã¸ã§ã¯ã(nullã®å ´åæªã¿è§£é¤ãçç¥)
* @param i_ref_rob_raster
- * ã¨ãã¸æ¢ç´¢ç¨ã®ROBç»å
+ * åºæ¬GSç»åã®ãã³ãç»åã®åç
§å¤ã
* @param i_contour_pickup
- * 輪éç·åå¾ã¯ã©ã¹
- * @param
+ * 輪éç·åå¾ãªãã¸ã§ã¯ã
*/
public void initInstance(NyARGrayscaleRaster i_ref_raster,NyARCameraDistortionFactor i_ref_raster_distortion,NyARGrayscaleRaster i_ref_rob_raster,NyARContourPickup i_contour_pickup)
{
@@ -55,13 +58,15 @@ public abstract class NyARVectorReader_Base implements INyARVectorReader
this._cpickup = i_contour_pickup;
return;
}
- /**
- * ã¯ã¼ã¯å¤æ°
- */
+ /** ã¯ã¼ã¯å¤æ°*/
protected NyARIntCoordinates _coord_buf;
private NyARContourPickup _cpickup;
+ /** ãã¯ãã«ãã¼ã¸ç¨ã®æ·å±
å¤*/
protected final double _MARGE_ANG_TH = NyARMath.COS_DEG_10;
-
+ /**
+ * ãã®é¢æ°ã¯ããã³ãç»åã®åºç¹ãã輪éç¹ããã¬ã¼ã¹ãã¦ãå
ç»åã®è¼ªéãã¯ãã«ãé
åã«è¿ãã¾ãã
+ * 輪éãã¯ãã«ã®æ¤åºç¹æ§ã«ã¤ãã¦ã¯ã{@link #traceConture(NyARIntCoordinates, int, int, VecLinearCoordinates)}ã確èªãã¦ãã ããã
+ */
public boolean traceConture(int i_th,
NyARIntPoint2d i_entry, VecLinearCoordinates o_coord)
throws NyARException
@@ -82,19 +87,9 @@ public abstract class NyARVectorReader_Base implements INyARVectorReader
/**
- * ç¹1ã¨ç¹2ã®éã«ç·åãå®ç¾©ãã¦ããã®ç·åä¸ã®ãã¯ãã«ãå¾ã¾ããç¹ã¯ãç»åã®å
å´ã§ãªããã°ãªãã¾ããã 320*240ã®å ´åã(x>=0 &&
- * x<320 x+w>0 && x+w<320),(y>0 && y<240 y+h>=0 && y+h<=319)ã¨ãªãã¾ãã
- *
- * @param i_pos1
- * ç¹1ã®åº§æ¨ã§ãã
- * @param i_pos2
- * ç¹2ã®åº§æ¨ã§ãã
- * @param i_area
- * ãã¯ãã«ãæ¤åºããã«ã¼ãã«ãµã¤ãºã§ãã1ã®å ´å(n*2-1)^2ã®ã«ã¼ãã«ã«ãªãã¾ãã ç¹2ã®åº§æ¨ã§ãã
- * @param o_coord
- * çµæãåãåããªãã¸ã§ã¯ãã§ãã
- * @return
- * @throws NyARException
+ * ãã®é¢æ°ã¯ãå
ç»åã®ç¹1ã¨ç¹2ã®éã«ç·åãå®ç¾©ãã¦ããã®ç·åä¸ã®ãã¯ãã«ãé
åã«å¾ã¾ãã ç¹ã¯ãç»åã®å
å´ã§ãªããã°ãªãã¾ããã
+ * ãã®é¢æ°ã¯ã¯ãªããã³ã°å¦çãè¡ãã¾ãããã¯ãªããã³ã°ãå¿
è¦ãªæã«ã¯ãtraceLineWithClipã使ãã¾ãã
+ * 輪éãã¯ãã«ã®æ¤åºç¹æ§ã«ã¤ãã¦ã¯ã{@link #traceConture(NyARIntCoordinates, int, int, VecLinearCoordinates)}ã確èªãã¦ãã ããã
*/
public boolean traceLine(NyARIntPoint2d i_pos1, NyARIntPoint2d i_pos2,int i_edge, VecLinearCoordinates o_coord)
{
@@ -133,7 +128,11 @@ public abstract class NyARVectorReader_Base implements INyARVectorReader
// ç¹æ°ã¯20ç¹ç¨åº¦ãå¾ãã
return traceConture(coord, 1, s, o_coord);
}
-
+ /**
+ * ãã®é¢æ°ã¯ãå
ç»åã®ç¹1ã¨ç¹2ã®éã«ç·åãå®ç¾©ãã¦ããã®ç·åä¸ã®ãã¯ãã«ãé
åã«å¾ã¾ãã ç¹ã¯ãç»åã®å
å´ã§ãªããã°ãªãã¾ããã
+ * ãã®é¢æ°ã¯ã¯ãªããã³ã°å¦çãè¡ãã¾ãããã¯ãªããã³ã°ãå¿
è¦ãªæã«ã¯ãtraceLineWithClipã使ãã¾ãã
+ * 輪éãã¯ãã«ã®æ¤åºç¹æ§ã«ã¤ãã¦ã¯ã{@link #traceConture(NyARIntCoordinates, int, int, VecLinearCoordinates)}ã確èªãã¦ãã ããã
+ */
public boolean traceLine(NyARDoublePoint2d i_pos1,NyARDoublePoint2d i_pos2, int i_edge, VecLinearCoordinates o_coord)
{
NyARIntCoordinates coord = this._coord_buf;
@@ -190,13 +189,8 @@ public abstract class NyARVectorReader_Base implements INyARVectorReader
return false;
}
/**
- * 輪éç·ãåå¾ãã¾ãã
- * åå¾ã¢ã«ã´ãªãºã ã¯ã以ä¸ã®éãã§ãã
- * 1.輪é座æ¨(n)ã®ç»ç´ å¨è¾ºã®ç»ç´ ãã¯ãã«ãåå¾ã
- * 2.輪é座æ¨(n+1)å¨è¾ºã®ç»ç´ ãã¯ãã«ã¨æ¯è¼ã
- * 3.å·®åãä¸å®ä»¥ä¸ãªãã座æ¨ã¨å¼·åº¦ãä¿å
- * 4.3ç¹ä»¥ä¸ã®éåã«ãªã£ãããæå°äºä¹æ³ã§ç´ç·ãè¨ç®ã
- * 5.ç´ç·ã®å éå¤ãåã
ã®ç»ç´ ãã¯ãã«ã®åã¨ãã¦è¿å´ã
+ * ãã®é¢æ°ã¯ãã«ã¼ãã«ãµã¤ãºãæå®ãã¦ããã³ãç»åã®è¼ªé座æ¨ãããå
ç»åã®è¼ªéç·ã®ãã¯ãã«ãå¾ã¾ãã
+ * 輪éãã¯ãã«ã¯ãé£æ¥ããè¦ç´ ãä¼¼ã¦ããå ´åãå ç®ãã¦ã¾ã¨ãããã¾ããé£æ¥ãã¦ããªããã¯ãã«ã¯ã¾ã¨ãããã¾ããã
*/
public boolean traceConture(NyARIntCoordinates i_coord, int i_pos_mag,int i_cell_size, VecLinearCoordinates o_coord)
{
@@ -339,14 +333,7 @@ public abstract class NyARVectorReader_Base implements INyARVectorReader
private NyARLinear __temp_l = new NyARLinear();
/**
- * ã¯ãªããã³ã°ä»ãã®ã©ã¤ã³ãã¬ã¼ãµã§ãã
- *
- * @param i_pos1
- * @param i_pos2
- * @param i_edge
- * @param o_coord
- * @return
- * @throws NyARException
+ * ãã®é¢æ°ã¯ãã¯ãªããã³ã°ä»ãã®ã©ã¤ã³ãã¬ã¼ãµã§ãã å
ç»åã®ç¹1ã¨ç¹2ã®éã«ç·åãå®ç¾©ãã¦ããã®ç·åä¸ã®ãã¯ãã«ãé
åã«å¾ã¾ãã 座æ¨ã¯ãé©åã«ç»åå
ã«ã¯ãªããã³ã°ãã¾ãã
*/
public boolean traceLineWithClip(NyARDoublePoint2d i_pos1,
NyARDoublePoint2d i_pos2, int i_edge, VecLinearCoordinates o_coord)
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
index 1385480..b42b626 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/NyARVectorReader_INT1D_GRAY_8.java
@@ -31,20 +31,19 @@ import jp.nyatla.nyartoolkit.core.types.*;
/**
- * ã°ã¬ã¤ã¹ã±ã¼ã«ã©ã¹ã¿ã«å¯¾ãããç¹æ®ãªç»ç´ ã¢ã¯ã»ã¹æ段ãæä¾ãã¾ãã
- *
+ * ãã®ã¯ã©ã¹ã¯ã{@link NyARBufferType#INT1D_GRAY_8}ã®ç»ç´ å½¢å¼ã«å¯¾å¿ããç»ç´ ãã¯ãã«ãªã¼ãã¼ã§ãã
*/
public class NyARVectorReader_INT1D_GRAY_8 extends NyARVectorReader_Base
{
/**
- *
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * åºæ¬GSç»åããã³ãç»åã®ã»ãããããã¤ã³ã¹ã¿ã³ã¹ãä½ãã¾ãã
* @param i_ref_raster
- * åºæ¬ç»å
+ * åºæ¬GSç»åã®åç
§å¤
* @param i_ref_raster_distortion
- * æªã¿è§£é¤ãªãã¸ã§ã¯ã(nullã®å ´åæªã¿è§£é¤ãçç¥)
+ * åºæ¬ç»åã®æªã¿è£æ£ãªãã¸ã§ã¯ãã®åç
§å¤
* @param i_ref_rob_raster
- * ã¨ãã¸æ¢ç´¢ç¨ã®ROBç»å
- * @param
+ * ãã³ãç»åã®åç
§å¤
*/
public NyARVectorReader_INT1D_GRAY_8(NyARGrayscaleRaster i_ref_raster,NyARCameraDistortionFactor i_ref_raster_distortion,NyARGrayscaleRaster i_ref_rob_raster)
{
@@ -54,71 +53,57 @@ public class NyARVectorReader_INT1D_GRAY_8 extends NyARVectorReader_Base
this.initInstance(i_ref_raster, i_ref_raster_distortion, i_ref_rob_raster,new NyARContourPickup());
}
+
+// /**
+// * ç»ç´ ã®4è¿åã®ç»ç´ ãã¯ãã«ãåå¾ãã¾ãã åå¾å¯è½ãªç¯å²ã¯ãRasterã®1ãããå
å´ã§ãã 0 ,-1, 0 0, 0, 0 0 , x,
+// * 0ã+ -1, y,+1 0 ,+1, 0 0, 0, 0
+// *
+// * @param i_raster
+// * @param x
+// * @param y
+// * @param o_v
+// */
+// public void getPixelVector4(int x, int y, NyARIntPoint2d o_v)
+// {
+// assert ((x > 0) && (y > 0) && (x) < this._ref_base_raster.getWidth() && (y) < this._ref_base_raster.getHeight());
+// int[] buf = (int[])(this._ref_base_raster.getBuffer());
+// int w = this._ref_base_raster.getWidth();
+// int idx = w * y + x;
+// o_v.x = (buf[idx + 1] - buf[idx - 1]) >> 1;
+// o_v.y = (buf[idx + w] - buf[idx - w]) >> 1;
+// //æªã¿è£æ£ã©ãããã®
+// }
+//
+// /**
+// * ç»ç´ ã®8è¿åç»ç´ ãã¯ãã«ãåå¾ãã¾ãã åå¾å¯è½ãªç¯å²ã¯ãRasterã®1ãããå
å´ã§ãã
+// * -1,-2,-1ãããã-1,ã0,+1
+// * 0, y,ã0 +ãã-2, x,+2
+// * +1,+2,+1 ãããã-1, 0,+1
+// *
+// * @param i_raster
+// * @param x
+// * @param y
+// * @param o_v
+// */
+// public void getPixelVector8(int x, int y, NyARIntPoint2d o_v) {
+// assert ((x > 0) && (y > 0) && (x) < this._ref_base_raster.getWidth() && (y) < this._ref_base_raster.getHeight());
+// int[] buf = (int[])this._ref_base_raster.getBuffer();
+// int sw = this._ref_base_raster.getWidth();
+// int idx_0 = sw * y + x;
+// int idx_p1 = idx_0 + sw;
+// int idx_m1 = idx_0 - sw;
+// int b = buf[idx_m1 - 1];
+// int d = buf[idx_m1 + 1];
+// int h = buf[idx_p1 - 1];
+// int f = buf[idx_p1 + 1];
+// o_v.x = ((buf[idx_0 + 1] - buf[idx_0 - 1]) >> 1)
+// + ((d - b + f - h) >> 2);
+// o_v.y = ((buf[idx_p1] - buf[idx_m1]) >> 1) + ((f - d + h - b) >> 2);
+// //æªã¿è£æ£ã©ãããã®ï¼
+// }
+
/**
- * ç»ç´ ã®4è¿åã®ç»ç´ ãã¯ãã«ãåå¾ãã¾ãã åå¾å¯è½ãªç¯å²ã¯ãRasterã®1ãããå
å´ã§ãã 0 ,-1, 0 0, 0, 0 0 , x,
- * 0ã+ -1, y,+1 0 ,+1, 0 0, 0, 0
- *
- * @param i_raster
- * @param x
- * @param y
- * @param o_v
- */
-/* æªä½¿ç¨ã«ã¤ãã³ã¡ã³ãã¢ã¦ã
- public void getPixelVector4(int x, int y, NyARIntPoint2d o_v)
- {
- assert ((x > 0) && (y > 0) && (x) < this._ref_base_raster.getWidth() && (y) < this._ref_base_raster.getHeight());
- int[] buf = (int[])(this._ref_base_raster.getBuffer());
- int w = this._ref_base_raster.getWidth();
- int idx = w * y + x;
- o_v.x = (buf[idx + 1] - buf[idx - 1]) >> 1;
- o_v.y = (buf[idx + w] - buf[idx - w]) >> 1;
- //æªã¿è£æ£ã©ãããã®
- }
-*/
- /**
- * ç»ç´ ã®8è¿åç»ç´ ãã¯ãã«ãåå¾ãã¾ãã åå¾å¯è½ãªç¯å²ã¯ãRasterã®1ãããå
å´ã§ãã
- * -1,-2,-1ãããã-1,ã0,+1
- * 0, y,ã0 +ãã-2, x,+2
- * +1,+2,+1 ãããã-1, 0,+1
- *
- * @param i_raster
- * @param x
- * @param y
- * @param o_v
- */
-/* æªä½¿ç¨ã«ã¤ãã³ã¡ã³ãã¢ã¦ã
- public void getPixelVector8(int x, int y, NyARIntPoint2d o_v) {
- assert ((x > 0) && (y > 0) && (x) < this._ref_base_raster.getWidth() && (y) < this._ref_base_raster.getHeight());
- int[] buf = (int[])this._ref_base_raster.getBuffer();
- int sw = this._ref_base_raster.getWidth();
- int idx_0 = sw * y + x;
- int idx_p1 = idx_0 + sw;
- int idx_m1 = idx_0 - sw;
- int b = buf[idx_m1 - 1];
- int d = buf[idx_m1 + 1];
- int h = buf[idx_p1 - 1];
- int f = buf[idx_p1 + 1];
- o_v.x = ((buf[idx_0 + 1] - buf[idx_0 - 1]) >> 1)
- + ((d - b + f - h) >> 2);
- o_v.y = ((buf[idx_p1] - buf[idx_m1]) >> 1) + ((f - d + h - b) >> 2);
- //æªã¿è£æ£ã©ãããã®ï¼
- }
-*/
- /**
- * RECTç¯å²å
ã®ç»ç´ ãã¯ãã«ã®åè¨å¤ã¨ããã¯ãã«ã®ã¨ãã¸ä¸å¿ãåå¾ãã¾ãã 320*240ã®å ´åã
- * RECTã®ç¯å²ã¯(x>=0 && x<319 x+w>=0 && x+w<319),(y>=0 && y<239 x+w>=0 && x+w<319)ã¨ãªãã¾ãã
- * @param ix
- * ãã¯ã»ã«åå¾ãè¡ãä½ç½®ãè¨å®ãã¾ãã
- * @param iy
- * ãã¯ã»ã«åå¾ãè¡ãä½ç½®ãè¨å®ãã¾ãã
- * @param iw
- * ãã¯ã»ã«åå¾ãè¡ãç¯å²ãè¨å®ãã¾ãã
- * @param ih
- * ãã¯ã»ã«åå¾ãè¡ãç¯å²ãè¨å®ãã¾ãã
- * @param o_posvec
- * ã¨ãã¸ä¸å¿ã¨ãã¯ãã«ãè¿ãã¾ãã
- * @return
- * ãã¯ãã«ã®å¼·åº¦ãè¿ãã¾ãã強度å¤ã¯ãå·®åå¤ã®äºä¹ã®åè¨ã§ãã
+ * ãã®é¢æ°ã¯ãå
ç»åã®ç©å½¢é åãéè¨ãã¦ããã®é åå
ã®ã¨ãã¸ä¸å¿ã¨ãã¨ãã¸ã®æ¹ä½ãã¯ãã«ãè¿ãã¾ãã ç»ç´ ã®éè¨ã«ã¯ã3x3ã®ã«ã¼ãã«ã使ãã¾ãã ç©å½¢é åã¯ãä¾ãã°åå¾å
ã®ç»åã320*240ã®å ´åã(x>=0 && x<=320 x+w>=0 && x+w<=320),(y>=0 && y<=240 y+h>=0 && y+h<=240)ã§ãã
*/
public final int getAreaVector33(int ix, int iy, int iw, int ih,NyARVecLinear2d o_posvec)
{
@@ -183,6 +168,9 @@ public class NyARVectorReader_INT1D_GRAY_8 extends NyARVectorReader_Base
//å éå¹³åã®åæ¯ãè¿å´
return sum_wx+sum_wy;
}
+ /**
+ * ãã®é¢æ°ã¯ãå
ç»åã®ç©å½¢é åãéè¨ãã¦ããã®é åå
ã®ã¨ãã¸ä¸å¿ã¨ãã¨ãã¸ã®æ¹ä½ãã¯ãã«ãè¿ãã¾ãã ç»ç´ ã®éè¨ã«ã¯ã2x2ã®ã«ã¼ãã«ã使ãã¾ãã ç©å½¢é åã¯ãä¾ãã°åå¾å
ã®ç»åã320*240ã®å ´åã(x>=0 && x<=320 x+w>=0 && x+w<=320),(y>=0 && y<=240 y+h>=0 && y+h<=240)ã§ãã
+ */
public final int getAreaVector22(int ix, int iy, int iw, int ih,NyARVecLinear2d o_posvec)
{
assert (ih >= 3 && iw >= 3);
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
index 74e0baa..c5c603d 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatus.java
@@ -3,40 +3,40 @@ package jp.nyatla.nyartoolkit.rpf.tracker.nyartk.status;
import jp.nyatla.nyartoolkit.NyARException;
import jp.nyatla.nyartoolkit.rpf.sampler.lrlabel.LowResolutionLabelingSamplerOut;
import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.INyARVectorReader;
-import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARTrackerSource;
-import jp.nyatla.nyartoolkit.rpf.tracker.nyartk.NyARVectorReader_INT1D_GRAY_8;
import jp.nyatla.nyartoolkit.rpf.utils.VecLinearCoordinates;
+
/**
- * 輪éã½ã¼ã¹1åãæ ¼ç´ããã¯ã©ã¹ã§ãã
- *
+ * ãã®ã¯ã©ã¹ã¯ã輪éã¹ãã¼ã¿ã¹ã®ã¿ã¼ã²ããã¹ãã¼ã¿ã¹ãæ ¼ç´ãã¾ãã
+ * 輪éã¹ãã¼ã¿ã¹ã¯ããã¯ãã«åãã輪éç¹é
åãã¡ã³ãã«æã¡ã¾ãã
*/
public final class NyARContourTargetStatus extends NyARTargetStatus
{
/**
- * ãã¯ãã«è¦ç´ ãæ ¼ç´ããé
åã§ãã
+ * [readonly]輪éç¹ã®ãã¯ãã«è¦ç´ ãæ ¼ç´ããé
åã§ãã
*/
public VecLinearCoordinates vecpos=new VecLinearCoordinates(100);
-
-
-
//
//å¶å¾¡é¨
/**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã®é¢æ°ã¯ãææããããã¼ã«ãªãã¸ã§ã¯ãã使ãã¾ããã¦ã¼ã¶ã¯ä½¿ãã¾ããã
* @param i_ref_pool_operator
- * @param i_shared
- * å
±æã¯ã¼ã¯ãªãã¸ã§ã¯ããæå®ãã¾ãã
- *
+ * ãã¼ã«ãªãã¸ã§ã¯ãã®ã³ã³ããã¼ã«ã¤ã³ã¿ãã§ã¤ã¹
*/
public NyARContourTargetStatus(INyARManagedObjectPoolOperater i_ref_pool_operator)
{
super(i_ref_pool_operator);
}
/**
+ * ãã®é¢æ°ã¯ããµã³ãã«å¤ãå
ã«ããã¯ãã«è¼ªéãçæãã¦ãã¤ã³ã¹ã¿ã³ã¹ãæ´æ°ãã¾ãã
* @param i_vecreader
+ * ç»ç´ ãã¯ãã«ã®èªåºããªãã¸ã§ã¯ãã
* @param i_sample
+ * 輪éç¹ã®åºç¹æ
å ±ã«ä½¿ãããµã³ãã«ãªãã¸ã§ã¯ãã
* @return
+ * æåããã¨trueãè¿ãã¾ãã
* @throws NyARException
*/
public boolean setValue(INyARVectorReader i_vecreader,LowResolutionLabelingSamplerOut.Item i_sample) throws NyARException
diff --git a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
index 6875e70..773ecda 100644
--- a/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
+++ b/lib/src.rpf/jp/nyatla/nyartoolkit/rpf/tracker/nyartk/status/NyARContourTargetStatusPool.java
@@ -5,15 +5,17 @@ import jp.nyatla.nyartoolkit.core.utils.NyARManagedObjectPool;
-/*
- * 輪éæ
å ±ãä¿ç®¡ãã¾ãã
- * ãã®ã¯ã©ã¹ã®è¦ç´ ã¯ãä»ã®è¦ç´ ããåç
§ããå¯è½æ§ãããã¾ãã
+/**
+ * ãã®ã¯ã©ã¹ã¯ã{@link NyARContourTargetStatus}åã®ãã¼ã«ã¯ã©ã¹ã§ãã
+ * é常ãã¦ã¼ã¶ã使ããã¨ã¯ããã¾ããã
*/
public final class NyARContourTargetStatusPool extends NyARManagedObjectPool
{
/**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã¼ã«ã®æ大ãµã¤ãºãå©ç¨ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãçæãã¾ãã
* @param i_size
- * ã¹ã¿ãã¯ã®æ大ãµã¤ãº
+ * ãã¼ã«ã®æ大ãµã¤ãºã§ãã
* @throws NyARException
*/
public NyARContourTargetStatusPool(int i_size) throws NyARException
@@ -21,7 +23,7 @@ public final class NyARContourTargetStatusPool extends NyARManagedObjectPool
{
/**
* ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã¼ã«ã®æ大ãµã¤ãºãå©ç¨ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãçæãã¾ãã
* @param i_size
- * poolã®ãµã¤ãº
+ * ãã¼ã«ã®æ大ãµã¤ãºã§ãã
* @throws NyARException
*/
public NyARNewTargetStatusPool(int i_size) throws NyARException
@@ -17,7 +21,7 @@ public class NyARNewTargetStatusPool extends NyARManagedObjectPool
{
- /**
- * è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã
- */
+ /** è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã*/
public VecLinearCoordinates _vecpos=new VecLinearCoordinates(100);
+ /** è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã*/
public LineBaseVertexDetector _line_detect=new LineBaseVertexDetector();
+ /** è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã*/
public VecLinearCoordinatesOperator _vecpos_op=new VecLinearCoordinatesOperator();
+ /** è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã*/
public VecLinearCoordinates.VecLinearCoordinatePoint[] _indexbuf=new VecLinearCoordinates.VecLinearCoordinatePoint[4];
+ /** è¦ç´ éã§å
±æãããªãã¸ã§ã¯ãããã®å¤æ°ã¯ãNyARRectTargetStatus以å¤ãã使ããªãã§ãã ããã*/
public NyARLinear[] _line=NyARLinear.createArray(4);
/**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã¼ã«ã®æ大ãµã¤ãºãå©ç¨ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãçæãã¾ãã
* @param i_size
- * ã¹ã¿ãã¯ã®æ大ãµã¤ãº
- * @param i_cood_max
- * 輪éãã¯ãã«ã®æ大æ°
+ * ãã¼ã«ã®æ大ãµã¤ãºã§ãã
* @throws NyARException
*/
public NyARRectTargetStatusPool(int i_size) throws NyARException
{
super.initInstance(i_size,NyARRectTargetStatus.class);
}
+ /**
+ * ãã®é¢æ°ã¯ããªã¹ãè¦ç´ ãçæãã¦è¿ãã¾ãã
+ */
protected NyARRectTargetStatus createElement()
{
return new NyARRectTargetStatus(this);
@@ -37,12 +45,16 @@ public class NyARRectTargetStatusPool extends NyARManagedObjectPoolã¡ã¢ -
+ * ST_XXXã®å®æ°å¤ã¯ã{@link NyARTracker}ã®ã³ã³ã¹ãã©ã¯ã¿å®è£
ã¨å¯æ¥ã«çµ¡ãã§ãã¾ãã
+ * å¤æ´ããã¨ãã¯æ³¨æãããã¨ï¼
+ *
*
*/
public class NyARTargetStatus extends NyARManagedObject
{
+ /** å®æ°å¤ãIGNOREã¹ãã¼ã¿ã¹ã表ãã¾ãã*/
public final static int ST_IGNORE=0;
+ /** å®æ°å¤ãNEWã¹ãã¼ã¿ã¹ã表ãã¾ãã*/
public final static int ST_NEW=1;
+ /** å®æ°å¤ãRECTã¹ãã¼ã¿ã¹ã表ãã¾ãã*/
public final static int ST_RECT=2;
+ /** å®æ°å¤ãCONTUREã¹ãã¼ã¿ã¹ã表ãã¾ãã*/
public final static int ST_CONTURE=3;
+ /** å®æ°å¤ãã¹ãã¼ã¿ã¹ã®ç¨®é¡ã表ãã¾ãã*/
public final static int MAX_OF_ST_KIND=3;
+ /**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ææããããã¼ã«ãªãã¸ã§ã¯ããæå®ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãçæãã¾ãã
+ * @param iRefPoolOperator
+ * ãã¼ã«ãªãã¸ã§ã¯ãã®ã³ã³ããã¼ã«ã¤ã³ã¿ãã§ã¤ã¹ã
+ */
protected NyARTargetStatus(INyARManagedObjectPoolOperater iRefPoolOperator)
{
super(iRefPoolOperator);
diff --git a/lib/test/jp/nyatla/nyartoolkit/test/NyIdTest.java b/lib/test/jp/nyatla/nyartoolkit/test/NyIdTest.java
index 32530bd..16e3507 100644
--- a/lib/test/jp/nyatla/nyartoolkit/test/NyIdTest.java
+++ b/lib/test/jp/nyatla/nyartoolkit/test/NyIdTest.java
@@ -41,18 +41,37 @@ import jp.nyatla.nyartoolkit.nyidmarker.data.*;
import jp.nyatla.nyartoolkit.processor.*;
/**
- * 320x240ã®BGRA32ã§è¨é²ãããIdmarkerãæ®å½±ããRAWã¤ã¡ã¼ã¸ããã
- * Idãã¼ã«ãèªèãã¾ãã
- *
+ * ãã®ããã°ã©ã ã¯ãNyIdãã¼ã«æ¤åºã¯ã©ã¹{@link SingleNyIdMarkerProcesser}ã®åä½ãã§ãã¯ããã°ã©ã ã§ãã
+ * éæ¢ç»ãã1åã®IDãã¼ã«ãèªã¿åãããã®æ°å¤ãå¾ãåä½ã確èªã§ãã¾ãã
+ *
+ * ãã®ããã°ã©ã ã«ã¯çµæã表示ããæ©è½ãããã¾ããã
+ * æ°å¤ã®ç¢ºèªã¯ããã¬ã¼ã¯ãã¤ã³ããä»æãããªã©ãã¦è¡ã£ã¦ãã ããã
*/
public class NyIdTest
{
+ /**
+ * ãã®ã¯ã©ã¹ã¯ã{@link SingleNyIdMarkerProcesser}ã®èªå·±ã³ã¼ã«ããã¯é¢æ°ãå®è£
ããã¯ã©ã¹ã§ãã
+ * èªå·±ã³ã¼ã«ããã¯é¢æ°ã¯ã{@link #detectMarker}ã®å
é¨ããå¼ã³åºãã¾ãã
+ * ããã«ãããã¢ããªã±ã¼ã·ã§ã³ã«ãã¼ã«ç¶æ
ã®å¤åãéç¥ãã¾ãã
+ * éç¥ãããæ¡ä»¶ã«ã¤ãã¦ã¯ãããããã®é¢æ°ã®èª¬æãè¦ã¦ãã ããã
+ */
public class MarkerProcessor extends SingleNyIdMarkerProcesser
{
private Object _sync_object = new Object();
+ /** {@link #onUpdateHandler}é¢æ°ã§å¾ã姿å¢è¡åã®ãã¤ã³ã¿*/
public NyARTransMatResult transmat = null;
+ /** {@link #onEnterHandler}é¢æ°ã§å¾ã姿å¢è¡åã®ãã¤ã³ã¿*/
public int current_id = -1;
-
+ /**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ãã©ã¡ã¼ã¿ã{@link #initInstance}ã¸ã»ãããã¦åæåãã¾ãã
+ * ããã§ã¯ã{@link #initInstance}ã¸å¤ãå¼ã渡ãã ãã§ãã
+ * @param i_cparam
+ * ã«ã¡ã©ãã©ã¡ã¼ã¿ã
+ * @param i_raster_format
+ * å
¥åã©ã¹ã¿ã®ãã©ã¼ãããã
+ * @throws Exception
+ */
public MarkerProcessor(NyARParam i_cparam, int i_raster_format) throws Exception
{
super();//
@@ -61,7 +80,10 @@ public class NyIdTest
return;
}
/**
- * ã¢ããªã±ã¼ã·ã§ã³ãã¬ã¼ã ã¯ã¼ã¯ã®ãã³ãã©ï¼ãã¼ã«åºç¾ï¼
+ * ãã®é¢æ°ã¯ã{@link #detectMarker}ããå¼ã³åºãããèªå·±ã³ã¼ã«ããã¯é¢æ°ã§ãã
+ * ç»åã«ãã¼ã«ãç¾ãããã¨ãã«å¼ã³åºããã¾ãã
+ * ããã§ã¯ãä¾ã¨ãã¦ããã¼ã«ã®æ
å ±ãèªã¿åããããã{@link NyIdMarkerData_RawBit}ã使ã£ã¦
+ * intå¤ã«ã¨ã³ã³ã¼ãããå¦çãå®è£
ãã¦ãã¾ãã
*/
protected void onEnterHandler(INyIdMarkerData i_code)
{
@@ -87,7 +109,10 @@ public class NyIdTest
}
}
/**
- * ã¢ããªã±ã¼ã·ã§ã³ãã¬ã¼ã ã¯ã¼ã¯ã®ãã³ãã©ï¼ãã¼ã«æ¶æ»
ï¼
+ * ãã®é¢æ°ã¯ã{@link #detectMarker}ããå¼ã³åºãããèªå·±ã³ã¼ã«ããã¯é¢æ°ã§ãã
+ * ç»åãããã¼ã«ãæ¶ãå»ã£ãæã«å¼ã³åºããã¾ãã
+ * ããã§ã¯ããã¼ã«ãæ¶ããå ´åã®å¾å§æ«å¦çããã¾ãã
+ * ãã®ãµã³ãã«ã§ã¯ãã¡ã³ãå¤æ°ããªã»ãããã¦ãã¾ãã
*/
protected void onLeaveHandler()
{
@@ -99,7 +124,11 @@ public class NyIdTest
return;
}
/**
- * ã¢ããªã±ã¼ã·ã§ã³ãã¬ã¼ã ã¯ã¼ã¯ã®ãã³ãã©ï¼ãã¼ã«æ´æ°ï¼
+ * ãã®é¢æ°ã¯ã{@link #detectMarker}ããå¼ã³åºãããèªå·±ã³ã¼ã«ããã¯é¢æ°ã§ãã
+ * ç»åä¸ã®ãã¼ã«ã®ä½ç½®ãå¤åããã¨ãã«å¼ã³åºããã¾ãã
+ * ãã®é¢æ°ã¯ã{@link #onEnterHandler}ç´å¾ã«å¼ã³åºããããã¨ãããã¾ãã
+ *
+ * ãã®ãµã³ãã«ã§ã¯ãå¼æ°ã§éç¥ããããã¼ã«ã®å§¿å¢ããã¡ã³ãå¤æ°ã«ä¿åãã¦ãã¾ãã
*/
protected void onUpdateHandler(NyARSquare i_square, NyARTransMatResult result)
{
@@ -111,9 +140,19 @@ public class NyIdTest
}
private final String data_file = "../Data/320x240NyId.raw";
private final String camera_file = "../Data/camera_para.dat";
+ /**
+ * ã³ã³ã¹ãã©ã¯ã¿ã§ãã
+ * ããã§è¡ãå¦çã¯ããã¾ããã
+ */
public NyIdTest()
{
}
+ /**
+ * ãã¹ãé¢æ°ã®æ¬ä½ã§ãã
+ * è¨å®ãã¡ã¤ã«ããµã³ãã«ç»åã®èªã¿è¾¼ãã ã®ã¡ã«{@link MarkerProcessor}ãçæãã
+ * ï¼åã ãç»åãå
¥åãã¦ããã¼ã«æ¤åºã試è¡ãã¾ãã
+ * @throws Exception
+ */
public void Test() throws Exception
{
//ARç¨ã«ã¡ã©ãã©ã¡ã¿ãã¡ã¤ã«ããã¼ã
@@ -134,6 +173,12 @@ public class NyIdTest
pr.detectMarker(ra);
return;
}
+ /**
+ * ããã°ã©ã ã®ã¨ã³ããªã¼ãã¤ã³ãã§ãã
+ * ãµã³ãã«ããã°ã©ã {@link NyIdTest}ãå®è¡ãã¾ãã
+ * @param args
+ * å¼æ°ã¯ããã¾ããã
+ */
public static void main(String[] args)
{
diff --git a/lib/test/jp/nyatla/nyartoolkit/test/RawFileTest.java b/lib/test/jp/nyatla/nyartoolkit/test/RawFileTest.java
index 2a01a05..c2aad09 100644
--- a/lib/test/jp/nyatla/nyartoolkit/test/RawFileTest.java
+++ b/lib/test/jp/nyatla/nyartoolkit/test/RawFileTest.java
@@ -41,9 +41,10 @@ import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;
import jp.nyatla.nyartoolkit.core.types.*;
/**
- * 320x240ã®BGRA32ã§è¨é²ãããRAWã¤ã¡ã¼ã¸ãããï¼ç¨®é¡ã®ãã¿ã¼ã³ãèªèãã
- * ãã®å¤æè¡åã1000åæ±ããããã«ããã£ãããªç§æéã表示ãã¾ãã
- *
+ * ãã®ãµã³ãã«ã¯ã{@link NyARSingleDetectMarker}ã¯ã©ã¹ã®åä½ãã§ãã¯ï¼ãã³ããã¼ã¯ããã°ã©ã ã§ãã
+ * éæ¢ç»ãã1åã®Hiroãã¼ã«ãèªèãã¦ããã®å§¿å¢å¤æè¡åããã¿ã¼ã³ä¸è´çãå¾ãåä½ã確èªã§ãã¾ãã
+ * åæã«ããã®å¦çã1000åå®è¡ãã¦ãå¦çæéãè¨æ¸¬ãã¾ãããã®æ°å¤ã¯ãNyARToolkitã®åºæ¬æ§è½ã®
+ * ææ¨ã¨ãã¦ä½¿ããã¨ãã§ãã¾ãã
*/
public class RawFileTest
{
diff --git a/lib/test/jp/nyatla/nyartoolkit/test/RpfTest.java b/lib/test/jp/nyatla/nyartoolkit/test/RpfTest.java
index 78fe55f..45793d5 100644
--- a/lib/test/jp/nyatla/nyartoolkit/test/RpfTest.java
+++ b/lib/test/jp/nyatla/nyartoolkit/test/RpfTest.java
@@ -8,6 +8,7 @@ import java.util.Date;
import jp.nyatla.nyartoolkit.core.param.NyARParam;
import jp.nyatla.nyartoolkit.core.types.NyARBufferType;
import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;
+import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;
import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARReality;
import jp.nyatla.nyartoolkit.rpf.reality.nyartk.NyARRealityTarget;
import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource;
@@ -19,20 +20,23 @@ import jp.nyatla.nyartoolkit.rpf.realitysource.nyartk.NyARRealitySource_Referenc
/**
- * NyARRealityã®ãã¹ãããã°ã©ã ãåä½ä¿è¨¼ãªãã
- *
- * ã¿ã¼ã²ããããããã£ã®åå¾å®é¨ç¨ã®ãã¹ãã³ã¼ãã§ãã
- * ã¯ãªãã¯ãããã¼ã«ãããã®å¹³é¢å¨è¾ºãããç»åãåå¾ãããã¹ããã§ãã¾ãã
- *
+ * ãã®ãµã³ãã«ã¯ã{@link NyARReality}ã¯ã©ã¹ã®åä½ãã§ãã¯ï¼ãã³ããã¼ã¯ããã°ã©ã ã§ãã
+ * éæ¢ç»ããããUnknownã¹ãã¼ã¿ã¹ã®ãã¼ã«ãæ¤åºãã¦ãKnownã¹ãã¼ã¿ã¹ã«é·ç§»ã§ãããã¨ã
+ * {@link NyARReality}ãæ£å¸¸ã«åä½ãããã確èªã§ãã¾ãã
+ * ã¾ãã{@link NyARReality#progress}ã1000åå®è¡ãã¦ãå¦çæéãè¨æ¸¬ãã¾ãã
+ * ãã®æ°å¤ã¯ã{@link NyARReality}ã®åºæ¬æ§è½ã®ææ¨ã¨ãã¦ä½¿ããã¨ãã§ãã¾ãã
*/
-
public class RpfTest
{
private final static String PARAM_FILE = "../Data/camera_para.dat";
private final static String DATA_FILE = "../Data/320x240ABGR.raw";
private static final long serialVersionUID = -2110888320986446576L;
-
+ /**
+ * ã¡ã¤ã³é¢æ°ã§ãã
+ * 次ã®ããã¼ã§å¦çãå®è¡ãã¾ãã
+ * @param args
+ */
public static void main(String[] args)
{