[バックアップ]NyARToolkit

core2のファイル移動/その他一時プログラムの配置/関数型の変更など

diff --git a/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java b/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
index a88109a..889add1 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
@@ -31,7 +31,6 @@
  */\r
 package jp.nyatla.nyartoolkit.core;\r
 \r
-import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.utils.*;\r
 \r
 public class NyARSquareStack extends NyObjectStack\r

diff --git a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
index 0ed1c0b..0783f3c 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
+++ b/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
@@ -31,7 +31,6 @@
  */\r
 package jp.nyatla.nyartoolkit.core.labeling;\r
 \r
-import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.utils.*;\r
 \r
 /**\r

diff --git a/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java b/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
index a1ea920..92c3975 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
+++ b/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
@@ -32,7 +32,6 @@
 package jp.nyatla.nyartoolkit.core.param;\r
 \r
 import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.utils.DoubleValue;\r
 \r
 /**\r
  * カメラの歪み成分を格納するクラスと、補正関数群\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
index fdfdc59..ca4e973 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
@@ -182,6 +182,7 @@ public class NyARRasterFilter_ARToolkitThreshold implements INyARRasterFilter_Rg
                case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
                case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
                case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32:\r
+               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R5G6B5_16LE:\r
                        return true;\r
                default:\r
                        return false;\r

diff --git a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
index 24f1815..46d6cae 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
+++ b/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
@@ -54,6 +54,11 @@ public interface INyARBufferReader
        public static final int BUFFERFORMAT_BYTE1D_B8G8R8X8_32 = 0x00010101;\r
 \r
        /**\r
+        * byte[]で、RGB565の16ビット(little endian)で画素が格納されている。\r
+        */\r
+       public static final int BUFFERFORMAT_BYTE1D_R5G6B5_16LE = 0x00010201;\r
+       \r
+       /**\r
         * int[][]で特に値範囲を定めない\r
         */\r
        public static final int BUFFERFORMAT_INT2D = 0x00020000;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java
rename to src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
index deb1d32..14f2156 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/x2/NyARLabeling_ARToolKit_X2.java
+++ b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARLabeling_ARToolKit_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2.x2;\r
+package jp.nyatla.nyartoolkit.nymodel.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

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

diff --git a/src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java
rename to src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
index 9d29f11..9d7e8ed 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/x2/NyARRotTransOptimize_X2.java
+++ b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARRotTransOptimize_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2.x2;\r
+package jp.nyatla.nyartoolkit.nymodel.x2;\r
 \r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java
rename to src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
index c71b8bd..0e72334 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/x2/NyARSingleDetectMarker_X2.java
+++ b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSingleDetectMarker_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2.x2;\r
+package jp.nyatla.nyartoolkit.nymodel.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
similarity index 96%
rename from src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java
rename to src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
index bcd2777..ca94f45 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/x2/NyARSquareDetector_X2.java
+++ b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARSquareDetector_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2.x2;\r
+package jp.nyatla.nyartoolkit.nymodel.x2;\r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.labeling.*;\r
 import jp.nyatla.nyartoolkit.core.raster.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
similarity index 95%
rename from src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java
rename to src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
index e7d0e61..5f14528 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/x2/NyARTransMat_X2.java
+++ b/src/jp/nyatla/nyartoolkit/nymodel/x2/NyARTransMat_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.core2.x2;\r
+package jp.nyatla.nyartoolkit.nymodel.x2;\r
 \r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r

diff --git a/src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java b/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
similarity index 94%
rename from src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java
rename to src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
index 33c4681..e2e25f7 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/sample/RawFileTest_X2.java
+++ b/src/jp/nyatla/nyartoolkit/sample/x2/RawFileTest_X2.java
@@ -29,7 +29,7 @@
  *     <airmail(at)ebony.plala.or.jp>\r
  * \r
  */\r
-package jp.nyatla.nyartoolkit.sample;\r
+package jp.nyatla.nyartoolkit.sample.x2;\r
 \r
 import java.io.*;\r
 import java.util.*;\r
@@ -38,7 +38,7 @@ import jp.nyatla.nyartoolkit.core.*;
 import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
 import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
 import jp.nyatla.nyartoolkit.core.transmat.*;\r
-import jp.nyatla.nyartoolkit.core2.x2.*;\r
+import jp.nyatla.nyartoolkit.nymodel.x2.*;\r
 \r
 \r
 /**\r