[更新]NyARToolkit/nyatlaブランチ

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
index 7dd5c19..e32aeb4 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
@@ -35,8 +35,8 @@ import jp.nyatla.nyartoolkit.NyARException;
 import jp.nyatla.nyartoolkit.core.NyARSquare;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.NyARFitVecCalculator;\r
+import jp.nyatla.nyartoolkit.core.transmat.optimize.NyARRotTransOptimize;\r
 import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
-import jp.nyatla.nyartoolkit.core.transmat.rottransopt.NyARRotTransOptimize;\r
 import jp.nyatla.nyartoolkit.core.types.*;\r
 \r
 \r

diff --git a/src/jp/nyatla/nyartoolkit/core/transmat/rottransopt/NyARRotTransOptimize.java b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/core/transmat/rottransopt/NyARRotTransOptimize.java
rename to src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java
index 7976c8f..ccf35a6 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/transmat/rottransopt/NyARRotTransOptimize.java
+++ b/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.transmat.rottransopt;\r
+package jp.nyatla.nyartoolkit.core.transmat.optimize;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
rename to src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
index 6971721..4945175 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.rasteranalyzer;\r
+package jp.nyatla.nyartoolkit.core2.rasteranalyzer;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
similarity index 93%
rename from src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
rename to src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
index 1baf7f4..13b2ff4 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.rasteranalyzer.threshold;\r
+package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
rename to src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
index afab7b4..5808614 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.rasteranalyzer.threshold;\r
+package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
rename to src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
index b79ab6f..09676da 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core.rasteranalyzer.threshold;\r
+package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbAve.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbAve.java
rename to src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
index d7606eb..c9da6f5 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbAve.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2;\r
+package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbMul.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbMul.java
rename to src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
index b46c949..d0e21e2 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbMul.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2;\r
+package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbOr.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbOr.java
rename to src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
index b3ea03b..a2b6405 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_RgbOr.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2;\r
+package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_Edge.java b/src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_Edge.java
rename to src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java
index bc6311c..2806ca7 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/NyARRasterFilter_Edge.java
+++ b/src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2;\r
+package jp.nyatla.nyartoolkit.core2.temp;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r