OSDN Git Service

nyatlaブランチの削除
authornyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Mon, 15 Sep 2008 01:41:55 +0000 (01:41 +0000)
committernyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Mon, 15 Sep 2008 01:41:55 +0000 (01:41 +0000)
git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@162 7cac0a50-4618-4814-88d0-24b83990f816

134 files changed:
branches/nyatla/Data/320x240ABGR.raw [deleted file]
branches/nyatla/Data/camera_para.dat [deleted file]
branches/nyatla/Data/patt.hiro [deleted file]
branches/nyatla/Data/patt.kanji [deleted file]
branches/nyatla/Data/pattHiro.pdf [deleted file]
branches/nyatla/Data/pattKanji.pdf [deleted file]
branches/nyatla/LICENCE.txt [deleted file]
branches/nyatla/bin/readme.txt [deleted file]
branches/nyatla/readme.ja.txt [deleted file]
branches/nyatla/sample/java3d/.classpath [deleted file]
branches/nyatla/sample/java3d/.project [deleted file]
branches/nyatla/sample/java3d/jp/nyatla/nyartoolkit/java3d/sample/NyARJava3D.java [deleted file]
branches/nyatla/sample/jmf/.classpath [deleted file]
branches/nyatla/sample/jmf/.project [deleted file]
branches/nyatla/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/NyarToolkitLinkTest.java [deleted file]
branches/nyatla/sample/jogl/.classpath [deleted file]
branches/nyatla/sample/jogl/.project [deleted file]
branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java [deleted file]
branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite2.java [deleted file]
branches/nyatla/sample/qt/.classpath [deleted file]
branches/nyatla/sample/qt/.project [deleted file]
branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/NyarToolkitLinkTest.java [deleted file]
branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/QtCaptureTest.java [deleted file]
branches/nyatla/src.utils/java3d/.classpath [deleted file]
branches/nyatla/src.utils/java3d/.project [deleted file]
branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java [deleted file]
branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java [deleted file]
branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java [deleted file]
branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java [deleted file]
branches/nyatla/src.utils/jmf/.classpath [deleted file]
branches/nyatla/src.utils/jmf/.project [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCameraCapture.java [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java [deleted file]
branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java [deleted file]
branches/nyatla/src.utils/jogl/.classpath [deleted file]
branches/nyatla/src.utils/jogl/.project [deleted file]
branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARDetectMarker.java [deleted file]
branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARParam.java [deleted file]
branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java [deleted file]
branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARSingleDetectMarker.java [deleted file]
branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java [deleted file]
branches/nyatla/src.utils/qt/.classpath [deleted file]
branches/nyatla/src.utils/qt/.project [deleted file]
branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java [deleted file]
branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java [deleted file]
branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java [deleted file]
branches/nyatla/src/.classpath [deleted file]
branches/nyatla/src/.project [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/NyARException.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARCode.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARMat.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquare.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVec.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVersion.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabeling.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabelingImage.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingImage.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARGlayscaleRaster.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/fitveccalc/NyARFitVecCalculator.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/INyARRotTransOptimize.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARLabeling_ARToolKit_X2.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java [deleted file]
branches/nyatla/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java [deleted file]
branches/nyatla/src/jp/nyatla/utils/DoubleValue.java [deleted file]
branches/nyatla/src/jp/nyatla/utils/IntValue.java [deleted file]
branches/nyatla/src/jp/nyatla/utils/NyObjectStack.java [deleted file]
branches/nyatla/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java [deleted file]
branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java [deleted file]
branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java [deleted file]

diff --git a/branches/nyatla/Data/320x240ABGR.raw b/branches/nyatla/Data/320x240ABGR.raw
deleted file mode 100644 (file)
index b5be070..0000000
Binary files a/branches/nyatla/Data/320x240ABGR.raw and /dev/null differ
diff --git a/branches/nyatla/Data/camera_para.dat b/branches/nyatla/Data/camera_para.dat
deleted file mode 100644 (file)
index eb671b1..0000000
Binary files a/branches/nyatla/Data/camera_para.dat and /dev/null differ
diff --git a/branches/nyatla/Data/patt.hiro b/branches/nyatla/Data/patt.hiro
deleted file mode 100644 (file)
index 7f78e3c..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
- 234 235 240 233 240 234 240 235 240 237 240 238 240 240 240 232
- 229 240 240 240 240 240 240 240 240 240 240 240 240 240 240 228
- 227 240 240 240 240 240 240 240 240 240 240 240 240 240 240 239
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 231 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 229 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 225 149 240 240 186 216 225 174 240 240 240 237 238 240 240 240
- 150 107 238 231  75 208 115 147 238 228 223 226 237 180 226 240
- 150  62 181 213  62 187 113 169 197  72  29 237 120  50  53 207
- 149  63  47  78  53 184 113 101 142   5 150 150  45 217 186  83
- 121  84 220 222  58 180 121  92 128 109 237 124 155 232 161  64
- 149  71 240 240  76 210  98 109 122 108 240 129  51 119 161 155
- 149 186 240 240  98 219 135 152 207 191 236 227 152  77 175 209
- 235 235 240 233 240 234 240 235 240 236 240 238 240 240 240 240
- 229 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 227 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 232 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 229 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 225 156 240 240 186 216 225 186 240 240 240 240 240 240 240 240
- 150 117 240 231  72 206 115 162 240 232 223 237 240 180 226 240
- 150  74 187 213  51 184 103 168 197  78  29 237 120  50  53 216
- 144  77  51  74  61 184 106 101 142   5 150 152  52 217 186  85
- 117  89 219 219  65 184 121  92 128 100 236 125 156 240 170  73
- 148  71 240 240  76 210 109 109 121  99 240 137  51 120 166 164
- 140 186 240 240  98 220 150 156 207 192 236 230 152  77 176 212
- 234 235 240 233 240 234 240 235 240 236 240 238 240 240 240 233
- 229 240 240 240 240 240 240 240 240 240 240 240 240 240 240 239
- 227 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 232 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 235 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 232 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 228 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 225 156 240 240 182 212 225 180 240 240 240 240 240 240 240 240
- 150 116 238 228  66 205 115 151 238 236 225 240 240 180 226 240
- 156  84 186 211  47 184 109 170 200  92  30 240 120  50  53 216
- 147  83  51  73  50 184 106 110 148  17 151 150  45 217 186  85
- 127  98 219 219  58 179 109 101 128 107 237 125 155 240 163  72
- 155  86 240 240  76 201  85 108 121  95 232 137  51 118 153 155
- 149 189 240 240  98 220 141 154 206 178 235 230 152  77 175 209
-
- 232 228 239 240 240 240 240 240 240 240 240 207  83  64 155 209
- 240 240 240 240 240 240 240 240 240 240 226  53 186 161 161 175
- 240 240 240 240 240 240 240 240 240 240 180  50 217 232 119  77
- 240 240 240 240 240 240 240 240 240 238 237 120  45 155  51 152
- 238 240 240 240 240 240 240 240 240 237 226 237 150 124 129 227
- 240 240 240 240 240 240 240 240 240 240 223  29 150 237 240 236
- 237 240 240 240 240 240 240 240 240 240 228  72   5 109 108 191
- 240 240 240 240 240 240 240 240 240 240 238 197 142 128 122 207
- 235 240 240 240 240 240 240 240 240 174 147 169 101  92 109 152
- 240 240 240 240 240 240 240 240 240 225 115 113 113 121  98 135
- 234 240 240 240 240 240 240 240 240 216 208 187 184 180 210 219
- 240 240 240 240 240 240 240 240 240 186  75  62  53  58  76  98
- 233 240 240 240 240 240 240 240 240 240 231 213  78 222 240 240
- 240 240 240 240 240 240 240 240 240 240 238 181  47 220 240 240
- 235 240 240 240 240 240 240 240 240 149 107  62  63  84  71 186
- 234 229 227 240 236 234 236 231 229 225 150 150 149 121 149 149
- 240 240 240 240 240 240 240 240 240 240 240 216  85  73 164 212
- 240 240 240 240 240 240 240 240 240 240 226  53 186 170 166 176
- 240 240 240 240 240 240 240 240 240 240 180  50 217 240 120  77
- 240 240 240 240 240 240 240 240 240 240 240 120  52 156  51 152
- 238 240 240 240 240 240 240 240 240 240 237 237 152 125 137 230
- 240 240 240 240 240 240 240 240 240 240 223  29 150 236 240 236
- 236 240 240 240 240 240 240 240 240 240 232  78   5 100  99 192
- 240 240 240 240 240 240 240 240 240 240 240 197 142 128 121 207
- 235 240 240 240 240 240 240 240 240 186 162 168 101  92 109 156
- 240 240 240 240 240 240 240 240 240 225 115 103 106 121 109 150
- 234 240 240 240 240 240 240 240 240 216 206 184 184 184 210 220
- 240 240 240 240 240 240 240 240 240 186  72  51  61  65  76  98
- 233 240 240 240 240 240 240 240 240 240 231 213  74 219 240 240
- 240 240 240 240 240 240 240 240 240 240 240 187  51 219 240 240
- 235 240 240 240 240 240 240 240 240 156 117  74  77  89  71 186
- 235 229 227 240 236 234 236 232 229 225 150 150 144 117 148 140
- 233 239 240 240 240 240 240 240 240 240 240 216  85  72 155 209
- 240 240 240 240 240 240 240 240 240 240 226  53 186 163 153 175
- 240 240 240 240 240 240 240 240 240 240 180  50 217 240 118  77
- 240 240 240 240 240 240 240 240 240 240 240 120  45 155  51 152
- 238 240 240 240 240 240 240 240 240 240 240 240 150 125 137 230
- 240 240 240 240 240 240 240 240 240 240 225  30 151 237 232 235
- 236 240 240 240 240 240 240 240 240 240 236  92  17 107  95 178
- 240 240 240 240 240 240 240 240 240 240 238 200 148 128 121 206
- 235 240 240 240 240 240 240 240 240 180 151 170 110 101 108 154
- 240 240 240 240 240 240 240 240 240 225 115 109 106 109  85 141
- 234 240 240 240 240 240 240 240 240 212 205 184 184 179 201 220
- 240 240 240 240 240 240 240 240 240 182  66  47  50  58  76  98
- 233 240 240 240 240 240 240 240 240 240 228 211  73 219 240 240
- 240 240 240 240 240 240 240 240 240 240 238 186  51 219 240 240
- 235 240 240 240 240 240 240 240 240 156 116  84  83  98  86 189
- 234 229 227 240 234 232 235 232 228 225 150 156 147 127 155 149
-
- 209 175  77 152 227 236 191 207 152 135 219  98 240 240 186 149
- 155 161 119  51 129 240 108 122 109  98 210  76 240 240  71 149
-  64 161 232 155 124 237 109 128  92 121 180  58 222 220  84 121
-  83 186 217  45 150 150   5 142 101 113 184  53  78  47  63 149
- 207  53  50 120 237  29  72 197 169 113 187  62 213 181  62 150
- 240 226 180 237 226 223 228 238 147 115 208  75 231 238 107 150
- 240 240 240 238 237 240 240 240 174 225 216 186 240 240 149 225
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 229
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 231
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 239 240 240 240 240 240 240 240 240 240 240 240 240 240 240 227
- 228 240 240 240 240 240 240 240 240 240 240 240 240 240 240 229
- 232 240 240 240 238 240 237 240 235 240 234 240 233 240 235 234
- 212 176  77 152 230 236 192 207 156 150 220  98 240 240 186 140
- 164 166 120  51 137 240  99 121 109 109 210  76 240 240  71 148
-  73 170 240 156 125 236 100 128  92 121 184  65 219 219  89 117
-  85 186 217  52 152 150   5 142 101 106 184  61  74  51  77 144
- 216  53  50 120 237  29  78 197 168 103 184  51 213 187  74 150
- 240 226 180 240 237 223 232 240 162 115 206  72 231 240 117 150
- 240 240 240 240 240 240 240 240 186 225 216 186 240 240 156 225
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 229
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 232
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 227
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 229
- 240 240 240 240 238 240 236 240 235 240 234 240 233 240 235 235
- 209 175  77 152 230 235 178 206 154 141 220  98 240 240 189 149
- 155 153 118  51 137 232  95 121 108  85 201  76 240 240  86 155
-  72 163 240 155 125 237 107 128 101 109 179  58 219 219  98 127
-  85 186 217  45 150 151  17 148 110 106 184  50  73  51  83 147
- 216  53  50 120 240  30  92 200 170 109 184  47 211 186  84 156
- 240 226 180 240 240 225 236 238 151 115 205  66 228 238 116 150
- 240 240 240 240 240 240 240 240 180 225 212 182 240 240 156 225
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 228
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 232
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 235
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 232
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240
- 240 240 240 240 240 240 240 240 240 240 240 240 240 240 240 227
- 239 240 240 240 240 240 240 240 240 240 240 240 240 240 240 229
- 233 240 240 240 238 240 236 240 235 240 234 240 233 240 235 234
-
- 149 149 121 149 150 150 225 229 231 236 234 236 240 227 229 234
- 186  71  84  63  62 107 149 240 240 240 240 240 240 240 240 235
- 240 240 220  47 181 238 240 240 240 240 240 240 240 240 240 240
- 240 240 222  78 213 231 240 240 240 240 240 240 240 240 240 233
-  98  76  58  53  62  75 186 240 240 240 240 240 240 240 240 240
- 219 210 180 184 187 208 216 240 240 240 240 240 240 240 240 234
- 135  98 121 113 113 115 225 240 240 240 240 240 240 240 240 240
- 152 109  92 101 169 147 174 240 240 240 240 240 240 240 240 235
- 207 122 128 142 197 238 240 240 240 240 240 240 240 240 240 240
- 191 108 109   5  72 228 240 240 240 240 240 240 240 240 240 237
- 236 240 237 150  29 223 240 240 240 240 240 240 240 240 240 240
- 227 129 124 150 237 226 237 240 240 240 240 240 240 240 240 238
- 152  51 155  45 120 237 238 240 240 240 240 240 240 240 240 240
-  77 119 232 217  50 180 240 240 240 240 240 240 240 240 240 240
- 175 161 161 186  53 226 240 240 240 240 240 240 240 240 240 240
- 209 155  64  83 207 240 240 240 240 240 240 240 240 239 228 232
- 140 148 117 144 150 150 225 229 232 236 234 236 240 227 229 235
- 186  71  89  77  74 117 156 240 240 240 240 240 240 240 240 235
- 240 240 219  51 187 240 240 240 240 240 240 240 240 240 240 240
- 240 240 219  74 213 231 240 240 240 240 240 240 240 240 240 233
-  98  76  65  61  51  72 186 240 240 240 240 240 240 240 240 240
- 220 210 184 184 184 206 216 240 240 240 240 240 240 240 240 234
- 150 109 121 106 103 115 225 240 240 240 240 240 240 240 240 240
- 156 109  92 101 168 162 186 240 240 240 240 240 240 240 240 235
- 207 121 128 142 197 240 240 240 240 240 240 240 240 240 240 240
- 192  99 100   5  78 232 240 240 240 240 240 240 240 240 240 236
- 236 240 236 150  29 223 240 240 240 240 240 240 240 240 240 240
- 230 137 125 152 237 237 240 240 240 240 240 240 240 240 240 238
- 152  51 156  52 120 240 240 240 240 240 240 240 240 240 240 240
-  77 120 240 217  50 180 240 240 240 240 240 240 240 240 240 240
- 176 166 170 186  53 226 240 240 240 240 240 240 240 240 240 240
- 212 164  73  85 216 240 240 240 240 240 240 240 240 240 240 240
- 149 155 127 147 156 150 225 228 232 235 232 234 240 227 229 234
- 189  86  98  83  84 116 156 240 240 240 240 240 240 240 240 235
- 240 240 219  51 186 238 240 240 240 240 240 240 240 240 240 240
- 240 240 219  73 211 228 240 240 240 240 240 240 240 240 240 233
-  98  76  58  50  47  66 182 240 240 240 240 240 240 240 240 240
- 220 201 179 184 184 205 212 240 240 240 240 240 240 240 240 234
- 141  85 109 106 109 115 225 240 240 240 240 240 240 240 240 240
- 154 108 101 110 170 151 180 240 240 240 240 240 240 240 240 235
- 206 121 128 148 200 238 240 240 240 240 240 240 240 240 240 240
- 178  95 107  17  92 236 240 240 240 240 240 240 240 240 240 236
- 235 232 237 151  30 225 240 240 240 240 240 240 240 240 240 240
- 230 137 125 150 240 240 240 240 240 240 240 240 240 240 240 238
- 152  51 155  45 120 240 240 240 240 240 240 240 240 240 240 240
-  77 118 240 217  50 180 240 240 240 240 240 240 240 240 240 240
- 175 153 163 186  53 226 240 240 240 240 240 240 240 240 240 240
- 209 155  72  85 216 240 240 240 240 240 240 240 240 240 239 233
-
diff --git a/branches/nyatla/Data/patt.kanji b/branches/nyatla/Data/patt.kanji
deleted file mode 100644 (file)
index 87d32bb..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
- 214 225 240 225 214 240 216 204 214 227 181 192 198 192 181 192
- 240 240 240 240 240 240 225 232 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240  75 128 220 240 240 240 240 240 240 240
- 240 240 240 240 240 240 106  53 240 240 240 240 240 240 240 237
- 240 240 240 240 240 238 118  31 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240  74  49 207 240 240 240 240 240 240 240
- 240 240 240 240 240 240  53  54 177 240 240 240 240 240 240 240
- 240 240 240 240 240 240  64  31 130 240 240 240 240 240 240 219
- 240 240 240 240 240 180  37  57  78 228 240 240 240 240 240 240
- 240 240 240 240 240 118  62 157  36 185 240 240 240 240 240 231
- 240 240 240 240 240  82  65 225  67  80 230 240 240 240 240 217
- 240 240 240 225  53  76 225 240 156  62 158 240 240 240 240 226
- 240 240 199  61   9 111 235 240 240 104  58 174 228 240 240 240
- 240 142  64  26  92 227 240 240 240 229  93  64 170 226 238 216
-  90  26  12 156 240 240 240 240 240 240 204  95  30 117 192 200
- 156  16 195 233 235 240 236 240 238 239 240 186  93  53 120 237
- 214 226 240 225 212 240 216 204 212 226 181 192 198 192 185 194
- 240 240 240 240 240 240 227 232 240 240 240 240 240 240 240 238
- 240 240 240 240 240 240  95 138 225 240 240 240 240 240 240 240
- 240 240 240 240 240 240 108  59 240 240 240 240 240 240 240 237
- 240 240 240 240 240 238 118  31 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240  83  47 207 240 240 240 240 240 240 240
- 240 240 240 240 240 240  56  49 177 240 240 240 240 240 240 240
- 240 240 240 240 240 240  73  41 130 240 240 240 240 240 240 222
- 240 240 240 240 240 185  46  49  86 230 240 240 240 240 240 240
- 240 240 240 240 240 118  58 165  45 192 240 240 240 240 240 234
- 240 240 240 240 240  91  63 222  74  82 240 240 240 240 240 222
- 240 240 240 226  66  86 225 240 158  63 162 240 240 240 240 228
- 240 240 202  76  11 103 235 240 234  91  49 174 228 240 240 240
- 240 142  68  16  91 226 240 240 240 228  96  74 178 233 239 222
-  90  26   4 150 240 240 240 240 240 240 213 109  46 133 204 213
- 156  14 195 234 236 240 237 240 239 240 240 192 106  57 125 238
- 214 226 240 225 212 240 216 204 214 227 181 192 198 192 184 192
- 240 240 240 240 240 240 226 232 240 240 240 240 240 240 240 236
- 240 240 240 240 240 240  85 134 220 240 240 240 240 240 240 240
- 240 240 240 240 240 240 107  58 240 240 240 240 240 240 240 237
- 240 240 240 240 240 238 118  32 240 240 240 240 240 240 240 234
- 240 240 240 240 240 240  87  60 210 240 240 240 240 240 240 240
- 240 240 240 240 240 240  58  58 178 240 240 240 240 240 240 240
- 240 240 240 240 240 240  73  31 130 240 240 240 240 240 240 219
- 240 240 240 240 240 185  46  59  86 228 240 240 240 240 240 240
- 240 240 240 240 240 118  62 168  41 186 240 240 240 240 240 231
- 240 240 240 240 240  90  65 225  60  92 235 240 240 240 240 219
- 240 240 240 225  53  82 225 240 146  63 163 240 240 240 240 228
- 240 240 198  61   5 103 235 240 234 102  58 175 232 240 240 240
- 240 134  54  13  91 226 240 240 240 229  96  68 188 238 239 222
-  90  15   3 150 240 240 240 240 240 240 213 105  48 134 204 213
- 156  14 195 233 236 240 237 240 239 239 240 192 106  57 125 238
-
- 192 236 240 237 234 240 240 219 240 231 217 226 240 216 200 237
- 181 240 240 240 240 240 240 240 240 240 240 240 240 238 192 120
- 192 240 240 240 240 240 240 240 240 240 240 240 240 226 117  53
- 198 240 240 240 240 240 240 240 240 240 240 240 228 170  30  93
- 192 240 240 240 240 240 240 240 240 240 240 240 174  64  95 186
- 181 240 240 240 240 240 240 240 240 240 230 158  58  93 204 240
- 227 240 240 240 240 240 240 240 228 185  80  62 104 229 240 239
- 214 240 220 240 240 207 177 130  78  36  67 156 240 240 240 238
- 204 232 128  53  31  49  54  31  57 157 225 240 240 240 240 240
- 216 225  75 106 118  74  53  64  37  62  65 225 235 240 240 236
- 240 240 240 240 238 240 240 240 180 118  82  76 111 227 240 240
- 214 240 240 240 240 240 240 240 240 240 240  53   9  92 240 235
- 225 240 240 240 240 240 240 240 240 240 240 225  61  26 156 233
- 240 240 240 240 240 240 240 240 240 240 240 240 199  64  12 195
- 225 240 240 240 240 240 240 240 240 240 240 240 240 142  26  16
- 214 240 240 240 240 240 240 240 240 240 240 240 240 240  90 156
- 194 238 240 237 234 240 240 222 240 234 222 228 240 222 213 238
- 185 240 240 240 240 240 240 240 240 240 240 240 240 239 204 125
- 192 240 240 240 240 240 240 240 240 240 240 240 240 233 133  57
- 198 240 240 240 240 240 240 240 240 240 240 240 228 178  46 106
- 192 240 240 240 240 240 240 240 240 240 240 240 174  74 109 192
- 181 240 240 240 240 240 240 240 240 240 240 162  49  96 213 240
- 226 240 240 240 240 240 240 240 230 192  82  63  91 228 240 240
- 212 240 225 240 240 207 177 130  86  45  74 158 234 240 240 239
- 204 232 138  59  31  47  49  41  49 165 222 240 240 240 240 240
- 216 227  95 108 118  83  56  73  46  58  63 225 235 240 240 237
- 240 240 240 240 238 240 240 240 185 118  91  86 103 226 240 240
- 212 240 240 240 240 240 240 240 240 240 240  66  11  91 240 236
- 225 240 240 240 240 240 240 240 240 240 240 226  76  16 150 234
- 240 240 240 240 240 240 240 240 240 240 240 240 202  68   4 195
- 226 240 240 240 240 240 240 240 240 240 240 240 240 142  26  14
- 214 240 240 240 240 240 240 240 240 240 240 240 240 240  90 156
- 192 236 240 237 234 240 240 219 240 231 219 228 240 222 213 238
- 184 240 240 240 240 240 240 240 240 240 240 240 240 239 204 125
- 192 240 240 240 240 240 240 240 240 240 240 240 240 238 134  57
- 198 240 240 240 240 240 240 240 240 240 240 240 232 188  48 106
- 192 240 240 240 240 240 240 240 240 240 240 240 175  68 105 192
- 181 240 240 240 240 240 240 240 240 240 235 163  58  96 213 240
- 227 240 240 240 240 240 240 240 228 186  92  63 102 229 240 239
- 214 240 220 240 240 210 178 130  86  41  60 146 234 240 240 239
- 204 232 134  58  32  60  58  31  59 168 225 240 240 240 240 240
- 216 226  85 107 118  87  58  73  46  62  65 225 235 240 240 237
- 240 240 240 240 238 240 240 240 185 118  90  82 103 226 240 240
- 212 240 240 240 240 240 240 240 240 240 240  53   5  91 240 236
- 225 240 240 240 240 240 240 240 240 240 240 225  61  13 150 233
- 240 240 240 240 240 240 240 240 240 240 240 240 198  54   3 195
- 226 240 240 240 240 240 240 240 240 240 240 240 240 134  15  14
- 214 240 240 240 240 240 240 240 240 240 240 240 240 240  90 156
-
- 237 120  53  93 186 240 239 238 240 236 240 235 233 195  16 156
- 200 192 117  30  95 204 240 240 240 240 240 240 156  12  26  90
- 216 238 226 170  64  93 229 240 240 240 227  92  26  64 142 240
- 240 240 240 228 174  58 104 240 240 235 111   9  61 199 240 240
- 226 240 240 240 240 158  62 156 240 225  76  53 225 240 240 240
- 217 240 240 240 240 230  80  67 225  65  82 240 240 240 240 240
- 231 240 240 240 240 240 185  36 157  62 118 240 240 240 240 240
- 240 240 240 240 240 240 228  78  57  37 180 240 240 240 240 240
- 219 240 240 240 240 240 240 130  31  64 240 240 240 240 240 240
- 240 240 240 240 240 240 240 177  54  53 240 240 240 240 240 240
- 240 240 240 240 240 240 240 207  49  74 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240  31 118 238 240 240 240 240 240
- 237 240 240 240 240 240 240 240  53 106 240 240 240 240 240 240
- 240 240 240 240 240 240 240 220 128  75 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 232 225 240 240 240 240 240 240
- 192 181 192 198 192 181 227 214 204 216 240 214 225 240 225 214
- 238 125  57 106 192 240 240 239 240 237 240 236 234 195  14 156
- 213 204 133  46 109 213 240 240 240 240 240 240 150   4  26  90
- 222 239 233 178  74  96 228 240 240 240 226  91  16  68 142 240
- 240 240 240 228 174  49  91 234 240 235 103  11  76 202 240 240
- 228 240 240 240 240 162  63 158 240 225  86  66 226 240 240 240
- 222 240 240 240 240 240  82  74 222  63  91 240 240 240 240 240
- 234 240 240 240 240 240 192  45 165  58 118 240 240 240 240 240
- 240 240 240 240 240 240 230  86  49  46 185 240 240 240 240 240
- 222 240 240 240 240 240 240 130  41  73 240 240 240 240 240 240
- 240 240 240 240 240 240 240 177  49  56 240 240 240 240 240 240
- 240 240 240 240 240 240 240 207  47  83 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240  31 118 238 240 240 240 240 240
- 237 240 240 240 240 240 240 240  59 108 240 240 240 240 240 240
- 240 240 240 240 240 240 240 225 138  95 240 240 240 240 240 240
- 238 240 240 240 240 240 240 240 232 227 240 240 240 240 240 240
- 194 185 192 198 192 181 226 212 204 216 240 212 225 240 226 214
- 238 125  57 106 192 240 239 239 240 237 240 236 233 195  14 156
- 213 204 134  48 105 213 240 240 240 240 240 240 150   3  15  90
- 222 239 238 188  68  96 229 240 240 240 226  91  13  54 134 240
- 240 240 240 232 175  58 102 234 240 235 103   5  61 198 240 240
- 228 240 240 240 240 163  63 146 240 225  82  53 225 240 240 240
- 219 240 240 240 240 235  92  60 225  65  90 240 240 240 240 240
- 231 240 240 240 240 240 186  41 168  62 118 240 240 240 240 240
- 240 240 240 240 240 240 228  86  59  46 185 240 240 240 240 240
- 219 240 240 240 240 240 240 130  31  73 240 240 240 240 240 240
- 240 240 240 240 240 240 240 178  58  58 240 240 240 240 240 240
- 240 240 240 240 240 240 240 210  60  87 240 240 240 240 240 240
- 234 240 240 240 240 240 240 240  32 118 238 240 240 240 240 240
- 237 240 240 240 240 240 240 240  58 107 240 240 240 240 240 240
- 240 240 240 240 240 240 240 220 134  85 240 240 240 240 240 240
- 236 240 240 240 240 240 240 240 232 226 240 240 240 240 240 240
- 192 184 192 198 192 181 227 214 204 216 240 212 225 240 226 214
-
- 156  90 240 240 240 240 240 240 240 240 240 240 240 240 240 214
-  16  26 142 240 240 240 240 240 240 240 240 240 240 240 240 225
- 195  12  64 199 240 240 240 240 240 240 240 240 240 240 240 240
- 233 156  26  61 225 240 240 240 240 240 240 240 240 240 240 225
- 235 240  92   9  53 240 240 240 240 240 240 240 240 240 240 214
- 240 240 227 111  76  82 118 180 240 240 240 238 240 240 240 240
- 236 240 240 235 225  65  62  37  64  53  74 118 106  75 225 216
- 240 240 240 240 240 225 157  57  31  54  49  31  53 128 232 204
- 238 240 240 240 156  67  36  78 130 177 207 240 240 220 240 214
- 239 240 229 104  62  80 185 228 240 240 240 240 240 240 240 227
- 240 204  93  58 158 230 240 240 240 240 240 240 240 240 240 181
- 186  95  64 174 240 240 240 240 240 240 240 240 240 240 240 192
-  93  30 170 228 240 240 240 240 240 240 240 240 240 240 240 198
-  53 117 226 240 240 240 240 240 240 240 240 240 240 240 240 192
- 120 192 238 240 240 240 240 240 240 240 240 240 240 240 240 181
- 237 200 216 240 226 217 231 240 219 240 240 234 237 240 236 192
- 156  90 240 240 240 240 240 240 240 240 240 240 240 240 240 214
-  14  26 142 240 240 240 240 240 240 240 240 240 240 240 240 226
- 195   4  68 202 240 240 240 240 240 240 240 240 240 240 240 240
- 234 150  16  76 226 240 240 240 240 240 240 240 240 240 240 225
- 236 240  91  11  66 240 240 240 240 240 240 240 240 240 240 212
- 240 240 226 103  86  91 118 185 240 240 240 238 240 240 240 240
- 237 240 240 235 225  63  58  46  73  56  83 118 108  95 227 216
- 240 240 240 240 240 222 165  49  41  49  47  31  59 138 232 204
- 239 240 240 234 158  74  45  86 130 177 207 240 240 225 240 212
- 240 240 228  91  63  82 192 230 240 240 240 240 240 240 240 226
- 240 213  96  49 162 240 240 240 240 240 240 240 240 240 240 181
- 192 109  74 174 240 240 240 240 240 240 240 240 240 240 240 192
- 106  46 178 228 240 240 240 240 240 240 240 240 240 240 240 198
-  57 133 233 240 240 240 240 240 240 240 240 240 240 240 240 192
- 125 204 239 240 240 240 240 240 240 240 240 240 240 240 240 185
- 238 213 222 240 228 222 234 240 222 240 240 234 237 240 238 194
- 156  90 240 240 240 240 240 240 240 240 240 240 240 240 240 214
-  14  15 134 240 240 240 240 240 240 240 240 240 240 240 240 226
- 195   3  54 198 240 240 240 240 240 240 240 240 240 240 240 240
- 233 150  13  61 225 240 240 240 240 240 240 240 240 240 240 225
- 236 240  91   5  53 240 240 240 240 240 240 240 240 240 240 212
- 240 240 226 103  82  90 118 185 240 240 240 238 240 240 240 240
- 237 240 240 235 225  65  62  46  73  58  87 118 107  85 226 216
- 240 240 240 240 240 225 168  59  31  58  60  32  58 134 232 204
- 239 240 240 234 146  60  41  86 130 178 210 240 240 220 240 214
- 239 240 229 102  63  92 186 228 240 240 240 240 240 240 240 227
- 240 213  96  58 163 235 240 240 240 240 240 240 240 240 240 181
- 192 105  68 175 240 240 240 240 240 240 240 240 240 240 240 192
- 106  48 188 232 240 240 240 240 240 240 240 240 240 240 240 198
-  57 134 238 240 240 240 240 240 240 240 240 240 240 240 240 192
- 125 204 239 240 240 240 240 240 240 240 240 240 240 240 240 184
- 238 213 222 240 228 219 231 240 219 240 240 234 237 240 236 192
-
diff --git a/branches/nyatla/Data/pattHiro.pdf b/branches/nyatla/Data/pattHiro.pdf
deleted file mode 100644 (file)
index dcaf4f5..0000000
Binary files a/branches/nyatla/Data/pattHiro.pdf and /dev/null differ
diff --git a/branches/nyatla/Data/pattKanji.pdf b/branches/nyatla/Data/pattKanji.pdf
deleted file mode 100644 (file)
index 550c721..0000000
Binary files a/branches/nyatla/Data/pattKanji.pdf and /dev/null differ
diff --git a/branches/nyatla/LICENCE.txt b/branches/nyatla/LICENCE.txt
deleted file mode 100644 (file)
index a3330c1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-ARToolkit Java class library NyARToolkit.\r
-Copyright (C)2008 R.Iizuka\r
-\r
-This program is free software; you can redistribute it and/or\r
-modify it under the terms of the GNU General Public License\r
-as published by the Free Software Foundation; either version 2\r
-of the License, or (at your option) any later version.\r
-\r
-This program is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-GNU General Public License for more details.\r
-\r
-You should have received a copy of the GNU General Public License\r
-along with this program; if not, write to the Free Software\r
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\r
-\r
\r
-\r
-Java版 ARToolkit クラスライブラリ NyARToolkit\r
-Copyright (C)2008  R.Iizuka\r
-\r
-このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェ\r
-ア財団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希\r
-望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布\r
-または改変することができます。\r
-\r
-このプログラムは有用であることを願って頒布されますが、*全くの無保証* \r
-です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含\r
-め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\r
-     \r
-あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部\r
-受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団ま\r
-で請求してください(宛先は the Free Software Foundation, Inc., 59\r
-Temple Place, Suite 330, Boston, MA 02111-1307 USA)。
\ No newline at end of file
diff --git a/branches/nyatla/bin/readme.txt b/branches/nyatla/bin/readme.txt
deleted file mode 100644 (file)
index 089f20d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-準備中です。ゴメンネ\r
-\r
-Not ready.
\ No newline at end of file
diff --git a/branches/nyatla/readme.ja.txt b/branches/nyatla/readme.ja.txt
deleted file mode 100644 (file)
index 8c369da..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-ARToolKit Java class library NyARToolkit.\r
-Copyright (C)2008 R.Iizuka\r
-\r
-version 2.0.0\r
-\r
-http://nyatla.jp/nyartoolkit/\r
-airmail(at)ebony.plala.or.jp\r
---------------------------------------------------\r
-\r
-\r
-\r
-\r
-・NyARToolkit/2.0\r
-\r
-NyARToolkitは、Pure Javaで実装したARToolKitクラスライブラリです。\r
-\r
-ARToolKit 2.72.1をベースに構築されています。\r
-\r
-NyARToolkit/1.xと比較し、構造的な最適化がされ、可読性が向上しています。\r
-\r
-\r
-\r
-J2SEでのみ動作を確認しました。\r
-J2MEやMIDP2.0にはそのうち対応します。\r
-\r
-\r
-ARToolkitは加藤博一先生とHuman Interface Technology Labにより\r
-開発されたAugmented Reality (AR) ライブラリです。\r
-詳しくはこちらをご覧下さい。\r
-http://www.hitl.washington.edu/artoolkit/\r
-\r
-\r
-・NyARToolkitの特徴\r
-\r
- -ARToolKitと同等な処理シーケンスを、クラスベースで再構築してあります。\r
-\r
-  -構造的な最適化がされており、ARToolKitと比較して可読性に優れています。\r
-\r
- -座標変換の演算性能が1.5倍ほど高速です。(JIT有効時)複数マーカー取り扱い時は、\r
-  オリジナルよりも良い成績が得られます。\r
-\r
- -取り扱える画像サイズに制限がありません。\r
-\r
- -取り扱えるマーカー個数の最大値が可変です。\r
-\r
-\r
-\r
-\r
-\r
-\r
-・構成\r
-\r
-+-----------------------------------------------+\r
-|                   Application                 |\r
-+-------+---------+--------+--------+-----------+\r
-|NyARJMF|CaptureQT| NyARJoglNyARJ3d |           |\r
-+-------+---------+--------+--------+           |\r
-|  JMF  |QuickTime|  JOGL  | Java3D |NyARToolkit|\r
-+-------+---------+--------+--------+           |\r
-|      Camera     |       3D        |           |\r
-------------------------------------+-----------+\r
-\r
-\r
-映像キャプチャにはJMF、又はQuickTimeを使用することが出来ます。\r
-\r
-3D描画にはJOGL又はJava3Dを使用することが出来ます。\r
-\r
-NyARJMF/CaptureQT/NyARJog/NyARJ3dは、下位のキャプチャモジュール\r
-や3Dライブラリを使いやすくするためのラッパークラス群です。\r
-\r
-これらとNyARToolkitは疎結合になっており、インタフェイスをあわせる\r
-ことで、自作モジュール等との差し替えが出来ます。\r
-\r
-\r
-\r
-\r
-・サンプルなど\r
-\r
-1.動作させる前に、JMFとJOGLかJava3Dをインストールしてください。\r
-  QuickTimeを使う場合には、QuickTime for Javaも必要です。\r
-\r
-\r
-動作確認したバージョンと入手先はこちらです。\r
-\r
-JMF JavaTM Media Framework 2.1.1e\r
-http://java.sun.com/products/java-media/jmf/index.jsp\r
-\r
-jogl-1.1.1-pre-20080328-xxxx-i586.zip\r
-https://jogl.dev.java.net/\r
-\r
-java3d-1_5_1-xxxx-i586.exe\r
-https://java3d.dev.java.net/binary-builds.html\r
-\r
-QuickTime 7.5\r
-http://www.apple.com/quicktime/qtjava/\r
-\r
-\r
-\r
-2.eclipseで空のワークスペースを作成し、sample,src,src.utils\r
-  ディレクトリをインポートしてください。\r
-\r
-srcにはNyARToolkit本体、src.utilsにはキャプチャや3Dライブラリとの\r
-インタフェイスクラス群、sampleにはこれらを組み合わせた動作する\r
-サンプルプログラムがあります。\r
-\r
-\r
-\r
-\r
-・プロジェクトの説明\r
-\r
-ライブラリ\r
-\r
-NyARToolkit\r
- NyARToolkitライブラリの本体です。依存する外部モジュールはありません。\r
-\r
-NyARToolkit.utils.jmf\r
- JMFからの画像をNyARToolkitに取り込むクラス群があります。\r
- 外部ライブラリは、JMFに依存します。\r
-\r
-NyARToolkit.utils.qt\r
- QuickTimeからの画像をNyARToolkitに取り込むクラス群があります。\r
- 外部ライブラリは、JMF、QuickTime for Javaに依存します。\r
-\r
-NyARToolkit.utils.jogl\r
- OpenGLとNyARToolkitのインタフェイスクラス群があります。\r
- 外部ライブラリは、JMF,JOGLに依存します。\r
-\r
-NyARToolkit.utils.java3d\r
- Java3DとNyARToolkitのインタフェイスクラス群があります。\r
- 外部ライブラリは、JMF,Java3Dに依存します。\r
-\r
-\r
-サンプル\r
-\r
-NyARToolkit.sample.jogl\r
- JOGL/JMFを使ったサンプルプログラムがあります。\r
-\r
-  -jp.nyatla.nyartoolkit.jogl.sample.JavaSimpleLite\r
-   単一のマーカーを認識するARToolkitのsimpleLite相当のサンプルです。\r
-  -jp.nyatla.nyartoolkit.jogl.sample.JavaSimpleLite2\r
-   複数のマーカーを認識するサンプルです。~100個程度のマーカーを同時に\r
-   認識します。\r
-\r
-\r
-NyARToolkit.sample.java3d\r
- JOGL/JMFを使ったサンプルプログラムです。\r
- \r
-  -jp.nyatla.nyartoolkit.java3d.sample\r
-  simpleLiteをJava3Dで動かすサンプルがあります。\r
-\r
-NyARToolkit.sample.jmf\r
-  JMFを使ったサンプルプログラムです。\r
-\r
-  -jp.nyatla..nyartoolkit.jmf.sample\r
- JMFでキャプチャした画像をNyARToolkitで処理するサンプルプログラムです。\r
- \r
-\r
-NyARToolkit.sample.qt\r
- Quicktime for Javaを使ったサンプルプログラムです。\r
-\r
- -jp.nyatla.nyartoolkit.qt.sample\r
- QuickTimeでキャプチャした画像をNyARToolkitで処理するサンプルプログラムです。\r
- \r
-\r
-\r
-\r
-\r
-・足りない機能等\r
-\r
-カメラキャリブレーション、マーカーのセーブ機能等が相変わらずありません。\r
-今後実装していきます。\r
-\r
-\r
-\r
-\r
-・ライセンス\r
-GPLv2以降です。詳しくはLICENCE.txtをみてください。\r
-ソースコード毎のライセンスは、各ソースファイルを参照してください。\r
-\r
-\r
-\r
-\r
-・謝辞\r
-\r
-arc@dmzさん\r
-http://digitalmuseum.jp/\r
-\r
-QuickTimeキャプチャモジュールを提供をして頂きました。有難うございます。
\ No newline at end of file
diff --git a/branches/nyatla/sample/java3d/.classpath b/branches/nyatla/sample/java3d/.classpath
deleted file mode 100644 (file)
index c862de1..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/j3dcore.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/j3dutils.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/vecmath.jar" kind="lib"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.java3d" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/sample/java3d/.project b/branches/nyatla/sample/java3d/.project
deleted file mode 100644 (file)
index 35755d8..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.sample.java3d</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/sample/java3d/jp/nyatla/nyartoolkit/java3d/sample/NyARJava3D.java b/branches/nyatla/sample/java3d/jp/nyatla/nyartoolkit/java3d/sample/NyARJava3D.java
deleted file mode 100644 (file)
index a1786c2..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Java3d sample program.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.java3d.sample;\r
-\r
-import java.awt.BorderLayout;\r
-import javax.media.j3d.*;\r
-\r
-import com.sun.j3d.utils.universe.*;\r
-import java.awt.*;\r
-import javax.swing.JFrame;\r
-import javax.vecmath.*;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.java3d.utils.*;\r
-\r
-import com.sun.j3d.utils.geometry.ColorCube;\r
-\r
-/**\r
- * Java3Dサンプルプログラム\r
- * 単一マーカー追跡用のBehaviorを使って、背景と1個のマーカーに連動した\r
- * TransformGroupを動かします。\r
- *\r
- */\r
-public class NyARJava3D extends JFrame implements NyARSingleMarkerBehaviorListener\r
-{\r
-       private final String CARCODE_FILE = "../../Data/patt.hiro";\r
-\r
-       private final String PARAM_FILE = "../../Data/camera_para.dat";\r
-\r
-       //NyARToolkit関係\r
-       private NyARSingleMarkerBehaviorHolder nya_behavior;\r
-\r
-       private J3dNyARParam ar_param;\r
-\r
-       //universe関係\r
-       private Canvas3D canvas;\r
-\r
-       private Locale locale;\r
-\r
-       private VirtualUniverse universe;\r
-\r
-       public static void main(String[] args)\r
-       {\r
-               try {\r
-                       NyARJava3D frame = new NyARJava3D();\r
-\r
-                       frame.setVisible(true);\r
-                       Insets ins = frame.getInsets();\r
-                       frame.setSize(320 + ins.left + ins.right, 240 + ins.top + ins.bottom);\r
-                       frame.startCapture();\r
-                       frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       public void onUpdate(boolean i_is_marker_exist, Transform3D i_transform3d)\r
-       {\r
-               /*\r
-                * TODO:Please write your behavior operation code here.\r
-                * マーカーの姿勢を元に他の3Dオブジェクトを操作するときは、ここに処理を書きます。*/\r
-\r
-       }\r
-\r
-       public void startCapture() throws Exception\r
-       {\r
-               nya_behavior.start();\r
-       }\r
-\r
-       public NyARJava3D() throws Exception\r
-       {\r
-               super("Java3D Example NyARToolkit");\r
-\r
-               //NyARToolkitの準備\r
-               NyARCode ar_code = new NyARCode(16, 16);\r
-               ar_code.loadARPattFromFile(CARCODE_FILE);\r
-               ar_param = new J3dNyARParam();\r
-               ar_param.loadARParamFromFile(PARAM_FILE);\r
-               ar_param.changeScreenSize(320, 240);\r
-\r
-               //localeの作成とlocateとviewの設定\r
-               universe = new VirtualUniverse();\r
-               locale = new Locale(universe);\r
-               canvas = new Canvas3D(SimpleUniverse.getPreferredConfiguration());\r
-               View view = new View();\r
-               ViewPlatform viewPlatform = new ViewPlatform();\r
-               view.attachViewPlatform(viewPlatform);\r
-               view.addCanvas3D(canvas);\r
-               view.setPhysicalBody(new PhysicalBody());\r
-               view.setPhysicalEnvironment(new PhysicalEnvironment());\r
-\r
-               //視界の設定(カメラ設定から取得)\r
-               Transform3D camera_3d = ar_param.getCameraTransform();\r
-               view.setCompatibilityModeEnable(true);\r
-               view.setProjectionPolicy(View.PERSPECTIVE_PROJECTION);\r
-               view.setLeftProjection(camera_3d);\r
-\r
-               //視点設定(0,0,0から、Y軸を180度回転してZ+方向を向くようにする。)\r
-               TransformGroup viewGroup = new TransformGroup();\r
-               Transform3D viewTransform = new Transform3D();\r
-               viewTransform.rotY(Math.PI);\r
-               viewTransform.setTranslation(new Vector3d(0.0, 0.0, 0.0));\r
-               viewGroup.setTransform(viewTransform);\r
-               viewGroup.addChild(viewPlatform);\r
-               BranchGroup viewRoot = new BranchGroup();\r
-               viewRoot.addChild(viewGroup);\r
-               locale.addBranchGraph(viewRoot);\r
-\r
-               //バックグラウンドの作成\r
-               Background background = new Background();\r
-               BoundingSphere bounds = new BoundingSphere();\r
-               bounds.setRadius(10.0);\r
-               background.setApplicationBounds(bounds);\r
-               background.setImageScaleMode(Background.SCALE_FIT_ALL);\r
-               background.setCapability(Background.ALLOW_IMAGE_WRITE);\r
-               BranchGroup root = new BranchGroup();\r
-               root.addChild(background);\r
-\r
-               //TransformGroupで囲ったシーングラフの作成\r
-               TransformGroup transform = new TransformGroup();\r
-               transform.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);\r
-               transform.addChild(createSceneGraph());\r
-               root.addChild(transform);\r
-\r
-               //NyARToolkitのBehaviorを作る。(マーカーサイズはメートルで指定すること)\r
-               nya_behavior = new NyARSingleMarkerBehaviorHolder(ar_param, 30f, ar_code, 0.08);\r
-               //Behaviorに連動するグループをセット\r
-               nya_behavior.setTransformGroup(transform);\r
-               nya_behavior.setBackGround(background);\r
-\r
-               //出来たbehaviorをセット\r
-               root.addChild(nya_behavior.getBehavior());\r
-               nya_behavior.setUpdateListener(this);\r
-\r
-               //表示ブランチをLocateにセット\r
-               locale.addBranchGraph(root);\r
-\r
-               //ウインドウの設定\r
-               setLayout(new BorderLayout());\r
-               add(canvas, BorderLayout.CENTER);\r
-       }\r
-\r
-       /**\r
-        * シーングラフを作って、そのノードを返す。\r
-        * このノードは40mmの色つき立方体を表示するシーン。z軸を基準に20mm上に浮かせてる。\r
-        * @return\r
-        */\r
-       private Node createSceneGraph()\r
-       {\r
-               TransformGroup tg = new TransformGroup();\r
-               Transform3D mt = new Transform3D();\r
-               mt.setTranslation(new Vector3d(0.00, 0.0, 20 * 0.001));\r
-               // 大きさ 40mmの色付き立方体を、Z軸上で20mm動かして配置)\r
-               tg.setTransform(mt);\r
-               tg.addChild(new ColorCube(20 * 0.001));\r
-               return tg;\r
-       }\r
-}\r
diff --git a/branches/nyatla/sample/jmf/.classpath b/branches/nyatla/sample/jmf/.classpath
deleted file mode 100644 (file)
index 6ba8b00..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/sample/jmf/.project b/branches/nyatla/sample/jmf/.project
deleted file mode 100644 (file)
index bdf574b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.sample.jmf</name>\r
-       <comment></comment>\r
-       <projects>\r
-               <project>NyARToolKit</project>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/NyarToolkitLinkTest.java b/branches/nyatla/sample/jmf/jp/nyatla/nyartoolkit/jmf/sample/NyarToolkitLinkTest.java
deleted file mode 100644 (file)
index 6a1984a..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/* 
- * PROJECT: NyARToolkit JMF sample program.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * airmail(at)ebony.plala.or.jp
- * http://nyatla.jp/nyartoolkit/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-package jp.nyatla.nyartoolkit.jmf.sample;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-
-import jp.nyatla.nyartoolkit.core.*;
-import jp.nyatla.nyartoolkit.core.param.NyARParam;
-import jp.nyatla.nyartoolkit.core.transmat.*;
-import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;
-
-/**
- * VFM+ARToolkitテストプログラム
- * カメラから取り込んだデータからマーカーを検出して、一致度と変換行列を表示します。
- */
-public class NyarToolkitLinkTest extends Frame implements JmfCaptureListener
-{
-       private final String CARCODE_FILE = "../../Data/patt.hiro";
-
-       private final String PARAM_FILE = "../../Data/camera_para.dat";
-
-       private JmfCameraCapture capture;
-
-       private NyARSingleDetectMarker nya;
-
-       private JmfNyARRaster_RGB raster;
-
-       private NyARTransMatResult trans_mat_result = new NyARTransMatResult();
-
-       public NyarToolkitLinkTest() throws NyARException, NyARException
-       {
-               setTitle("JmfCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               //キャプチャの準備
-               capture = new JmfCameraCapture(320, 240, 30f, JmfCameraCapture.PIXEL_FORMAT_RGB);
-               capture.setCaptureListener(this);
-
-               //NyARToolkitの準備
-               NyARParam ar_param = new NyARParam();
-               NyARCode ar_code = new NyARCode(16, 16);
-               ar_param.loadARParamFromFile(PARAM_FILE);
-               ar_param.changeScreenSize(320, 240);
-               nya = new NyARSingleDetectMarker(ar_param, ar_code, 80.0);
-               ar_code.loadARPattFromFile(CARCODE_FILE);
-               //キャプチャイメージ用のラスタを準備
-               raster = new JmfNyARRaster_RGB(320, 240);
-       }
-
-       public void onUpdateBuffer(Buffer i_buffer)
-       {
-               try {
-                       //キャプチャしたバッファをラスタにセット
-                       raster.setBuffer(i_buffer);
-
-                       //キャプチャしたイメージを表示用に加工
-                       BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-                       Image img = b2i.createImage(i_buffer);
-
-                       Graphics g = getGraphics();
-
-                       //マーカー検出
-                       boolean is_marker_exist = nya.detectMarkerLite(raster, 100);
-                       if (is_marker_exist) {
-                               //変換行列を取得
-                               nya.getTransmationMatrix(this.trans_mat_result);
-                       }
-                       //情報を画面に書く       
-                       g.drawImage(img, 32, 32, this);
-                       if (is_marker_exist) {
-                               g.drawString("マーカー検出:" + nya.getConfidence(), 32, 50);
-                               g.drawString("[m00]" +this.trans_mat_result.m00, 32, 50 + 16*1);
-                               g.drawString("[m01]" +this.trans_mat_result.m01, 32, 50 + 16*2);
-                               g.drawString("[m02]" +this.trans_mat_result.m02, 32, 50 + 16*3);
-                               g.drawString("[m03]" +this.trans_mat_result.m03, 32, 50 + 16*4);
-                               g.drawString("[m10]" +this.trans_mat_result.m10, 32, 50 + 16*5);
-                               g.drawString("[m11]" +this.trans_mat_result.m11, 32, 50 + 16*6);
-                               g.drawString("[m12]" +this.trans_mat_result.m12, 32, 50 + 16*7);
-                               g.drawString("[m13]" +this.trans_mat_result.m13, 32, 50 + 16*8);
-                               g.drawString("[m20]" +this.trans_mat_result.m20, 32, 50 + 16*9);
-                               g.drawString("[m21]" +this.trans_mat_result.m21, 32, 50 + 16*10);
-                               g.drawString("[m22]" +this.trans_mat_result.m22, 32, 50 + 16*11);
-                               g.drawString("[m23]" +this.trans_mat_result.m23, 32, 50 + 16*12);
-                       } else {
-                               g.drawString("マーカー未検出:", 32, 100);
-                       }
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-       private void startCapture()
-       {
-               try {
-                       capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       NyarToolkitLinkTest mainwin = new NyarToolkitLinkTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/branches/nyatla/sample/jogl/.classpath b/branches/nyatla/sample/jogl/.classpath
deleted file mode 100644 (file)
index f2d5180..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/jogl/lib/gluegen-rt.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/jogl/lib/jogl.jar" kind="lib"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.jogl" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/sample/jogl/.project b/branches/nyatla/sample/jogl/.project
deleted file mode 100644 (file)
index c36eee5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.sample.jogl</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
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
deleted file mode 100644 (file)
index 970c0ec..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL sample program.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.sample;\r
-\r
-import java.awt.event.WindowAdapter;\r
-import java.awt.event.WindowEvent;\r
-import java.awt.*;\r
-\r
-import javax.media.Buffer;\r
-\r
-import javax.media.opengl.GL;\r
-import javax.media.opengl.GLAutoDrawable;\r
-import javax.media.opengl.GLEventListener;\r
-import javax.media.opengl.GLCanvas;\r
-\r
-import com.sun.opengl.util.Animator;\r
-\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCameraCapture;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r
-import jp.nyatla.nyartoolkit.jogl.utils.*;\r
-/**\r
- * simpleLiteと同じようなテストプログラム\r
- * 出来る限りARToolKitのサンプルと似せて作ってあります。\r
- * 最も一致する"Hiro"マーカーを一つ選択して、その上に立方体を表示します。\r
- * \r
- */\r
-public class JavaSimpleLite implements GLEventListener, JmfCaptureListener\r
-{\r
-       private final String CARCODE_FILE = "../../Data/patt.hiro";\r
-\r
-       private final String PARAM_FILE = "../../Data/camera_para.dat";\r
-\r
-       private final static int SCREEN_X = 320;\r
-\r
-       private final static int SCREEN_Y = 240;\r
-\r
-       private Animator _animator;\r
-\r
-       private GLNyARRaster_RGB _cap_image;\r
-\r
-       private JmfCameraCapture _capture;\r
-\r
-       private GL _gl;\r
-\r
-       private NyARGLUtil _glnya;\r
-\r
-       //NyARToolkit関係\r
-       private GLNyARSingleDetectMarker _nya;\r
-\r
-       private GLNyARParam _ar_param;\r
-\r
-       /**\r
-        * 立方体を書く\r
-        *\r
-        */\r
-       void drawCube()\r
-       {\r
-               // Colour cube data.\r
-               int polyList = 0;\r
-               float fSize = 0.5f;//マーカーサイズに対して0.5倍なので、4cmの立方体\r
-               int f, i;\r
-               float[][] cube_vertices = new float[][] { { 1.0f, 1.0f, 1.0f }, { 1.0f, -1.0f, 1.0f }, { -1.0f, -1.0f, 1.0f }, { -1.0f, 1.0f, 1.0f }, { 1.0f, 1.0f, -1.0f }, { 1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f }, { -1.0f, 1.0f, -1.0f } };\r
-               float[][] cube_vertex_colors = new float[][] { { 1.0f, 1.0f, 1.0f }, { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f }, { 1.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } };\r
-               int cube_num_faces = 6;\r
-               short[][] cube_faces = new short[][] { { 3, 2, 1, 0 }, { 2, 3, 7, 6 }, { 0, 1, 5, 4 }, { 3, 0, 4, 7 }, { 1, 2, 6, 5 }, { 4, 5, 6, 7 } };\r
-\r
-               if (polyList == 0) {\r
-                       polyList = _gl.glGenLists(1);\r
-                       _gl.glNewList(polyList, GL.GL_COMPILE);\r
-                       _gl.glBegin(GL.GL_QUADS);\r
-                       for (f = 0; f < cube_num_faces; f++)\r
-                               for (i = 0; i < 4; i++) {\r
-                                       _gl.glColor3f(cube_vertex_colors[cube_faces[f][i]][0], cube_vertex_colors[cube_faces[f][i]][1], cube_vertex_colors[cube_faces[f][i]][2]);\r
-                                       _gl.glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);\r
-                               }\r
-                       _gl.glEnd();\r
-                       _gl.glColor3f(0.0f, 0.0f, 0.0f);\r
-                       for (f = 0; f < cube_num_faces; f++) {\r
-                               _gl.glBegin(GL.GL_LINE_LOOP);\r
-                               for (i = 0; i < 4; i++)\r
-                                       _gl.glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);\r
-                               _gl.glEnd();\r
-                       }\r
-                       _gl.glEndList();\r
-               }\r
-\r
-               _gl.glPushMatrix(); // Save world coordinate system.\r
-               _gl.glTranslatef(0.0f, 0.0f, 0.5f); // Place base of cube on marker surface.\r
-               _gl.glRotatef(0.0f, 0.0f, 0.0f, 1.0f); // Rotate about z axis.\r
-               _gl.glDisable(GL.GL_LIGHTING); // Just use colours.\r
-               _gl.glCallList(polyList); // Draw the cube.\r
-               _gl.glPopMatrix(); // Restore world coordinate system.\r
-\r
-       }\r
-\r
-       public JavaSimpleLite()\r
-       {\r
-               Frame frame = new Frame("Java simpleLite with NyARToolkit");\r
-\r
-               // 3Dを描画するコンポーネント\r
-               GLCanvas canvas = new GLCanvas();\r
-               frame.add(canvas);\r
-               canvas.addGLEventListener(this);\r
-               frame.addWindowListener(new WindowAdapter() {\r
-                       public void windowClosing(WindowEvent e)\r
-                       {\r
-                               System.exit(0);\r
-                       }\r
-               });\r
-\r
-               frame.setVisible(true);\r
-               Insets ins = frame.getInsets();\r
-               frame.setSize(SCREEN_X + ins.left + ins.right, SCREEN_Y + ins.top + ins.bottom);\r
-               canvas.setBounds(ins.left, ins.top, SCREEN_X, SCREEN_Y);\r
-       }\r
-\r
-       public void init(GLAutoDrawable drawable)\r
-       {\r
-               _gl = drawable.getGL();\r
-               _gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);\r
-               //NyARToolkitの準備\r
-               try {\r
-                       //キャプチャの準備\r
-                       _capture = new JmfCameraCapture(SCREEN_X, SCREEN_Y, 15f, JmfCameraCapture.PIXEL_FORMAT_RGB);\r
-                       _capture.setCaptureListener(this);\r
-                       //NyARToolkitの準備\r
-                       _ar_param = new GLNyARParam();\r
-                       NyARCode ar_code = new NyARCode(16, 16);\r
-                       _ar_param.loadARParamFromFile(PARAM_FILE);\r
-                       _ar_param.changeScreenSize(SCREEN_X, SCREEN_Y);\r
-                       _nya = new GLNyARSingleDetectMarker(_ar_param, ar_code, 80.0);\r
-                       _nya.setContinueMode(false);//ここをtrueにすると、transMatContinueモード(History計算)になります。\r
-                       ar_code.loadARPattFromFile(CARCODE_FILE);\r
-                       //NyARToolkit用の支援クラス\r
-                       _glnya = new NyARGLUtil(_gl);\r
-                       //GL対応のRGBラスタオブジェクト\r
-                       _cap_image = new GLNyARRaster_RGB(_ar_param);\r
-                       //キャプチャ開始\r
-                       _capture.start();\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-               _animator = new Animator(drawable);\r
-\r
-               _animator.start();\r
-\r
-       }\r
-\r
-       public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)\r
-       {\r
-               _gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);\r
-               _gl.glViewport(0, 0, width, height);\r
-\r
-               //視体積の設定\r
-               _gl.glMatrixMode(GL.GL_PROJECTION);\r
-               _gl.glLoadIdentity();\r
-               //見る位置\r
-               _gl.glMatrixMode(GL.GL_MODELVIEW);\r
-               _gl.glLoadIdentity();\r
-       }\r
-\r
-       public void display(GLAutoDrawable drawable)\r
-       {\r
-\r
-               try {\r
-                       if (!_cap_image.hasData()) {\r
-                               return;\r
-                       }\r
-                       _gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame.          \r
-                       //画像チェックしてマーカー探して、背景を書く\r
-                       boolean is_marker_exist;\r
-                       synchronized (_cap_image) {\r
-                               is_marker_exist = _nya.detectMarkerLite(_cap_image, 110);\r
-                               //背景を書く\r
-                               _glnya.drawBackGround(_cap_image, 1.0);\r
-                       }\r
-                       //あったら立方体を書く\r
-                       if (is_marker_exist) {\r
-                               //マーカーの一致度を調査するならば、ここでnya.getConfidence()で一致度を調べて下さい。\r
-                               // Projection transformation.\r
-                               _gl.glMatrixMode(GL.GL_PROJECTION);\r
-                               _gl.glLoadMatrixd(_ar_param.getCameraFrustumRH(), 0);\r
-                               _gl.glMatrixMode(GL.GL_MODELVIEW);\r
-                               // Viewing transformation.\r
-                               _gl.glLoadIdentity();\r
-                               _gl.glLoadMatrixd(_nya.getCameraViewRH(), 0);\r
-\r
-                               // All other lighting and geometry goes here.\r
-                               drawCube();\r
-                       }\r
-                       Thread.sleep(1);//タスク実行権限を一旦渡す\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-\r
-       }\r
-       public void onUpdateBuffer(Buffer i_buffer)\r
-       {\r
-               try {\r
-                       synchronized (_cap_image) {\r
-                               _cap_image.setBuffer(i_buffer, true);\r
-                       }\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged)\r
-       {\r
-       }\r
-\r
-       public static void main(String[] args)\r
-       {\r
-               new JavaSimpleLite();\r
-       }\r
-}\r
diff --git a/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite2.java b/branches/nyatla/sample/jogl/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite2.java
deleted file mode 100644 (file)
index 8748b45..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL sample program.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-\r
-package jp.nyatla.nyartoolkit.jogl.sample;\r
-\r
-import java.awt.event.WindowAdapter;\r
-import java.awt.event.WindowEvent;\r
-import java.awt.*;\r
-\r
-import javax.media.Buffer;\r
-\r
-import javax.media.opengl.GL;\r
-import javax.media.opengl.GLAutoDrawable;\r
-import javax.media.opengl.GLEventListener;\r
-import javax.media.opengl.GLCanvas;\r
-\r
-import com.sun.opengl.util.Animator;\r
-\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCameraCapture;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r
-import jp.nyatla.nyartoolkit.jogl.utils.*;\r
-/**\r
- * simpleLiteの複数マーカー同時認識バージョン\r
- * "Hiro"のマーカーと"人"のマーカーの混在環境で、Hiroのマーカー全てに\r
- * 立方体を表示します。\r
- */\r
-public class JavaSimpleLite2 implements GLEventListener, JmfCaptureListener\r
-{\r
-       private final String CARCODE_FILE1 = "../../Data/patt.hiro";\r
-\r
-       private final String CARCODE_FILE2 = "../../Data/patt.kanji";\r
-\r
-       private final String PARAM_FILE = "../../Data/camera_para.dat";\r
-\r
-       private final static int SCREEN_X = 640;\r
-\r
-       private final static int SCREEN_Y = 480;\r
-\r
-       private Animator _animator;\r
-\r
-       private GLNyARRaster_RGB _cap_image;\r
-\r
-       private JmfCameraCapture _capture;\r
-\r
-       private GL _gl;\r
-\r
-       private NyARGLUtil _glnya;\r
-\r
-       //NyARToolkit関係\r
-       private GLNyARDetectMarker _nya;\r
-\r
-       private GLNyARParam _ar_param;\r
-\r
-       /**\r
-        * 立方体を書く\r
-        *\r
-        */\r
-       void drawCube()\r
-       {\r
-               // Colour cube data.\r
-               int polyList = 0;\r
-               float fSize = 0.5f;//マーカーサイズに対して0.5倍なので、4cmの立方体\r
-               int f, i;\r
-               float[][] cube_vertices = new float[][] { { 1.0f, 1.0f, 1.0f }, { 1.0f, -1.0f, 1.0f }, { -1.0f, -1.0f, 1.0f }, { -1.0f, 1.0f, 1.0f }, { 1.0f, 1.0f, -1.0f }, { 1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f }, { -1.0f, 1.0f, -1.0f } };\r
-               float[][] cube_vertex_colors = new float[][] { { 1.0f, 1.0f, 1.0f }, { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f }, { 1.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } };\r
-               int cube_num_faces = 6;\r
-               short[][] cube_faces = new short[][] { { 3, 2, 1, 0 }, { 2, 3, 7, 6 }, { 0, 1, 5, 4 }, { 3, 0, 4, 7 }, { 1, 2, 6, 5 }, { 4, 5, 6, 7 } };\r
-\r
-               if (polyList == 0) {\r
-                       polyList = _gl.glGenLists(1);\r
-                       _gl.glNewList(polyList, GL.GL_COMPILE);\r
-                       _gl.glBegin(GL.GL_QUADS);\r
-                       for (f = 0; f < cube_num_faces; f++)\r
-                               for (i = 0; i < 4; i++) {\r
-                                       _gl.glColor3f(cube_vertex_colors[cube_faces[f][i]][0], cube_vertex_colors[cube_faces[f][i]][1], cube_vertex_colors[cube_faces[f][i]][2]);\r
-                                       _gl.glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);\r
-                               }\r
-                       _gl.glEnd();\r
-                       _gl.glColor3f(0.0f, 0.0f, 0.0f);\r
-                       for (f = 0; f < cube_num_faces; f++) {\r
-                               _gl.glBegin(GL.GL_LINE_LOOP);\r
-                               for (i = 0; i < 4; i++)\r
-                                       _gl.glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);\r
-                               _gl.glEnd();\r
-                       }\r
-                       _gl.glEndList();\r
-               }\r
-\r
-               _gl.glPushMatrix(); // Save world coordinate system.\r
-               _gl.glTranslatef(0.0f, 0.0f, 0.5f); // Place base of cube on marker surface.\r
-               _gl.glRotatef(0.0f, 0.0f, 0.0f, 1.0f); // Rotate about z axis.\r
-               _gl.glDisable(GL.GL_LIGHTING); // Just use colours.\r
-               _gl.glCallList(polyList); // Draw the cube.\r
-               _gl.glPopMatrix(); // Restore world coordinate system.\r
-\r
-       }\r
-\r
-       public JavaSimpleLite2()\r
-       {\r
-               Frame frame = new Frame("Java simpleLite with NyARToolkit");\r
-\r
-               // 3Dを描画するコンポーネント\r
-               GLCanvas canvas = new GLCanvas();\r
-               frame.add(canvas);\r
-               canvas.addGLEventListener(this);\r
-               frame.addWindowListener(new WindowAdapter() {\r
-                       public void windowClosing(WindowEvent e)\r
-                       {\r
-                               System.exit(0);\r
-                       }\r
-               });\r
-\r
-               frame.setVisible(true);\r
-               Insets ins = frame.getInsets();\r
-               frame.setSize(SCREEN_X + ins.left + ins.right, SCREEN_Y + ins.top + ins.bottom);\r
-               canvas.setBounds(ins.left, ins.top, SCREEN_X, SCREEN_Y);\r
-       }\r
-\r
-       public void init(GLAutoDrawable drawable)\r
-       {\r
-               _gl = drawable.getGL();\r
-               _gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);\r
-               //NyARToolkitの準備\r
-               try {\r
-                       //キャプチャの準備\r
-                       _capture = new JmfCameraCapture(SCREEN_X, SCREEN_Y, 15f, JmfCameraCapture.PIXEL_FORMAT_RGB);\r
-                       _capture.setCaptureListener(this);\r
-                       //NyARToolkitの準備\r
-                       _ar_param = new GLNyARParam();\r
-                       _ar_param.loadARParamFromFile(PARAM_FILE);\r
-                       _ar_param.changeScreenSize(SCREEN_X, SCREEN_Y);\r
-\r
-                       //ARコードを2個ロード\r
-                       double[] width = new double[] { 80.0, 80.0 };\r
-                       NyARCode[] ar_codes = new NyARCode[2];\r
-                       ar_codes[0] = new NyARCode(16, 16);\r
-                       ar_codes[0].loadARPattFromFile(CARCODE_FILE1);\r
-                       ar_codes[1] = new NyARCode(16, 16);\r
-                       ar_codes[1].loadARPattFromFile(CARCODE_FILE2);\r
-                       _nya = new GLNyARDetectMarker(_ar_param, ar_codes, width, 2);\r
-                       _nya.setContinueMode(false);//ここをtrueにすると、transMatContinueモード(History計算)になります。\r
-                       //NyARToolkit用の支援クラス\r
-                       _glnya = new NyARGLUtil(_gl);\r
-                       //GL対応のRGBラスタオブジェクト\r
-                       _cap_image = new GLNyARRaster_RGB(_ar_param);\r
-                       //キャプチャ開始\r
-                       _capture.start();\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-               _animator = new Animator(drawable);\r
-\r
-               _animator.start();\r
-\r
-       }\r
-\r
-       public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)\r
-       {\r
-               _gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);\r
-               _gl.glViewport(0, 0, width, height);\r
-\r
-               //視体積の設定\r
-               _gl.glMatrixMode(GL.GL_PROJECTION);\r
-               _gl.glLoadIdentity();\r
-               //見る位置\r
-               _gl.glMatrixMode(GL.GL_MODELVIEW);\r
-               _gl.glLoadIdentity();\r
-       }\r
-\r
-       public void display(GLAutoDrawable drawable)\r
-       {\r
-\r
-               try {\r
-                       if (!_cap_image.hasData()) {\r
-                               return;\r
-                       }\r
-                       _gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame.          \r
-                       //画像チェックしてマーカー探して、背景を書く\r
-                       int found_markers;\r
-                       synchronized (_cap_image) {\r
-                               found_markers = _nya.detectMarkerLite(_cap_image, 110);\r
-                               //背景を書く\r
-                               _glnya.drawBackGround(_cap_image, 1.0);\r
-                       }\r
-                       //あったら立方体を書く\r
-                       double[] matrix = new double[16];\r
-                       for (int i = 0; i < found_markers; i++) {\r
-                               //1番のマーカーでなければ表示しない。\r
-                               if (_nya.getARCodeIndex(i) != 0) {\r
-                                       continue;\r
-                               }\r
-                               //マーカーの一致度を調査するならば、ここでnya.getConfidence()で一致度を調べて下さい。\r
-                               // Projection transformation.\r
-                               _gl.glMatrixMode(GL.GL_PROJECTION);\r
-                               _gl.glLoadMatrixd(_ar_param.getCameraFrustumRH(), 0);\r
-                               _gl.glMatrixMode(GL.GL_MODELVIEW);\r
-                               // Viewing transformation.\r
-                               _gl.glLoadIdentity();\r
-                               _nya.getCameraViewRH(i, matrix);\r
-                               _gl.glLoadMatrixd(matrix, 0);\r
-\r
-                               // All other lighting and geometry goes here.\r
-                               drawCube();\r
-                       }\r
-                       Thread.sleep(1);//タスク実行権限を一旦渡す            \r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       public void onUpdateBuffer(Buffer i_buffer)\r
-       {\r
-               try {\r
-                       synchronized (_cap_image) {\r
-                               _cap_image.setBuffer(i_buffer, true);\r
-                       }\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged)\r
-       {\r
-       }\r
-\r
-       public static void main(String[] args)\r
-       {\r
-               new JavaSimpleLite2();\r
-       }\r
-}\r
diff --git a/branches/nyatla/sample/qt/.classpath b/branches/nyatla/sample/qt/.classpath
deleted file mode 100644 (file)
index 2808887..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/QuickTime/QTSystem/QTJava.zip" kind="lib"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.qt" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="bin" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/sample/qt/.project b/branches/nyatla/sample/qt/.project
deleted file mode 100644 (file)
index d30a0bd..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.sample.qt</name>\r
-       <comment></comment>\r
-       <projects>\r
-               <project>NyARToolKit</project>\r
-               <project>NyARToolkit.utils.qt</project>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/NyarToolkitLinkTest.java b/branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/NyarToolkitLinkTest.java
deleted file mode 100644 (file)
index 79489c5..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/* 
- * PROJECT: NyARToolkit QuickTime sample program.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * airmail(at)ebony.plala.or.jp
- * http://nyatla.jp/nyartoolkit/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-
-
-package jp.nyatla.nyartoolkit.qt.sample;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.qt.utils.*;
-import java.awt.*;
-import jp.nyatla.nyartoolkit.core.*;
-import jp.nyatla.nyartoolkit.core.param.NyARParam;
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;
-import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;
-/**
- * VFM+ARToolkitテストプログラム
- * カメラから取り込んだデータからマーカーを検出して、一致度と変換行列を表示します。
- */
-public class NyarToolkitLinkTest extends Frame implements QtCaptureListener
-{
-       private final String CARCODE_FILE = "../../Data/patt.hiro";
-
-       private final String PARAM_FILE = "../../Data/camera_para.dat";
-
-       private QtCameraCapture capture;
-
-       private NyARSingleDetectMarker nya;
-
-       private QtNyARRaster_RGB raster;
-
-       private NyARTransMatResult trans_mat_result = new NyARTransMatResult();
-
-       public NyarToolkitLinkTest() throws NyARException, NyARException
-       {
-               setTitle("QtCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               //キャプチャの準備
-               capture = new QtCameraCapture(320, 240, 30f);
-               capture.setCaptureListener(this);
-
-               //NyARToolkitの準備
-               NyARParam ar_param = new NyARParam();
-               NyARCode ar_code = new NyARCode(16, 16);
-               ar_param.loadARParamFromFile(PARAM_FILE);
-               ar_param.changeScreenSize(320, 240);
-               nya = new NyARSingleDetectMarker(ar_param, ar_code, 80.0);
-               ar_code.loadARPattFromFile(CARCODE_FILE);
-               //キャプチャイメージ用のラスタを準備
-               raster = new QtNyARRaster_RGB(320, 240);
-       }
-
-       public void onUpdateBuffer(byte[] pixels)
-       {
-               try {
-                       //キャプチャしたバッファをラスタにセット
-                       raster.setBuffer(pixels);
-
-                       //キャプチャしたイメージを表示用に加工
-                       Image img = raster.createImage();
-
-                       Graphics g = getGraphics();
-
-                       //マーカー検出
-                       boolean is_marker_exist = nya.detectMarkerLite(raster, 100);
-                       if (is_marker_exist) {
-                               //変換行列を取得
-                               nya.getTransmationMatrix(this.trans_mat_result);
-                       }
-                       //情報を画面に書く       
-                       g.drawImage(img, 32, 32, this);
-                       if (is_marker_exist) {
-                               g.drawString("マーカー検出:" + nya.getConfidence(), 32, 50);
-                               g.drawString("[m00]" + this.trans_mat_result.m00, 32, 50 + 16 * 1);
-                               g.drawString("[m01]" + this.trans_mat_result.m01, 32, 50 + 16 * 2);
-                               g.drawString("[m02]" + this.trans_mat_result.m02, 32, 50 + 16 * 3);
-                               g.drawString("[m03]" + this.trans_mat_result.m03, 32, 50 + 16 * 4);
-                               g.drawString("[m10]" + this.trans_mat_result.m10, 32, 50 + 16 * 5);
-                               g.drawString("[m11]" + this.trans_mat_result.m11, 32, 50 + 16 * 6);
-                               g.drawString("[m12]" + this.trans_mat_result.m12, 32, 50 + 16 * 7);
-                               g.drawString("[m13]" + this.trans_mat_result.m13, 32, 50 + 16 * 8);
-                               g.drawString("[m20]" + this.trans_mat_result.m20, 32, 50 + 16 * 9);
-                               g.drawString("[m21]" + this.trans_mat_result.m21, 32, 50 + 16 * 10);
-                               g.drawString("[m22]" + this.trans_mat_result.m22, 32, 50 + 16 * 11);
-                               g.drawString("[m23]" + this.trans_mat_result.m23, 32, 50 + 16 * 12);
-
-                       } else {
-                               g.drawString("マーカー未検出:", 32, 100);
-                       }
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-       private void startCapture()
-       {
-               try {
-                       capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       NyarToolkitLinkTest mainwin = new NyarToolkitLinkTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/QtCaptureTest.java b/branches/nyatla/sample/qt/jp/nyatla/nyartoolkit/qt/sample/QtCaptureTest.java
deleted file mode 100644 (file)
index 4631c23..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * PROJECT: NyARToolkit QuickTime sample program.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * airmail(at)ebony.plala.or.jp
- * http://nyatla.jp/nyartoolkit/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-package jp.nyatla.nyartoolkit.qt.sample;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.qt.utils.*;
-
-import java.awt.*;
-/**
- * QuickTimeキャプチャプログラム
- *
- */
-public class QtCaptureTest extends Frame implements QtCaptureListener
-{
-       public QtCaptureTest() throws NyARException
-       {
-               setTitle("QtCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               capture = new QtCameraCapture(320, 240, 30f);
-               capture.setCaptureListener(this);
-               //キャプチャイメージ用のラスタを準備
-               raster = new QtNyARRaster_RGB(320, 240);
-       }
-
-       private QtCameraCapture capture;
-
-       private QtNyARRaster_RGB raster;
-
-       public void onUpdateBuffer(byte[] pixels)
-       {
-               raster.setBuffer(pixels);
-               Image img = raster.createImage();
-               Graphics g = getGraphics();
-               g.drawImage(img, 32, 32, this);
-       }
-
-       private void startCapture()
-       {
-               try {
-                       capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       QtCaptureTest mainwin = new QtCaptureTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/branches/nyatla/src.utils/java3d/.classpath b/branches/nyatla/src.utils/java3d/.classpath
deleted file mode 100644 (file)
index d15273a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/j3dcore.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/j3dutils.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/Java3D/1.5.1/lib/ext/vecmath.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/src.utils/java3d/.project b/branches/nyatla/src.utils/java3d/.project
deleted file mode 100644 (file)
index 2bb7bf7..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.utils.java3d</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java b/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java
deleted file mode 100644 (file)
index 266634d..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Java3D utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.java3d.utils;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-\r
-import javax.media.j3d.Transform3D;\r
-/**\r
- * NyARParamにJava3D向け関数を追加したもの\r
- */\r
-public class J3dNyARParam extends NyARParam\r
-{\r
-       private double view_distance_min = 0.01;//1cm~10.0m\r
-\r
-       private double view_distance_max = 10.0;\r
-\r
-       private Transform3D m_projection = null;\r
-\r
-       /**\r
-        * 視体積の近い方をメートルで指定\r
-        * @param i_new_value\r
-        */\r
-       public void setViewDistanceMin(double i_new_value)\r
-       {\r
-               m_projection = null;//キャッシュ済変数初期化\r
-               view_distance_min = i_new_value;\r
-       }\r
-\r
-       /**\r
-        * 視体積の遠い方をメートルで指定\r
-        * @param i_new_value\r
-        */\r
-       public void setViewDistanceMax(double i_new_value)\r
-       {\r
-               m_projection = null;//キャッシュ済変数初期化\r
-               view_distance_max = i_new_value;\r
-       }\r
-\r
-       /**\r
-        * void arglCameraFrustumRH(const ARParam *cparam, const double focalmin, const double focalmax, GLdouble m_projection[16])\r
-        * 関数の置き換え\r
-        * @param focalmin\r
-        * @param focalmax\r
-        * @return\r
-        */\r
-       public Transform3D getCameraTransform()\r
-       {\r
-               //既に値がキャッシュされていたらそれを使う\r
-               if (m_projection != null) {\r
-                       return m_projection;\r
-               }\r
-               //無ければ計算\r
-\r
-               NyARMat trans_mat = new NyARMat(3, 4);\r
-               NyARMat icpara_mat = new NyARMat(3, 4);\r
-               double[][] p = new double[3][3], q = new double[4][4];\r
-               double width, height;\r
-               int i, j;\r
-\r
-               width = this._screen_size.w;\r
-               height = this._screen_size.h;\r
-\r
-               this.getPerspectiveProjectionMatrix().decompMat(icpara_mat, trans_mat);\r
-\r
-               double[][] icpara = icpara_mat.getArray();\r
-               double[][] trans = trans_mat.getArray();\r
-               for (i = 0; i < 4; i++) {\r
-                       icpara[1][i] = (height - 1) * (icpara[2][i]) - icpara[1][i];\r
-               }\r
-\r
-               for (i = 0; i < 3; i++) {\r
-                       for (j = 0; j < 3; j++) {\r
-                               p[i][j] = icpara[i][j] / icpara[2][2];\r
-                       }\r
-               }\r
-               //p[0][0],p[1][1]=n\r
-               //p[0][2],p[1][2]=t+b\r
-\r
-               //Projectionの計算\r
-               q[0][0] = (2.0 * p[0][0] / (width - 1));\r
-               q[0][1] = (2.0 * p[0][1] / (width - 1));\r
-               q[0][2] = -((2.0 * p[0][2] / (width - 1)) - 1.0);\r
-               q[0][3] = 0.0;\r
-\r
-               q[1][0] = 0.0;\r
-               q[1][1] = -(2.0 * p[1][1] / (height - 1));\r
-               q[1][2] = -((2.0 * p[1][2] / (height - 1)) - 1.0);\r
-               q[1][3] = 0.0;\r
-\r
-               q[2][0] = 0.0;\r
-               q[2][1] = 0.0;\r
-               q[2][2] = (view_distance_max + view_distance_min) / (view_distance_min - view_distance_max);\r
-               q[2][3] = 2.0 * view_distance_max * view_distance_min / (view_distance_min - view_distance_max);\r
-\r
-               q[3][0] = 0.0;\r
-               q[3][1] = 0.0;\r
-               q[3][2] = -1.0;\r
-               q[3][3] = 0.0;\r
-\r
-               q[2][2] = q[2][2] * -1;\r
-               q[2][3] = q[2][3] * -1;\r
-\r
-               double[] tmp_projection = new double[16];\r
-               for (i = 0; i < 4; i++) { // Row.\r
-                       // First 3 columns of the current row.\r
-                       for (j = 0; j < 3; j++) { // Column.\r
-                               tmp_projection[i + j * 4] = (q[i][0] * trans[0][j] + q[i][1] * trans[1][j] + q[i][2] * trans[2][j]);\r
-                       }\r
-                       // Fourth column of the current row.\r
-                       tmp_projection[i + 3 * 4] = q[i][0] * trans[0][3] + q[i][1] * trans[1][3] + q[i][2] * trans[2][3] + q[i][3];\r
-               }\r
-               m_projection = new Transform3D(tmp_projection);\r
-               m_projection.transpose();\r
-               return m_projection;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java b/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
deleted file mode 100644 (file)
index c793898..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Java3D utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.java3d.utils;\r
-\r
-import java.awt.image.*;\r
-\r
-import javax.media.format.RGBFormat;\r
-import javax.media.j3d.ImageComponent;\r
-import javax.media.j3d.ImageComponent2D;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.jmf.utils.*;\r
-\r
-/**\r
- * \r
- * このクラスは、Java3Dと互換性のあるNyARToolkitのラスタイメージを保持します。\r
- *\r
- */\r
-public class J3dNyARRaster_RGB extends JmfNyARRaster_RGB\r
-{\r
-       private ImageComponent2D imc2d;\r
-\r
-       private byte[] i2d_buf;\r
-\r
-       private BufferedImage bufferd_image;\r
-\r
-       /**\r
-        * JMFのキャプチャ画像をこのクラスのBufferedImageにコピーします。\r
-        * @param i_buffer\r
-        * 画像の格納されたバッファを指定して下さい。\r
-        * 画像サイズはコンストラクタで与えたパラメタと同じサイズである必要があります。\r
-        */\r
-       public void setBuffer(javax.media.Buffer i_buffer) throws NyARException\r
-       {\r
-               //メモ:この時点では、ref_dataにはi_bufferの参照値が入ってる。\r
-               synchronized (this) {\r
-                       //キャプチャデータをi2dのバッファにコピーする。(これ省略したいなあ…。)\r
-                       System.arraycopy((byte[]) i_buffer.getData(), 0, this.i2d_buf, 0, this.i2d_buf.length);\r
-               }\r
-               int buffer_type = analyzeBufferType((RGBFormat) i_buffer.getFormat());\r
-               this._ref_buf = this.i2d_buf;\r
-               this._reader.changeBuffer(buffer_type, this._ref_buf);\r
-       }\r
-\r
-       public J3dNyARRaster_RGB(NyARParam i_cparam)\r
-       {\r
-               super(i_cparam.getScreenSize());\r
-\r
-               //RGBのラスタを作る。\r
-               this.bufferd_image = new BufferedImage(this._size.w, this._size.h, BufferedImage.TYPE_3BYTE_BGR);\r
-               i2d_buf = ((DataBufferByte) bufferd_image.getRaster().getDataBuffer()).getData();\r
-               this.imc2d = new ImageComponent2D(ImageComponent2D.FORMAT_RGB, this.bufferd_image, true, true);\r
-               imc2d.setCapability(ImageComponent.ALLOW_IMAGE_WRITE);\r
-       }\r
-\r
-       /**\r
-        * 自身の格納しているImageComponent2Dオブジェクトを作り直します。\r
-        * Java3D1.5がDirectXで動いた(らしいとき)に、ImageComponent2Dのインスタンス\r
-        * IDが異ならないと、Behavior内でイメージの更新を通知できない事象に対応するために実装してあります。\r
-        * Behavior内でgetImageComponent2()関数を実行する直前に呼び出すことで、この事象を回避することができます。\r
-        * \r
-        */\r
-       public void renewImageComponent2D()\r
-       {\r
-               this.imc2d = new ImageComponent2D(ImageComponent2D.FORMAT_RGB, this.bufferd_image, true, true);\r
-               this.imc2d.setCapability(ImageComponent.ALLOW_IMAGE_WRITE);\r
-       }\r
-\r
-       public ImageComponent2D getImageComponent2D()\r
-       {\r
-               return this.imc2d;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java b/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java
deleted file mode 100644 (file)
index fb76546..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Java3D utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.java3d.utils;\r
-\r
-import java.util.Enumeration;\r
-\r
-import javax.media.Buffer;\r
-import javax.media.j3d.*;\r
-import javax.vecmath.*;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCameraCapture;\r
-import jp.nyatla.nyartoolkit.jmf.utils.JmfCaptureListener;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;\r
-import jp.nyatla.nyartoolkit.detector.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * NyARToolkitと連動したBehaviorを返却するクラスです。\r
- * 提供できるBehaviorは、BackgroundとTransformgroupです。\r
- *\r
- */\r
-public class NyARSingleMarkerBehaviorHolder implements JmfCaptureListener\r
-{\r
-       private NyARParam cparam;\r
-\r
-       private JmfCameraCapture capture;\r
-\r
-       private J3dNyARRaster_RGB nya_raster;//最大3スレッドで共有されるので、排他制御かけること。\r
-\r
-       private NyARSingleDetectMarker nya;\r
-\r
-       //Behaviorホルダ\r
-       private NyARBehavior nya_behavior;\r
-\r
-       public NyARSingleMarkerBehaviorHolder(NyARParam i_cparam, float i_rate, NyARCode i_ar_code, double i_marker_width) throws NyARException\r
-       {\r
-               nya_behavior = null;\r
-               final NyARIntSize scr_size = i_cparam.getScreenSize();\r
-               cparam = i_cparam;\r
-               capture = new JmfCameraCapture(scr_size.w, scr_size.h, i_rate, JmfCameraCapture.PIXEL_FORMAT_RGB);\r
-               capture.setCaptureListener(this);\r
-               nya_raster = new J3dNyARRaster_RGB(cparam);\r
-               nya = new NyARSingleDetectMarker(cparam, i_ar_code, i_marker_width);\r
-               nya_behavior = new NyARBehavior(nya, nya_raster, i_rate);\r
-       }\r
-\r
-       public Behavior getBehavior()\r
-       {\r
-               return nya_behavior;\r
-       }\r
-\r
-       /**\r
-        * i_back_groundにキャプチャ画像を転送するようにBehaviorを設定します。\r
-        * i_back_groungはALLOW_IMAGE_WRITE属性を持つものである必要があります。\r
-        * @param i_back_groung\r
-        * @return\r
-        */\r
-       public void setBackGround(Background i_back_ground)\r
-       {\r
-               //コール先で排他制御\r
-               nya_behavior.setRelatedBackGround(i_back_ground);\r
-       }\r
-\r
-       /**\r
-        * i_trgroupの座標系をマーカーにあわせるようにBehaviorを設定します。\r
-        *\r
-        */\r
-       public void setTransformGroup(TransformGroup i_trgroup)\r
-       {\r
-               //コール先で排他制御\r
-               nya_behavior.setRelatedTransformGroup(i_trgroup);\r
-       }\r
-\r
-       /**\r
-        * 座標系再計算後に呼び出されるリスナです。\r
-        * @param i_listener\r
-        */\r
-       public void setUpdateListener(NyARSingleMarkerBehaviorListener i_listener)\r
-       {\r
-               //コール先で排他制御\r
-               nya_behavior.setUpdateListener(i_listener);\r
-       }\r
-\r
-       /**\r
-        * ラスタを更新 コールバック関数だから呼んじゃらめえ\r
-        */\r
-       public void onUpdateBuffer(Buffer i_buffer)\r
-       {\r
-               try {\r
-                       synchronized (nya_raster) {\r
-                               nya_raster.setBuffer(i_buffer);\r
-                       }\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       public void start() throws NyARException\r
-       {\r
-               //開始\r
-               capture.start();\r
-       }\r
-\r
-       public void stop()\r
-       {\r
-               capture.stop();\r
-       }\r
-}\r
-\r
-class NyARBehavior extends Behavior\r
-{\r
-       private NyARTransMatResult trans_mat_result = new NyARTransMatResult();\r
-\r
-       private NyARSingleDetectMarker related_nya;\r
-\r
-       private TransformGroup trgroup;\r
-\r
-       private Background back_ground;\r
-\r
-       private J3dNyARRaster_RGB raster;\r
-\r
-       private WakeupCondition wakeup;\r
-\r
-       private NyARSingleMarkerBehaviorListener listener;\r
-\r
-       public void initialize()\r
-       {\r
-               wakeupOn(wakeup);\r
-       }\r
-\r
-       /**\r
-        * i_related_ic2dの内容で定期的にi_back_groundを更新するBehavior\r
-        * @param i_back_ground\r
-        * @param i_related_ic2d\r
-        */\r
-       public NyARBehavior(NyARSingleDetectMarker i_related_nya, J3dNyARRaster_RGB i_related_raster, float i_rate)\r
-       {\r
-               super();\r
-               wakeup = new WakeupOnElapsedTime((int) (1000 / i_rate));\r
-               related_nya = i_related_nya;\r
-               trgroup = null;\r
-               raster = i_related_raster;\r
-               back_ground = null;\r
-               listener = null;\r
-               this.setSchedulingBounds(new BoundingSphere(new Point3d(), 100.0));\r
-       }\r
-\r
-       public void setRelatedBackGround(Background i_back_ground)\r
-       {\r
-               synchronized (raster) {\r
-                       back_ground = i_back_ground;\r
-               }\r
-       }\r
-\r
-       public void setRelatedTransformGroup(TransformGroup i_trgroup)\r
-       {\r
-               synchronized (raster) {\r
-                       trgroup = i_trgroup;\r
-               }\r
-       }\r
-\r
-       public void setUpdateListener(NyARSingleMarkerBehaviorListener i_listener)\r
-       {\r
-               synchronized (raster) {\r
-                       listener = i_listener;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * いわゆるイベントハンドラ\r
-        */\r
-       public void processStimulus(Enumeration criteria)\r
-       {\r
-               try {\r
-                       synchronized (raster) {\r
-                               Transform3D t3d = null;\r
-                               boolean is_marker_exist = false;\r
-                               if (back_ground != null) {\r
-                                       raster.renewImageComponent2D();/*DirectXモードのときの対策*/\r
-                                       back_ground.setImage(raster.getImageComponent2D());\r
-                               }\r
-                               if (raster.hasData()) {\r
-                                       is_marker_exist = related_nya.detectMarkerLite(raster, 100);\r
-                                       if (is_marker_exist)\r
-                                       {\r
-                                               final NyARTransMatResult src = this.trans_mat_result;\r
-                                               related_nya.getTransmationMatrix(src);\r
-                                               Matrix4d matrix = new Matrix4d(src.m00, -src.m10, -src.m20, 0, -src.m01, src.m11, src.m21, 0, -src.m02, src.m12, src.m22, 0, -src.m03, src.m13, src.m23, 1);\r
-                                               matrix.transpose();\r
-                                               t3d = new Transform3D(matrix);\r
-                                               if (trgroup != null) {\r
-                                                       trgroup.setTransform(t3d);\r
-                                               }\r
-                                       }\r
-                               }\r
-                               if (listener != null) {\r
-                                       listener.onUpdate(is_marker_exist, t3d);\r
-                               }\r
-                       }\r
-                       wakeupOn(wakeup);\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java b/branches/nyatla/src.utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java
deleted file mode 100644 (file)
index 14654cc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Java3D utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.java3d.utils;\r
-\r
-import javax.media.j3d.*;\r
-/**\r
- * \r
- * NyARToolkitのBehaviorのリスナ\r
- *\r
- */\r
-public interface NyARSingleMarkerBehaviorListener\r
-{\r
-    /**\r
-     * このリスナは、リスナにマーカーに連動してオブジェクトを操作するチャンスを与えます。\r
-     * リスナはNyARSingleMarkerBehavior関数内のprocessStimulus関数から呼び出されます。\r
-     * \r
-     * @param i_is_marker_exist\r
-     * マーカーが存在する場合true、存在しない場合、falseです。\r
-     * @param i_transform3d\r
-     * マーカーが存在する場合、その変換行列が指定されます。\r
-     * i_is_marker_existがtrueの時だけ有効です。\r
-     */\r
-    public void onUpdate(boolean i_is_marker_exist,Transform3D i_transform3d);\r
-}\r
diff --git a/branches/nyatla/src.utils/jmf/.classpath b/branches/nyatla/src.utils/jmf/.classpath
deleted file mode 100644 (file)
index 68860c8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/src.utils/jmf/.project b/branches/nyatla/src.utils/jmf/.project
deleted file mode 100644 (file)
index 12236e7..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.utils.jmf</name>\r
-       <comment></comment>\r
-       <projects>\r
-               <project>NyARToolKit</project>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCameraCapture.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCameraCapture.java
deleted file mode 100644 (file)
index 8f41946..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JMF utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jmf.utils;\r
-\r
-import javax.media.*;\r
-import javax.media.protocol.*;\r
-import javax.media.control.*;\r
-import javax.media.format.*;\r
-import java.awt.*;\r
-import java.util.*;\r
-import javax.media.protocol.DataSource;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-/**\r
- * 簡易JMFキャプチャクラス\r
- * @author atla\r
- *\r
- */\r
-public class JmfCameraCapture\r
-{\r
-       private Dimension image_size;\r
-\r
-       private JmfCaptureListener capture_listener;\r
-\r
-       // private DataSource jmf_data_source;\r
-       private MonitorStream jmf_monitor_stream;\r
-\r
-       private Processor jmf_processor;\r
-\r
-       private VideoFormat jmf_video_format;\r
-\r
-       private Buffer read_buf = new Buffer();\r
-\r
-       public static final String PIXEL_FORMAT_RGB = "RGB";\r
-\r
-       public JmfCameraCapture(int i_width, int i_height, float i_rate, String i_pixcel_format)\r
-       {\r
-               String encoding = i_pixcel_format;// comboEncoding.getSelectedItem();\r
-               image_size = new Dimension(i_width, i_height);\r
-               jmf_video_format = new VideoFormat(encoding, image_size, Format.NOT_SPECIFIED, null, i_rate);\r
-       }\r
-\r
-       public Dimension getSize()\r
-       {\r
-               return image_size;\r
-       }\r
-\r
-       public javax.media.Buffer readBuffer() throws NyARException\r
-       {\r
-               if (jmf_monitor_stream == null) {\r
-                       throw new NyARException();\r
-               }\r
-               try {\r
-                       jmf_monitor_stream.read(read_buf);\r
-               } catch (Exception e) {\r
-                       throw new NyARException(e);\r
-               }\r
-               return read_buf;\r
-       }\r
-\r
-       public void setCaptureListener(JmfCaptureListener i_listener) throws NyARException\r
-       {\r
-               if (jmf_processor != null) {\r
-                       throw new NyARException();\r
-               }\r
-               capture_listener = i_listener;\r
-\r
-       }\r
-\r
-       public void start() throws NyARException\r
-       {\r
-\r
-               DataSource ds = getCaptureDS(jmf_video_format);\r
-               VideoFormat[] formats = new VideoFormat[] { new VideoFormat(null) };\r
-               ProcessorModel pm = new ProcessorModel(ds, formats, null);// ,\r
-               // formats,\r
-               // ftd);\r
-               Processor processor;\r
-               try {\r
-                       processor = Manager.createRealizedProcessor(pm);\r
-               } catch (Exception e) {\r
-                       // Make sure the capture devices are released\r
-                       ds.disconnect();\r
-                       throw new NyARException(e);\r
-               }\r
-               // Get the monitor control:\r
-               // Since there are more than one MonitorControl objects\r
-               // exported by the DataSource, we get the specific one\r
-               // that is also the MonitorStream object.\r
-               jmf_monitor_stream = (MonitorStream) ds.getControl("jmfsample.MonitorStream");\r
-               jmf_monitor_stream.setCaptureListener(capture_listener);\r
-               // jmf_data_source=ds;\r
-               jmf_processor = processor;\r
-               jmf_processor.start();\r
-       }\r
-\r
-       public void stop()\r
-       {\r
-               jmf_processor.stop();\r
-               jmf_processor.close();\r
-               jmf_processor = null;\r
-\r
-       }\r
-\r
-       protected void finalize()\r
-       {\r
-               if (jmf_processor != null) {\r
-                       jmf_processor.stop();\r
-                       jmf_processor.close();\r
-                       jmf_processor = null;\r
-               }\r
-       }\r
-\r
-       private static DataSource getCaptureDS(VideoFormat vf)\r
-       {\r
-               DataSource dsVideo = null;\r
-               DataSource ds = null;\r
-\r
-               // Create a capture DataSource for the video\r
-               // If there is no video capture device, then exit with null\r
-               if (vf != null) {\r
-                       dsVideo = createDataSource(vf);\r
-                       if (dsVideo == null)\r
-                               return null;\r
-               }\r
-\r
-               // Create the monitoring datasource wrapper\r
-               if (dsVideo != null) {\r
-                       dsVideo = new MonitorCDS(dsVideo);\r
-                       return dsVideo;\r
-               }\r
-\r
-               // Merge the data sources, if both audio and video are available\r
-               try {\r
-                       ds = Manager.createMergingDataSource(new DataSource[] { dsVideo });\r
-               } catch (IncompatibleSourceException ise) {\r
-                       return null;\r
-               }\r
-\r
-               return ds;\r
-       }\r
-\r
-       private static DataSource createDataSource(Format format)\r
-       {\r
-               DataSource ds;\r
-               Vector devices;\r
-               CaptureDeviceInfo cdi;\r
-               MediaLocator ml;\r
-\r
-               // Find devices for format\r
-               devices = CaptureDeviceManager.getDeviceList(format);\r
-               if (devices.size() < 1) {\r
-                       System.err.println("! No Devices for " + format);\r
-                       return null;\r
-               }\r
-               // Pick the first device\r
-               cdi = (CaptureDeviceInfo) devices.elementAt(0);\r
-\r
-               ml = cdi.getLocator();\r
-\r
-               try {\r
-                       ds = Manager.createDataSource(ml);\r
-                       ds.connect();\r
-                       if (ds instanceof CaptureDevice) {\r
-                               setCaptureFormat((CaptureDevice) ds, format);\r
-                       }\r
-               } catch (Exception e) {\r
-                       System.err.println(e);\r
-                       return null;\r
-               }\r
-               return ds;\r
-       }\r
-\r
-       private static void setCaptureFormat(CaptureDevice cdev, Format format)\r
-       {\r
-               FormatControl[] fcs = cdev.getFormatControls();\r
-               if (fcs.length < 1) {\r
-                       return;\r
-               }\r
-               FormatControl fc = fcs[0];\r
-               Format[] formats = fc.getSupportedFormats();\r
-               for (int i = 0; i < formats.length; i++) {\r
-                       if (formats[i].matches(format)) {\r
-                               format = formats[i].intersects(format);\r
-                               fc.setFormat(format);\r
-                               break;\r
-                       }\r
-               }\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java
deleted file mode 100644 (file)
index 2e9ff02..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JMF utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jmf.utils;\r
-\r
-import javax.media.Buffer;\r
-/**\r
- * JMF簡易キャプチャ用のリスナクラス\r
- *\r
- */\r
-public interface  JmfCaptureListener{\r
-    public void onUpdateBuffer(Buffer i_buffer);\r
-    \r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
deleted file mode 100644 (file)
index efdf0ef..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JMF utilities.\r
- * --------------------------------------------------------------------------------\r
- * The MIT License\r
- * Copyright (c) 2008 nyatla\r
- * airmail(at)ebony.plala.or.jp\r
- * http://nyatla.jp/nyartoolkit/\r
- * \r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- * \r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jmf.utils;\r
-\r
-import javax.media.format.*;\r
-import java.awt.Dimension;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * \r
- * RGB形式のJMFバッファをラップするNyARRasterです。\r
- * JMFから得たラスタデータのピクセル並び順を考慮します。\r
- *\r
- */\r
-public class JmfNyARRaster_RGB extends NyARRgbRaster_BasicClass\r
-{\r
-       protected class Reader implements INyARRgbPixelReader,INyARBufferReader\r
-       {\r
-               private int _buffer_type = INyARBufferReader.BUFFERFORMAT_NULL_ALLZERO;\r
-               private byte[] _ref_buf;\r
-               private NyARIntSize _size;\r
-\r
-               public Reader(NyARIntSize i_size)\r
-               {\r
-                       this._size = i_size;\r
-               }\r
-               //\r
-               //INyARRgbPixelReader\r
-               //\r
-               public void getPixel(int i_x, int i_y, int[] o_rgb) throws NyARException\r
-               {\r
-                       int bp = (i_x + i_y * this._size.w) * 3;\r
-                       byte[] ref = this._ref_buf;\r
-                       switch (this._buffer_type) {\r
-                       case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                               o_rgb[0] = (ref[bp + 0] & 0xff);// R\r
-                               o_rgb[1] = (ref[bp + 1] & 0xff);// G\r
-                               o_rgb[2] = (ref[bp + 2] & 0xff);// B\r
-                               break;\r
-                       case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-                               o_rgb[0] = (ref[bp + 2] & 0xff);// B\r
-                               o_rgb[1] = (ref[bp + 1] & 0xff);// G\r
-                               o_rgb[2] = (ref[bp + 0] & 0xff);// R\r
-                               break;\r
-                       default:\r
-                               throw new NyARException();\r
-                       }\r
-                       return;\r
-               }\r
-\r
-               public void getPixelSet(int[] i_x, int i_y[], int i_num, int[] o_rgb) throws NyARException\r
-               {\r
-                       int width = this._size.w;\r
-                       byte[] ref = this._ref_buf;\r
-                       int bp;\r
-                       switch (this._buffer_type) {\r
-                       case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                               for (int i = i_num - 1; i >= 0; i--) {\r
-                                       bp = (i_x[i] + i_y[i] * width) * 3;\r
-                                       o_rgb[i * 3 + 0] = (ref[bp + 0] & 0xff);// R\r
-                                       o_rgb[i * 3 + 1] = (ref[bp + 1] & 0xff);// G\r
-                                       o_rgb[i * 3 + 2] = (ref[bp + 2] & 0xff);// B\r
-                               }\r
-                               break;\r
-                       case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-                               for (int i = i_num - 1; i >= 0; i--) {\r
-                                       bp = (i_x[i] + i_y[i] * width) * 3;\r
-                                       o_rgb[i * 3 + 0] = (ref[bp + 2] & 0xff);// R\r
-                                       o_rgb[i * 3 + 1] = (ref[bp + 1] & 0xff);// G\r
-                                       o_rgb[i * 3 + 2] = (ref[bp + 0] & 0xff);// B\r
-                               }\r
-                               break;\r
-                       default:\r
-                               throw new NyARException();\r
-                       }\r
-                       return;\r
-               }\r
-\r
-               public void changeBuffer(int i_buffer_type, byte[] i_buffer)\r
-               {\r
-                       if(i_buffer_type==1){\r
-                               System.out.println("aaa");\r
-                       }\r
-                       \r
-                       this._buffer_type = i_buffer_type;\r
-                       this._ref_buf = i_buffer;\r
-               }\r
-               //\r
-               //INyARBufferReader\r
-               //\r
-               public Object getBuffer()\r
-               {\r
-                       return this._ref_buf;\r
-               }\r
-               public int getBufferType()\r
-               {\r
-                       return _buffer_type;\r
-               }\r
-               public boolean isEqualBufferType(int i_type_value)\r
-               {\r
-                       return this._buffer_type==i_type_value;\r
-               }               \r
-       }\r
-\r
-       protected byte[] _ref_buf;\r
-       protected Reader _reader;\r
-       /**\r
-        * RGB形式のJMFバッファをラップするオブジェクトをつくります。 生成直後のオブジェクトはデータを持ちません。\r
-        * メンバ関数はsetBufferを実行後に使用可能になります。\r
-        */\r
-       public JmfNyARRaster_RGB(NyARIntSize i_size)\r
-       {\r
-               super(new NyARIntSize(i_size.w,i_size.w));\r
-               this._size.w = i_size.w;\r
-               this._size.h = i_size.h;\r
-               this._ref_buf = null;\r
-               this._reader = new Reader(this._size);\r
-       }\r
-       public JmfNyARRaster_RGB(int i_width,int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = null;\r
-               this._reader = new Reader(this._size);\r
-       }       \r
-       \r
-       /**\r
-        * フォーマットを解析して、ラスタタイプを返します。\r
-        * \r
-        * @param i_fmt\r
-        * @throws NyARException\r
-        */\r
-       protected int analyzeBufferType(RGBFormat i_fmt) throws NyARException\r
-       {\r
-               // データサイズの確認\r
-               Dimension s = i_fmt.getSize();\r
-               if (!this._size.isEqualSize(s.width, s.height)) {\r
-                       throw new NyARException();\r
-               }\r
-               // データ配列の確認\r
-               int r = i_fmt.getRedMask() - 1;\r
-               int b = i_fmt.getBlueMask() - 1;\r
-\r
-               // 色配列の特定\r
-               if (r == 0 && b == 2) {\r
-                       return INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24;\r
-               } else if (r == 2 && b == 0) {\r
-                       return INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24;\r
-               } else {\r
-                       throw new NyARException("Unknown pixel order.");\r
-               }\r
-       }\r
-\r
-       /**\r
-        * javax.media.Bufferを分析して、その分析結果をNyARRasterに適合する形で保持します。\r
-        * 関数実行後に外部でi_bufferの内容変更した場合には、再度setBuffer関数を呼び出してください。\r
-        * この関数を実行すると、getRgbPixelReaderで取得したReaderのプロパティが変化することがあります。\r
-        * @param i_buffer\r
-        * RGB形式のデータを格納したjavax.media.Bufferオブジェクトを指定してください。\r
-        * @return i_bufferをラップしたオブジェクトを返します。\r
-        * @throws NyARException\r
-        */\r
-       public void setBuffer(javax.media.Buffer i_buffer) throws NyARException\r
-       {\r
-               int buftype= analyzeBufferType((RGBFormat) i_buffer.getFormat());\r
-               this._ref_buf = (byte[]) i_buffer.getData();\r
-               this._reader.changeBuffer(buftype, this._ref_buf);\r
-       }\r
-\r
-       /**\r
-        * データを持っているかを返します。\r
-        * @return\r
-        */\r
-       public boolean hasData()\r
-       {\r
-               return this._ref_buf != null;\r
-       }\r
-\r
-       public INyARRgbPixelReader getRgbPixelReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java
deleted file mode 100644 (file)
index 8a05e37..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1996-2001 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Sun grants you ("Licensee") a non-exclusive, royalty free, license to use,
- * modify and redistribute this software in source and binary code form,
- * provided that i) this copyright notice and license appear on all copies of
- * the software; and ii) Licensee does not utilize the software in a manner
- * which is disparaging to Sun.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
- * IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
- * OR DISTRIBUTING THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS
- * LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT,
- * INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
- * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF
- * OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * This software is not designed or intended for use in on-line control of
- * aircraft, air traffic, aircraft navigation or aircraft communications; or in
- * the design, construction, operation or maintenance of any nuclear
- * facility. Licensee represents and warrants that it will not use or
- * redistribute the Software for such purposes.
- */
-package jp.nyatla.nyartoolkit.jmf.utils;
-
-
-import javax.media.*;
-import javax.media.protocol.*;
-import javax.media.control.*;
-
-import java.io.IOException;
-
-
-
-public class MonitorCDS extends PushBufferDataSource{
-
-    private PushBufferDataSource delegate = null;
-    private PushBufferStream [] delStreams = null;
-    private MonitorStream monitorStream = null;
-    private PushBufferStream [] monitorStreams = null;
-    boolean delStarted = false; // variable used by MonitorStream also
-    private Control [] controls;
-
-    public MonitorCDS(DataSource ds)
-    {
-       // Get the stream from the actual datasource
-       // and create a MonitorStream from it
-       // Export the MonitorControl interface of the MonitorStream
-       if (ds instanceof PushBufferDataSource)
-       {
-           delegate = (PushBufferDataSource) ds;
-           delStreams = delegate.getStreams();
-           monitorStream = new MonitorStream(delStreams[0], this);
-           monitorStreams = new PushBufferStream[] {monitorStream};
-       }
-    }
-
-    public Object [] getControls()
-    {
-       return controls;
-    }
-
-    public Object getControl(String value) {
-       if (value.equals("jmfsample.MonitorStream") || value.equals("javax.media.control.MonitorControl"))
-           return monitorStream;
-       else
-           return null;
-    }
-
-    public javax.media.CaptureDeviceInfo getCaptureDeviceInfo()
-    {
-       return ((CaptureDevice)delegate).getCaptureDeviceInfo();
-    }
-
-    public FormatControl[] getFormatControls()
-    {
-       return ((CaptureDevice)delegate).getFormatControls();
-    }
-
-    public String getContentType()
-    {
-       return delegate.getContentType();
-    }
-
-    public void connect() throws IOException
-    {
-       if (delegate == null)
-           throw new IOException("Incompatible DataSource");
-       // Delegate is already connected
-    }
-
-    public void disconnect()
-    {
-       monitorStream.setEnabled(false);
-       delegate.disconnect();
-    }
-
-    public synchronized void start() throws IOException
-    {
-       startDelegate();
-       delStarted = true;
-    }
-
-    public synchronized void stop() throws IOException
-    {
-       if (!monitorStream.isEnabled()) {
-           stopDelegate();
-       }
-       delStarted = false;
-    }
-
-    public Time getDuration()
-    {
-       return delegate.getDuration();
-    }
-
-    public PushBufferStream [] getStreams()
-    {
-       return monitorStreams;
-    }
-
-    void startDelegate() throws IOException
-    {
-       delegate.start();
-    }
-
-    void stopDelegate() throws IOException
-    {
-       delegate.stop();
-    }
-
-}
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java
deleted file mode 100644 (file)
index 28d6b86..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 1996-2001 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Sun grants you ("Licensee") a non-exclusive, royalty free, license to use,
- * modify and redistribute this software in source and binary code form,
- * provided that i) this copyright notice and license appear on all copies of
- * the software; and ii) Licensee does not utilize the software in a manner
- * which is disparaging to Sun.
- *
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
- * IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
- * OR DISTRIBUTING THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS
- * LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT,
- * INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
- * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF
- * OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * This software is not designed or intended for use in on-line control of
- * aircraft, air traffic, aircraft navigation or aircraft communications; or in
- * the design, construction, operation or maintenance of any nuclear
- * facility. Licensee represents and warrants that it will not use or
- * redistribute the Software for such purposes.
- */
-package jp.nyatla.nyartoolkit.jmf.utils;
-
-
-
-import javax.media.*;
-import javax.media.protocol.*;
-
-import javax.media.util.BufferToImage;
-import java.io.IOException;
-import java.awt.*;
-
-public class MonitorStream implements PushBufferStream, BufferTransferHandler {
-
-    JmfCaptureListener img_listener;
-    PushBufferStream actual = null;
-    boolean dataAvailable = false;
-    boolean terminate = false;
-    boolean enabled = false;
-    Object bufferLock = new Object();
-    Buffer cbuffer = new Buffer();
-    BufferTransferHandler transferHandler = null;
-    Component component = null;
-    MonitorCDS cds;
-    BufferToImage bti = null;
-    
-    MonitorStream(PushBufferStream actual, MonitorCDS cds) {
-       this.actual = actual;
-       actual.setTransferHandler(this);
-       this.cds = cds;
-    }
-
-    public javax.media.Format getFormat()
-    {
-       return actual.getFormat();
-    }
-    /**
-     * 非同期READ
-     */
-    public void read(Buffer buffer) throws IOException
-    {
-       // Wait for data to be available
-       // Doesn't get used much because the transferData
-       // call is made when data IS available. And most
-       // Processors/Players read the data in the same
-       // thread that called transferData, although that's
-       // not a safe assumption to make
-       if (!dataAvailable) {
-           synchronized (bufferLock) {
-               while (!dataAvailable && !terminate) {
-                   try {
-                       bufferLock.wait(100);
-                   } catch (InterruptedException ie) {
-                   }
-               }
-           }
-       }
-
-       if (dataAvailable) {
-           synchronized (bufferLock) {
-               // Copy the buffer attributes, but swap the data
-               // attributes so that no extra copy is made.
-               buffer.copy(cbuffer, true);
-               //dataAvailable = false;
-           }
-       }
-//     return;
-    }
-    public void setCaptureListener(JmfCaptureListener i_listener)
-    {
-       img_listener=i_listener;
-    }
-
-    public void transferData(PushBufferStream pbs)
-    {
-       // Get the data from the original source stream
-       synchronized (bufferLock) {
-           try {
-               pbs.read(cbuffer);
-           } catch (IOException ioe) {
-               return;
-           }
-           dataAvailable = true;
-           bufferLock.notifyAll();
-       }
-       if(img_listener!=null){
-           img_listener.onUpdateBuffer(cbuffer);
-       }
-       
-/*
-       // Display data if monitor is active
-       if (isEnabled()) {
-           if (bti == null) {
-               VideoFormat vf = (VideoFormat) cbuffer.getFormat();
-               bti = new BufferToImage(vf);
-           }
-           if (bti != null && component != null) {
-               Image im = bti.createImage(cbuffer);
-               Graphics g = component.getGraphics();
-               Dimension size = component.getSize();
-               if (g != null)
-                   g.drawImage(im, 0, 0, component);
-           }
-       }
-*/
-       // Maybe synchronize this with setTransferHandler() ?
-       if (transferHandler != null && cds.delStarted)
-           transferHandler.transferData(this);
-    }
-
-    public void setTransferHandler(BufferTransferHandler transferHandler) {
-       this.transferHandler = transferHandler;
-    }
-
-    public boolean setEnabled(boolean value) {
-       enabled = value;
-       if (value == false) {
-           if (!cds.delStarted) {
-               try {
-                   cds.stopDelegate();
-               } catch (IOException ioe) {
-               }
-           }
-       } else {
-           // Start the capture datasource if the monitor is enabled
-           try {
-               cds.startDelegate();
-           }catch (IOException ioe) {
-           }
-       }
-       return enabled;
-    }
-
-    public boolean isEnabled()
-    {
-       return enabled;
-    }
-
-
-
-    public float setPreviewFrameRate(float rate)
-    {
-       System.err.println("TODO");
-       return rate;
-    }
-       
-    public ContentDescriptor getContentDescriptor()
-    {
-       return actual.getContentDescriptor();
-    }
-
-    public long getContentLength()
-    {
-       return actual.getContentLength();
-    }
-
-    public boolean endOfStream() {
-       return actual.endOfStream();
-    }
-
-    public Object [] getControls() {
-       return new Object[0];
-    }
-
-    public Object getControl(String str) {
-       return null;
-    }
-
-
-}
diff --git a/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java b/branches/nyatla/src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java
deleted file mode 100644 (file)
index aa8e435..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * PROJECT: NyARToolkit JMF utilities.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-
-package jp.nyatla.nyartoolkit.jmf.utils.sample;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-
-/**
- * VFMキャプチャテストプログラム
- */
-public class JmfCaptureTest extends Frame implements JmfCaptureListener
-{
-       public JmfCaptureTest() throws NyARException
-       {
-               setTitle("JmfCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               capture = new JmfCameraCapture(320, 240, 30f, JmfCameraCapture.PIXEL_FORMAT_RGB);
-               capture.setCaptureListener(this);
-       }
-
-       private JmfCameraCapture capture;
-
-       public void onUpdateBuffer(Buffer i_buffer)
-       {
-               BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-               Image img = b2i.createImage(i_buffer);
-               Graphics g = getGraphics();
-               g.drawImage(img, 32, 32, this);
-       }
-
-       private void startCapture()
-       {
-               try {
-                       capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       JmfCaptureTest mainwin = new JmfCaptureTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/branches/nyatla/src.utils/jogl/.classpath b/branches/nyatla/src.utils/jogl/.classpath
deleted file mode 100644 (file)
index d2b8f57..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="C:/Program Files/Java/jogl/lib/gluegen-rt.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/Java/jogl/lib/jogl.jar" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/src.utils/jogl/.project b/branches/nyatla/src.utils/jogl/.project
deleted file mode 100644 (file)
index 43c3381..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.utils.jogl</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARDetectMarker.java b/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARDetectMarker.java
deleted file mode 100644 (file)
index 9bf44e6..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL utilities.\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.utils;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;\r
-import jp.nyatla.nyartoolkit.detector.NyARDetectMarker;\r
-\r
-/**\r
- * NyARSingleDetectMarkerにOpenGL向け関数を追加したもの\r
- */\r
-public class GLNyARDetectMarker extends NyARDetectMarker\r
-{\r
-       private NyARTransMatResult trans_mat_result = new NyARTransMatResult();\r
-\r
-       private double view_scale_factor = 0.025;\r
-\r
-       public GLNyARDetectMarker(NyARParam i_param, NyARCode[] i_code, double[] i_marker_width, int i_number_of_code) throws NyARException\r
-       {\r
-               super(i_param, i_code, i_marker_width, i_number_of_code);\r
-       }\r
-\r
-       public void setScaleFactor(double i_new_value)\r
-       {\r
-               view_scale_factor = i_new_value;\r
-       }\r
-\r
-       /**\r
-        * @param i_index\r
-        * マーカーのインデックス番号を指定します。 直前に実行したdetectMarkerLiteの戻り値未満かつ0以上である必要があります。\r
-        * @param o_result\r
-        * 結果値を格納する配列を指定してください。double[16]以上が必要です。\r
-        * @throws NyARException\r
-        */\r
-       public void getCameraViewRH(int i_index, double[] o_result) throws NyARException\r
-       {\r
-               // 座標を計算\r
-               this.getTransmationMatrix(i_index, this.trans_mat_result);\r
-               // 行列変換\r
-               final NyARTransMatResult mat = this.trans_mat_result;\r
-               o_result[0 + 0 * 4] = mat.m00; \r
-               o_result[0 + 1 * 4] = mat.m01;\r
-               o_result[0 + 2 * 4] = mat.m02;\r
-               o_result[0 + 3 * 4] = mat.m03;\r
-               o_result[1 + 0 * 4] = -mat.m10;\r
-               o_result[1 + 1 * 4] = -mat.m11;\r
-               o_result[1 + 2 * 4] = -mat.m12;\r
-               o_result[1 + 3 * 4] = -mat.m13;\r
-               o_result[2 + 0 * 4] = -mat.m20;\r
-               o_result[2 + 1 * 4] = -mat.m21;\r
-               o_result[2 + 2 * 4] = -mat.m22;\r
-               o_result[2 + 3 * 4] = -mat.m23;\r
-               o_result[3 + 0 * 4] = 0.0;\r
-               o_result[3 + 1 * 4] = 0.0;\r
-               o_result[3 + 2 * 4] = 0.0;\r
-               o_result[3 + 3 * 4] = 1.0;\r
-               if (view_scale_factor != 0.0) {\r
-                       o_result[12] *= view_scale_factor;\r
-                       o_result[13] *= view_scale_factor;\r
-                       o_result[14] *= view_scale_factor;\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARParam.java b/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARParam.java
deleted file mode 100644 (file)
index 416d1be..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL utilities.\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.utils;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-\r
-/**\r
- * NyARParamにOpenGL向け関数を追加したもの\r
- */\r
-public class GLNyARParam extends NyARParam\r
-{\r
-       private double view_distance_min = 0.1;//#define VIEW_DISTANCE_MIN              0.1                     // Objects closer to the camera than this will not be displayed.\r
-\r
-       private double view_distance_max = 100.0;//#define VIEW_DISTANCE_MAX            100.0           // Objects further away from the camera than this will not be displayed.\r
-\r
-       private double[] m_projection = null;\r
-\r
-       public void setViewDistanceMin(double i_new_value)\r
-       {\r
-               m_projection = null;//キャッシュ済変数初期化\r
-               view_distance_min = i_new_value;\r
-       }\r
-\r
-       public void setViewDistanceMax(double i_new_value)\r
-       {\r
-               m_projection = null;//キャッシュ済変数初期化\r
-               view_distance_max = i_new_value;\r
-       }\r
-\r
-       /**\r
-        * void arglCameraFrustumRH(const ARParam *cparam, const double focalmin, const double focalmax, GLdouble m_projection[16])\r
-        * 関数の置き換え\r
-        * @param focalmin\r
-        * @param focalmax\r
-        * @return\r
-        */\r
-       public double[] getCameraFrustumRH()\r
-       {\r
-               //既に値がキャッシュされていたらそれを使う\r
-               if (m_projection != null) {\r
-                       return m_projection;\r
-               }\r
-               //無ければ計算\r
-               m_projection = new double[16];\r
-               NyARMat trans_mat = new NyARMat(3, 4);\r
-               NyARMat icpara_mat = new NyARMat(3, 4);\r
-               double[][] p = new double[3][3], q = new double[4][4];\r
-\r
-               int i, j;\r
-\r
-               final int width = this._screen_size.w;\r
-               final int height = this._screen_size.h;\r
-\r
-               this.getPerspectiveProjectionMatrix().decompMat(icpara_mat, trans_mat);\r
-\r
-               double[][] icpara = icpara_mat.getArray();\r
-               double[][] trans = trans_mat.getArray();\r
-               for (i = 0; i < 4; i++) {\r
-                       icpara[1][i] = (height - 1) * (icpara[2][i]) - icpara[1][i];\r
-               }\r
-\r
-               for (i = 0; i < 3; i++) {\r
-                       for (j = 0; j < 3; j++) {\r
-                               p[i][j] = icpara[i][j] / icpara[2][2];\r
-                       }\r
-               }\r
-               q[0][0] = (2.0 * p[0][0] / (width - 1));\r
-               q[0][1] = (2.0 * p[0][1] / (width - 1));\r
-               q[0][2] = -((2.0 * p[0][2] / (width - 1)) - 1.0);\r
-               q[0][3] = 0.0;\r
-\r
-               q[1][0] = 0.0;\r
-               q[1][1] = -(2.0 * p[1][1] / (height - 1));\r
-               q[1][2] = -((2.0 * p[1][2] / (height - 1)) - 1.0);\r
-               q[1][3] = 0.0;\r
-\r
-               q[2][0] = 0.0;\r
-               q[2][1] = 0.0;\r
-               q[2][2] = (view_distance_max + view_distance_min) / (view_distance_min - view_distance_max);\r
-               q[2][3] = 2.0 * view_distance_max * view_distance_min / (view_distance_min - view_distance_max);\r
-\r
-               q[3][0] = 0.0;\r
-               q[3][1] = 0.0;\r
-               q[3][2] = -1.0;\r
-               q[3][3] = 0.0;\r
-\r
-               for (i = 0; i < 4; i++) { // Row.\r
-                       // First 3 columns of the current row.\r
-                       for (j = 0; j < 3; j++) { // Column.\r
-                               m_projection[i + j * 4] = q[i][0] * trans[0][j] + q[i][1] * trans[1][j] + q[i][2] * trans[2][j];\r
-                       }\r
-                       // Fourth column of the current row.\r
-                       m_projection[i + 3 * 4] = q[i][0] * trans[0][3] + q[i][1] * trans[1][3] + q[i][2] * trans[2][3] + q[i][3];\r
-               }\r
-               return m_projection;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java b/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARRaster_RGB.java
deleted file mode 100644 (file)
index 1d28f27..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL utilities.\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.utils;\r
-\r
-import javax.media.format.RGBFormat;\r
-import javax.media.opengl.GL;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.jmf.utils.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-\r
-\r
-/**\r
- * NyARRaster_RGBにOpenGL用のデータ変換機能を追加したものです。\r
- */\r
-public class GLNyARRaster_RGB extends JmfNyARRaster_RGB\r
-{\r
-       private byte[] _gl_buf;\r
-\r
-       private int _gl_flag;\r
-\r
-       public GLNyARRaster_RGB(NyARParam i_param)\r
-       {\r
-               super(i_param.getScreenSize());\r
-               this._gl_flag = GL.GL_RGB;\r
-               this._gl_buf = new byte[this._size.w * this._size.h * 3];\r
-       }\r
-\r
-       public void setBuffer(javax.media.Buffer i_buffer, boolean i_is_reverse) throws NyARException\r
-       {\r
-               int buffer_type=analyzeBufferType((RGBFormat) i_buffer.getFormat());;\r
-               byte[] src_buf = (byte[]) i_buffer.getData();\r
-               // GL用のデータを準備\r
-               if (i_is_reverse) {\r
-                       final int length = this._size.w * 3;\r
-                       int src_idx = 0;\r
-                       int dest_idx = (this._size.h - 1) * length;                     \r
-                       for (int i = 0; i < this._size.h; i++) {\r
-                               System.arraycopy(src_buf, src_idx, this._gl_buf, dest_idx, length);\r
-                               src_idx += length;\r
-                               dest_idx -= length;\r
-                       }\r
-               } else {\r
-                       System.arraycopy(src_buf, 0, this._gl_buf, 0, src_buf.length);\r
-               }\r
-\r
-               // GLのフラグ設定\r
-               switch (buffer_type) {\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-                       this._gl_flag = GL.GL_BGR;\r
-                       break;\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                       this._gl_flag = GL.GL_RGB;\r
-                       break;\r
-               default:\r
-                       throw new NyARException();\r
-               }\r
-               // ref_bufをgl_bufに差し替える\r
-               this._ref_buf = this._gl_buf;\r
-               this._reader.changeBuffer(buffer_type, this._ref_buf);\r
-       }\r
-\r
-       /**\r
-        * GLでそのまま描画できるRGBバッファを返す。\r
-        * \r
-        * @return\r
-        */\r
-       public byte[] getGLRgbArray()\r
-       {\r
-               return this._ref_buf;\r
-       }\r
-\r
-       /**\r
-        * GL用のRGBバッファのバイト並びタイプを返す。\r
-        * \r
-        * @return\r
-        */\r
-       public int getGLPixelFlag()\r
-       {\r
-               return this._gl_flag;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARSingleDetectMarker.java b/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/GLNyARSingleDetectMarker.java
deleted file mode 100644 (file)
index c1d79c6..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL utilities.\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.utils;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;\r
-import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;\r
-\r
-\r
-/**\r
- * NyARSingleDetectMarkerにOpenGL向け関数を追加したもの\r
- */\r
-public class GLNyARSingleDetectMarker extends NyARSingleDetectMarker\r
-{\r
-       private NyARTransMatResult trans_mat_result = new NyARTransMatResult();\r
-\r
-       private double view_scale_factor = 0.025;// #define VIEW_SCALEFACTOR 0.025 // 1.0 ARToolKit unit becomes 0.025 of my OpenGL units.\r
-\r
-       public GLNyARSingleDetectMarker(NyARParam i_param, NyARCode i_code, double i_marker_width) throws NyARException\r
-       {\r
-               super(i_param, i_code, i_marker_width);\r
-       }\r
-\r
-       public void setScaleFactor(double i_new_value)\r
-       {\r
-               view_scale_factor = i_new_value;\r
-       }\r
-\r
-       // public static void arglCameraViewRH(const double para[3][4], GLdouble m_modelview[16], const double scale)\r
-       public double[] getCameraViewRH() throws NyARException\r
-       {\r
-               double[] result = new double[16];\r
-               getCameraViewRH(result);\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param o_result\r
-        * 結果値を格納する配列を指定してください。double[16]以上が必要です。\r
-        * @throws NyARException\r
-        */\r
-       public void getCameraViewRH(double[] o_result) throws NyARException\r
-       {\r
-               // 座標を計算\r
-               this.getTransmationMatrix(this.trans_mat_result);\r
-               // 行列変換\r
-               final NyARTransMatResult mat = this.trans_mat_result;\r
-               o_result[0 + 0 * 4] = mat.m00; // R1C1\r
-               o_result[0 + 1 * 4] = mat.m01; // R1C2\r
-               o_result[0 + 2 * 4] = mat.m02;\r
-               o_result[0 + 3 * 4] = mat.m03;\r
-               o_result[1 + 0 * 4] = -mat.m10; // R2\r
-               o_result[1 + 1 * 4] = -mat.m11;\r
-               o_result[1 + 2 * 4] = -mat.m12;\r
-               o_result[1 + 3 * 4] = -mat.m13;\r
-               o_result[2 + 0 * 4] = -mat.m20; // R3\r
-               o_result[2 + 1 * 4] = -mat.m21;\r
-               o_result[2 + 2 * 4] = -mat.m22;\r
-               o_result[2 + 3 * 4] = -mat.m23;\r
-               o_result[3 + 0 * 4] = 0.0;\r
-               o_result[3 + 1 * 4] = 0.0;\r
-               o_result[3 + 2 * 4] = 0.0;\r
-               o_result[3 + 3 * 4] = 1.0;\r
-               if (view_scale_factor != 0.0) {\r
-                       o_result[12] *= view_scale_factor;\r
-                       o_result[13] *= view_scale_factor;\r
-                       o_result[14] *= view_scale_factor;\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java b/branches/nyatla/src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
deleted file mode 100644 (file)
index f26c2f9..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit JOGL utilities.\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.jogl.utils;\r
-\r
-import java.nio.ByteBuffer;\r
-import java.nio.IntBuffer;\r
-\r
-import javax.media.opengl.GL;\r
-import javax.media.opengl.glu.GLU;\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * NyARToolkit用のJOGL支援関数群\r
- */\r
-public class NyARGLUtil\r
-{\r
-       private javax.media.opengl.GL _gl;\r
-\r
-       private javax.media.opengl.glu.GLU _glu;\r
-\r
-       public NyARGLUtil(javax.media.opengl.GL i_gl)\r
-       {\r
-               this._gl = i_gl;\r
-               this._glu = new GLU();\r
-       }\r
-\r
-       /**\r
-        * GLNyARRaster_RGBをバックグラウンドに書き出す。\r
-        * @param image\r
-        * @param zoom\r
-        */\r
-       public void drawBackGround(GLNyARRaster_RGB i_raster, double i_zoom)\r
-       {\r
-               IntBuffer texEnvModeSave = IntBuffer.allocate(1);\r
-               boolean lightingSave;\r
-               boolean depthTestSave;\r
-               javax.media.opengl.GL gl = this._gl;\r
-               final NyARIntSize rsize=i_raster.getSize();\r
-\r
-               // Prepare an orthographic projection, set camera position for 2D drawing, and save GL state.\r
-               gl.glGetTexEnviv(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, texEnvModeSave); // Save GL texture environment mode.\r
-               if (texEnvModeSave.array()[0] != GL.GL_REPLACE) {\r
-                       gl.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE);\r
-               }\r
-               lightingSave = gl.glIsEnabled(GL.GL_LIGHTING); // Save enabled state of lighting.\r
-               if (lightingSave == true) {\r
-                       gl.glDisable(GL.GL_LIGHTING);\r
-               }\r
-               depthTestSave = gl.glIsEnabled(GL.GL_DEPTH_TEST); // Save enabled state of depth test.\r
-               if (depthTestSave == true) {\r
-                       gl.glDisable(GL.GL_DEPTH_TEST);\r
-               }\r
-               gl.glMatrixMode(GL.GL_PROJECTION);\r
-               gl.glPushMatrix();\r
-               gl.glLoadIdentity();\r
-               _glu.gluOrtho2D(0.0,rsize.w, 0.0,rsize.h);\r
-               gl.glMatrixMode(GL.GL_MODELVIEW);\r
-               gl.glPushMatrix();\r
-               gl.glLoadIdentity();\r
-               arglDispImageStateful(i_raster, i_zoom);\r
-\r
-               // Restore previous projection, camera position, and GL state.\r
-               gl.glMatrixMode(GL.GL_PROJECTION);\r
-               gl.glPopMatrix();\r
-               gl.glMatrixMode(GL.GL_MODELVIEW);\r
-               gl.glPopMatrix();\r
-               if (depthTestSave) {\r
-                       gl.glEnable(GL.GL_DEPTH_TEST); // Restore enabled state of depth test.\r
-               }\r
-               if (lightingSave) {\r
-                       gl.glEnable(GL.GL_LIGHTING); // Restore enabled state of lighting.\r
-               }\r
-               if (texEnvModeSave.get(0) != GL.GL_REPLACE) {\r
-                       gl.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, texEnvModeSave.get(0)); // Restore GL texture environment mode.\r
-               }\r
-               gl.glEnd();\r
-       }\r
-\r
-       /**\r
-        * arglDispImageStateful関数モドキ\r
-        * @param image\r
-        * @param zoom\r
-        */\r
-       private void arglDispImageStateful(GLNyARRaster_RGB i_raster, double zoom)\r
-       {\r
-               javax.media.opengl.GL gl_ = this._gl;\r
-               final NyARIntSize rsize = i_raster.getSize();\r
-               float zoomf;\r
-               IntBuffer params = IntBuffer.allocate(4);\r
-               zoomf = (float) zoom;\r
-               gl_.glDisable(GL.GL_TEXTURE_2D);\r
-               gl_.glGetIntegerv(GL.GL_VIEWPORT, params);\r
-               gl_.glPixelZoom(zoomf * ((float) (params.get(2)) / (float) rsize.w), -zoomf * ((float) (params.get(3)) / (float) rsize.h));\r
-               gl_.glWindowPos2f(0.0f, (float) rsize.h);\r
-               gl_.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1);\r
-               ByteBuffer buf = ByteBuffer.wrap(i_raster.getGLRgbArray());\r
-               gl_.glDrawPixels(rsize.w,rsize.h, i_raster.getGLPixelFlag(), GL.GL_UNSIGNED_BYTE, buf);\r
-       }\r
-}\r
diff --git a/branches/nyatla/src.utils/qt/.classpath b/branches/nyatla/src.utils/qt/.classpath
deleted file mode 100644 (file)
index 76c4ee4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry path="" kind="src"/>\r
-       <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>\r
-       <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="C:/Program Files/QuickTime/QTSystem/QTJava.zip" kind="lib"/>\r
-       <classpathentry path="C:/Program Files/JMF2.1.1e/lib/jmf.jar" kind="lib"/>\r
-       <classpathentry path="" kind="output"/>\r
-</classpath>\r
diff --git a/branches/nyatla/src.utils/qt/.project b/branches/nyatla/src.utils/qt/.project
deleted file mode 100644 (file)
index 149fb9e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolkit.utils.qt</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java b/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java
deleted file mode 100644 (file)
index 24f54fa..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Quicktime utilities.\r
- * --------------------------------------------------------------------------------\r
- * Copyright (C)2008 arc@dmz\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     \r
- *     <arc(at)digitalmuseum.jp>\r
- * \r
- */\r
-\r
-package jp.nyatla.nyartoolkit.qt.utils;\r
-\r
-import java.awt.Dimension;\r
-import java.awt.event.ActionEvent;\r
-import java.awt.event.ActionListener;\r
-import java.io.File;\r
-\r
-import javax.swing.Timer;\r
-\r
-import quicktime.QTException;\r
-import quicktime.QTSession;\r
-import quicktime.io.QTFile;\r
-import quicktime.qd.PixMap;\r
-import quicktime.qd.QDConstants;\r
-import quicktime.qd.QDGraphics;\r
-import quicktime.qd.QDRect;\r
-import quicktime.std.StdQTConstants;\r
-import quicktime.std.movies.Movie;\r
-import quicktime.std.movies.media.DataRef;\r
-import quicktime.std.sg.SGVideoChannel;\r
-import quicktime.std.sg.SequenceGrabber;\r
-import quicktime.util.RawEncodedImage;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-/**\r
- * QuickTimeキャプチャクラス\r
- *\r
- */\r
-public class QtCameraCapture implements ActionListener\r
-{\r
-\r
-       private Dimension image_size;\r
-\r
-       private QtCaptureListener capture_listener;\r
-\r
-       protected float fps = 30; // キャプチャ画像を取得するfps\r
-\r
-       protected byte[] pixels; // キャプチャ画像の実データを保持するバイト型配列\r
-\r
-       // キャプチャに使うタイマー\r
-       private Timer timer;\r
-\r
-       // QTJava用のあれこれ\r
-       private QDGraphics graphics;\r
-\r
-       private QDRect bounds;\r
-\r
-       private SequenceGrabber grabber;\r
-\r
-       private SGVideoChannel channel;\r
-\r
-       private RawEncodedImage rawEncodedImage;\r
-\r
-       private Movie movie;\r
-\r
-       // ピクセルフォーマット変換用の一時変数\r
-       private int[] pixels_int;\r
-\r
-       public static final int PIXEL_FORMAT_RGB = quicktime.util.EndianOrder.isNativeLittleEndian() ? QDConstants.k32BGRAPixelFormat : QDGraphics.kDefaultPixelFormat;\r
-\r
-       public QtCameraCapture(int i_width, int i_height, float i_rate)\r
-       {\r
-               image_size = new Dimension(i_width, i_height);\r
-               fps = i_rate;\r
-       }\r
-\r
-       public Dimension getSize()\r
-       {\r
-               return image_size;\r
-       }\r
-\r
-       public byte[] readBuffer() throws NyARException\r
-       {\r
-               if (grabber == null) {\r
-                       throw new NyARException();\r
-               }\r
-               return pixels;\r
-       }\r
-\r
-       public void setCaptureListener(QtCaptureListener i_listener) throws NyARException\r
-       {\r
-               if (grabber != null) {\r
-                       throw new NyARException();\r
-               }\r
-               capture_listener = i_listener;\r
-\r
-       }\r
-\r
-       public void prepSetInput(Object input) throws QTException\r
-       {\r
-               QTSession.open();\r
-               bounds = new QDRect(image_size.width, image_size.height);\r
-               graphics = new QDGraphics(quicktime.util.EndianOrder.isNativeLittleEndian() ? QDConstants.k32BGRAPixelFormat : QDGraphics.kDefaultPixelFormat, bounds);\r
-               if (input != null && input.getClass().equals(File.class)) {\r
-                       movie = quicktime.std.movies.Movie.fromDataRef(new DataRef(new QTFile((File) input)), StdQTConstants.newMovieActive);\r
-               } else {\r
-                       grabber = new SequenceGrabber();\r
-                       grabber.setGWorld(graphics, null);\r
-                       channel = new SGVideoChannel(grabber);\r
-                       channel.setBounds(bounds);\r
-\r
-                       // seqGrabPreview == 2, Processingでmagic numberとしてハードコートされていた…\r
-                       channel.setUsage(StdQTConstants.seqGrabPreview);\r
-\r
-                       if (input != null) {\r
-                               try {\r
-                                       channel.setDevice(input.toString());\r
-                               } catch (QTException e) {\r
-                                       e.printStackTrace();\r
-                                       throw e;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Webcamの設定ダイアログを表示する。\r
-        * 既定のWebcamでは駄目な場合(複数のWebcamが接続されているPCなど)ではこれを実行するとよい。\r
-        */\r
-       public void prepShowDialog() throws QTException\r
-       {\r
-               channel.settingsDialog();\r
-       }\r
-\r
-       public void start() throws NyARException\r
-       {\r
-               try {\r
-\r
-                       if (grabber == null)\r
-                               prepSetInput(null);\r
-\r
-                       if (movie == null) {\r
-                               grabber.prepare(true, false); // あってもなくてもよさそう\r
-                               grabber.startPreview();\r
-                       } else {\r
-                               movie.preroll(0, 1.0f);\r
-                               while (movie.maxLoadedTimeInMovie() == 0)\r
-                                       movie.task(100);\r
-                               movie.setRate(1);\r
-                               movie.getPict(movie.getTime()).draw(graphics, bounds);\r
-                       }\r
-                       PixMap pixmap = graphics.getPixMap();\r
-                       rawEncodedImage = pixmap.getPixelData();\r
-\r
-                       image_size.width = rawEncodedImage.getRowBytes() / 4;\r
-                       pixels = new byte[image_size.width * image_size.height * 3];\r
-                       pixels_int = new int[image_size.width * image_size.height];\r
-               } catch (QTException e) {\r
-                       QTSession.close();\r
-                       throw new NyARException(e);\r
-               }\r
-\r
-               // キャプチャイメージを定期的に更新するタイマー\r
-               timer = new Timer((int) (1000 / fps), this);\r
-               timer.start();\r
-       }\r
-\r
-       public void stop()\r
-       {\r
-               finalize();\r
-       }\r
-\r
-       /** タイマー処理。キャプチャイメージの更新結果をリスナに伝える。 */\r
-       public void actionPerformed(ActionEvent event)\r
-       {\r
-\r
-               // 画像をQTJavaのRawEncodedImageとして取得\r
-               try {\r
-                       if (movie == null) {\r
-                               grabber.idle();\r
-                       } else {\r
-                               if (movie.isDone())\r
-                                       movie.goToBeginning();\r
-                               movie.getPict(movie.getTime()).draw(graphics, bounds);\r
-                       }\r
-               } catch (QTException e) {\r
-                       QTSession.close();\r
-                       e.printStackTrace();\r
-               }\r
-\r
-               // RawEncodedImageをint列に落とし込む\r
-               rawEncodedImage.copyToArray(0, pixels_int, 0, pixels_int.length);\r
-\r
-               // バイト列を生成する\r
-               int idx_byte = 0;\r
-               for (int idx = 0; idx < image_size.width * image_size.height; idx++) {\r
-                       pixels[idx_byte++] = (byte) (pixels_int[idx] >> 16);\r
-                       pixels[idx_byte++] = (byte) (pixels_int[idx] >> 8 & 0xff);\r
-                       pixels[idx_byte++] = (byte) (pixels_int[idx] & 0xff);\r
-               }\r
-\r
-               // 各リスナに更新されたバイト列を渡す\r
-               capture_listener.onUpdateBuffer(pixels);\r
-       }\r
-\r
-       protected void finalize()\r
-       {\r
-               try {\r
-                       if (movie == null) {\r
-                               grabber.stop();\r
-                               grabber.release();\r
-                               grabber.disposeChannel(channel);\r
-                       }\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               } finally {\r
-                       QTSession.close();\r
-               }\r
-               timer.stop();\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java b/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java
deleted file mode 100644 (file)
index eaef79c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Quicktime utilities.\r
- * --------------------------------------------------------------------------------\r
- * Copyright (C)2008 arc@dmz\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     \r
- *     <arc(at)digitalmuseum.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.qt.utils;\r
-\r
-/**\r
- * QuickTime リスナクラス\r
- *\r
- */\r
-public interface  QtCaptureListener\r
-{\r
-    public void onUpdateBuffer(byte[] i_buffer);\r
-    \r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java b/branches/nyatla/src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
deleted file mode 100644 (file)
index 3c96abd..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit Quicktime utilities.\r
- * --------------------------------------------------------------------------------\r
- * Copyright (C)2008 arc@dmz\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     \r
- *     <arc(at)digitalmuseum.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.qt.utils;\r
-\r
-import java.awt.image.BufferedImage;\r
-import java.awt.image.DataBuffer;\r
-import java.awt.image.WritableRaster;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster_BasicClass;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * RGB形式のbyte配列をラップするNyARRasterです。\r
- * 保持したデータからBufferedImageを出力する機能も持ちます。\r
- */\r
-public class QtNyARRaster_RGB extends NyARRgbRaster_BasicClass\r
-{\r
-       private class PixcelReader extends NyARRgbPixelReader_RGB24 implements INyARBufferReader\r
-       {\r
-               public PixcelReader(NyARIntSize i_size)\r
-               {\r
-                       super(null, i_size);\r
-                       return;\r
-               }\r
-\r
-               public void syncBuffer(byte[] i_ref_buffer)\r
-               {\r
-                       this._ref_buf = i_ref_buffer;\r
-                       return;\r
-               }\r
-\r
-               //\r
-               // INyARBufferReader\r
-               //\r
-               public Object getBuffer()\r
-               {\r
-                       return this._ref_buf;\r
-               }\r
-\r
-               public int getBufferType()\r
-               {\r
-                       return INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24;\r
-               }\r
-\r
-               public boolean isEqualBufferType(int i_type_value)\r
-               {\r
-                       return i_type_value == INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24;\r
-               }\r
-       }\r
-\r
-       protected byte[] _ref_buf;\r
-\r
-       protected PixcelReader _reader;\r
-\r
-       private WritableRaster _raster;\r
-\r
-       private BufferedImage _image;\r
-\r
-       /**\r
-        * RGB形式のJMFバッファをラップするオブジェクトをつくります。 生成直後のオブジェクトはデータを持ちません。 メンバ関数はsetBufferを実行後に使用可能になります。\r
-        */\r
-       public QtNyARRaster_RGB(int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = null;\r
-               this._reader = new PixcelReader(this._size);\r
-               _raster = WritableRaster.createInterleavedRaster(DataBuffer.TYPE_BYTE, i_width, i_height, i_width * 3, 3, new int[] { 0, 1, 2 }, null);\r
-               _image = new BufferedImage(i_width, i_height, BufferedImage.TYPE_3BYTE_BGR);\r
-       }\r
-\r
-       /**\r
-        * javax.media.Bufferを分析して、その分析結果をNyARRasterに適合する形で保持します。 関数実行後に外部でi_bufferの内容変更した場合には、再度setBuffer関数を呼び出してください。\r
-        * \r
-        * @param i_buffer\r
-        * RGB形式のデータを格納したjavax.media.Bufferオブジェクトを指定してください。\r
-        * @return i_bufferをラップしたオブジェクトを返します。\r
-        * @throws NyARException\r
-        */\r
-       public void setBuffer(byte[] i_buffer)\r
-       {\r
-               this._ref_buf = i_buffer;\r
-               this._reader.syncBuffer(i_buffer);\r
-       }\r
-\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-\r
-       public INyARRgbPixelReader getRgbPixelReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-\r
-       /**\r
-        * データを持っているかを返します。\r
-        * \r
-        * @return\r
-        */\r
-       public boolean hasData()\r
-       {\r
-               return this._ref_buf != null;\r
-       }\r
-\r
-       /**\r
-        * 保持しているデータからBufferedImageを作って返します。\r
-        * \r
-        * @return\r
-        */\r
-       public BufferedImage createImage()\r
-       {\r
-               _raster.setDataElements(0, 0, this._size.w, this._size.h, this._ref_buf);\r
-               _image.setData(_raster);\r
-               return _image;\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/.classpath b/branches/nyatla/src/.classpath
deleted file mode 100644 (file)
index 6d488d7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path=""/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="output" path=""/>\r
-</classpath>\r
diff --git a/branches/nyatla/src/.project b/branches/nyatla/src/.project
deleted file mode 100644 (file)
index 84e4f3f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>NyARToolKit</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/NyARException.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/NyARException.java
deleted file mode 100644 (file)
index 058e56a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit;\r
-\r
-public class NyARException extends Exception\r
-{\r
-       private static final long serialVersionUID = 1L;\r
-\r
-       public NyARException()\r
-       {\r
-               super();\r
-       }\r
-\r
-       public NyARException(Exception e)\r
-       {\r
-               super(e);\r
-       }\r
-\r
-       public NyARException(String m)\r
-       {\r
-               super(m);\r
-       }\r
-\r
-       public static void trap(String m) throws NyARException\r
-       {\r
-               throw new NyARException("トラップ:" + m);\r
-       }\r
-\r
-       public static void notImplement() throws NyARException\r
-       {\r
-               throw new NyARException("Not Implement!");\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/INyARSquareDetector.java
deleted file mode 100644 (file)
index 08d73b2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.NyARBinRaster;\r
-\r
-public interface INyARSquareDetector\r
-{\r
-       public void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARCode.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARCode.java
deleted file mode 100644 (file)
index 886b716..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-import java.io.FileInputStream;\r
-import java.io.InputStream;\r
-import java.io.InputStreamReader;\r
-import java.io.StreamTokenizer;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-\r
-\r
-/**\r
- * ARToolKitのマーカーコードを1個保持します。\r
- * \r
- */\r
-public class NyARCode\r
-{\r
-       private int[][][][] pat;// static int\r
-                                                       // pat[AR_PATT_NUM_MAX][4][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-\r
-       private double[] patpow = new double[4];// static double patpow[AR_PATT_NUM_MAX][4];\r
-\r
-       private short[][][] patBW;// static int patBW[AR_PATT_NUM_MAX][4][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-\r
-       private double[] patpowBW = new double[4];// static double patpowBW[AR_PATT_NUM_MAX][4];\r
-\r
-       private int width, height;\r
-\r
-       public int[][][][] getPat()\r
-       {\r
-               return pat;\r
-       }\r
-\r
-       public double[] getPatPow()\r
-       {\r
-               return patpow;\r
-       }\r
-\r
-       public short[][][] getPatBW()\r
-       {\r
-               return patBW;\r
-       }\r
-\r
-       public double[] getPatPowBW()\r
-       {\r
-               return patpowBW;\r
-       }\r
-\r
-       public int getWidth()\r
-       {\r
-               return width;\r
-       }\r
-\r
-       public int getHeight()\r
-       {\r
-               return height;\r
-       }\r
-\r
-       public NyARCode(int i_width, int i_height)\r
-       {\r
-               width = i_width;\r
-               height = i_height;\r
-               pat = new int[4][height][width][3];// static int pat[AR_PATT_NUM_MAX][4][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-               patBW = new short[4][height][width];// static int patBW[AR_PATT_NUM_MAX][4][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-       }\r
-\r
-       /**\r
-        * int arLoadPatt( const char *filename ); ARToolKitのパターンファイルをロードする。\r
-        * ファイル形式はBGR形式で記録されたパターンファイルであること。\r
-        * \r
-        * @param filename\r
-        * @return\r
-        * @throws Exception\r
-        */\r
-       public void loadARPattFromFile(String filename) throws NyARException\r
-       {\r
-               try {\r
-                       loadARPatt(new FileInputStream(filename));\r
-\r
-               } catch (Exception e) {\r
-                       throw new NyARException(e);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * \r
-        * @param i_stream\r
-        * @throws NyARException\r
-        */\r
-       public void loadARPatt(InputStream i_stream) throws NyARException\r
-       {\r
-               try {\r
-                       StreamTokenizer st = new StreamTokenizer(new InputStreamReader(\r
-                                       i_stream));\r
-                       // パターンデータはGBRAで並んでる。\r
-                       for (int h = 0; h < 4; h++) {\r
-                               int l = 0;\r
-                               for (int i3 = 0; i3 < 3; i3++) {\r
-                                       for (int i2 = 0; i2 < height; i2++) {\r
-                                               for (int i1 = 0; i1 < width; i1++) {\r
-                                                       // 数値のみ読み出す\r
-                                                       switch (st.nextToken()) {// if( fscanf(fp, "%d",&j) != 1 ) {\r
-                                                       case StreamTokenizer.TT_NUMBER:\r
-                                                               break;\r
-                                                       default:\r
-                                                               throw new NyARException();\r
-                                                       }\r
-                                                       short j = (short) (255 - st.nval);// j = 255-j;\r
-                                                       // 標準ファイルのパターンはBGRでならんでるからRGBに並べなおす\r
-                                                       switch (i3) {\r
-                                                       case 0:\r
-                                                               pat[h][i2][i1][2] = j;\r
-                                                               break;// pat[patno][h][(i2*Config.AR_PATT_SIZE_X+i1)*3+2]= j;break;\r
-                                                       case 1:\r
-                                                               pat[h][i2][i1][1] = j;\r
-                                                               break;// pat[patno][h][(i2*Config.AR_PATT_SIZE_X+i1)*3+1]= j;break;\r
-                                                       case 2:\r
-                                                               pat[h][i2][i1][0] = j;\r
-                                                               break;// pat[patno][h][(i2*Config.AR_PATT_SIZE_X+i1)*3+0]= j;break;\r
-                                                       }\r
-                                                       // pat[patno][h][(i2*Config.AR_PATT_SIZE_X+i1)*3+i3]= j;\r
-                                                       if (i3 == 0) {\r
-                                                               patBW[h][i2][i1] = j;// patBW[patno][h][i2*Config.AR_PATT_SIZE_X+i1] = j;\r
-                                                       } else {\r
-                                                               patBW[h][i2][i1] += j;// patBW[patno][h][i2*Config.AR_PATT_SIZE_X+i1] += j;\r
-                                                       }\r
-                                                       if (i3 == 2) {\r
-                                                               patBW[h][i2][i1] /= 3;// patBW[patno][h][i2*Config.AR_PATT_SIZE_X+i1]/= 3;\r
-                                                       }\r
-                                                       l += j;\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-                               l /= (height * width * 3);\r
-\r
-                               int m = 0;\r
-                               for (int i = 0; i < height; i++) {// for( i = 0; i < AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3;i++ ) {\r
-                                       for (int i2 = 0; i2 < width; i2++) {\r
-                                               for (int i3 = 0; i3 < 3; i3++) {\r
-                                                       pat[h][i][i2][i3] -= l;\r
-                                                       m += (pat[h][i][i2][i3] * pat[h][i][i2][i3]);\r
-                                               }\r
-                                       }\r
-                               }\r
-                               patpow[h] = Math.sqrt((double) m);\r
-                               if (patpow[h] == 0.0) {\r
-                                       patpow[h] = 0.0000001;\r
-                               }\r
-\r
-                               m = 0;\r
-                               for (int i = 0; i < height; i++) {\r
-                                       for (int i2 = 0; i2 < width; i2++) {\r
-                                               patBW[h][i][i2] -= l;\r
-                                               m += (patBW[h][i][i2] * patBW[h][i][i2]);\r
-                                       }\r
-                               }\r
-                               patpowBW[h] = Math.sqrt((double) m);\r
-                               if (patpowBW[h] == 0.0) {\r
-                                       patpowBW[h] = 0.0000001;\r
-                               }\r
-                       }\r
-               } catch (Exception e) {\r
-                       throw new NyARException(e);\r
-               }\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARMat.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARMat.java
deleted file mode 100644 (file)
index 28314f5..0000000
+++ /dev/null
@@ -1,1184 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-\r
-\r
-/**\r
- * ARMat構造体に対応するクラス typedef struct { double *m; int row; int clm; }ARMat;\r
- * \r
- */\r
-public class NyARMat\r
-{\r
-       /**\r
-        * 配列サイズと行列サイズは必ずしも一致しないことに注意 返された配列のサイズを行列の大きさとして使わないこと!\r
-        * \r
-        */\r
-       protected double[][] m;\r
-\r
-       private int clm, row;\r
-\r
-       /**\r
-        * デフォルトコンストラクタは機能しません。\r
-        * \r
-        * @throws NyARException\r
-        */\r
-       protected NyARMat() throws NyARException\r
-       {\r
-               throw new NyARException();\r
-       }\r
-\r
-       public NyARMat(int i_row, int i_clm)\r
-       {\r
-               m = new double[i_row][i_clm];\r
-               clm = i_clm;\r
-               row = i_row;\r
-       }\r
-\r
-       /**\r
-        * i_row x i_clmサイズの行列を格納できるように行列サイズを変更します。 実行後、行列の各値は不定になります。\r
-        * \r
-        * @param i_row\r
-        * @param i_clm\r
-        */\r
-       public void realloc(int i_row, int i_clm)\r
-       {\r
-               if (i_row <= this.m.length && i_clm <= this.m[0].length) {\r
-                       // 十分な配列があれば何もしない。\r
-               } else {\r
-                       // 不十分なら取り直す。\r
-                       m = new double[i_row][i_clm];\r
-               }\r
-               this.clm = i_clm;\r
-               this.row = i_row;\r
-       }\r
-\r
-       public int getClm()\r
-       {\r
-               return clm;\r
-       }\r
-\r
-       public int getRow()\r
-       {\r
-               return row;\r
-       }\r
-\r
-       /**\r
-        * 行列をゼロクリアする。\r
-        */\r
-       public void zeroClear()\r
-       {\r
-               int i, i2;\r
-               // For順変更OK\r
-               for (i = row - 1; i >= 0; i--) {\r
-                       for (i2 = clm - 1; i2 >= 0; i2--) {\r
-                               m[i][i2] = 0.0;\r
-                       }\r
-               }\r
-       }\r
-\r
-       /**\r
-        * i_copy_fromの内容を自分自身にコピーします。 高さ・幅は同一で無いと失敗します。\r
-        * \r
-        * @param i_copy_from\r
-        */\r
-       public void copyFrom(NyARMat i_copy_from) throws NyARException\r
-       {\r
-               // サイズ確認\r
-               if (this.row != i_copy_from.row || this.clm != i_copy_from.clm) {\r
-                       throw new NyARException();\r
-               }\r
-               // 値コピー\r
-               for (int r = this.row - 1; r >= 0; r--) {\r
-                       for (int c = this.clm - 1; c >= 0; c--) {\r
-                               this.m[r][c] = i_copy_from.m[r][c];\r
-                       }\r
-               }\r
-       }\r
-\r
-       public double[][] getArray()\r
-       {\r
-               return m;\r
-       }\r
-\r
-       // public void getRowVec(int i_row,NyARVec o_vec)\r
-       // {\r
-       // o_vec.set(this.m[i_row],this.clm);\r
-       // }\r
-       /**\r
-        * aとbの積を自分自身に格納する。arMatrixMul()の代替品\r
-        * \r
-        * @param a\r
-        * @param b\r
-        * @throws NyARException\r
-        */\r
-       public void matrixMul(NyARMat a, NyARMat b) throws NyARException\r
-       {\r
-               if (a.clm != b.row || this.row != a.row || this.clm != b.clm) {\r
-                       throw new NyARException();\r
-               }\r
-               double w;\r
-               int r, c, i;\r
-               double[][] am = a.m, bm = b.m, dm = this.m;\r
-               // For順変更禁止\r
-               for (r = 0; r < this.row; r++) {\r
-                       for (c = 0; c < this.clm; c++) {\r
-                               w = 0.0;// dest.setARELEM0(r, c,0.0);\r
-                               for (i = 0; i < a.clm; i++) {\r
-                                       w += am[r][i] * bm[i][c];// ARELEM0(dest, r, c) +=ARELEM0(a, r, i) * ARELEM0(b,i, c);\r
-                               }\r
-                               dm[r][c] = w;\r
-                       }\r
-               }\r
-       }\r
-\r
-       private int[] wk_nos_matrixSelfInv = new int[50];\r
-\r
-       // private final static double matrixSelfInv_epsl=1.0e-10;\r
-       /**\r
-        * i_targetを逆行列に変換する。arMatrixSelfInv()と、arMatrixSelfInv_minv()関数を合成してあります。\r
-        * OPTIMIZE STEP[485->422]\r
-        * \r
-        * @param i_target\r
-        *            逆行列にする行列\r
-        * @return 逆行列があればTRUE/無ければFALSE\r
-        * \r
-        * @throws NyARException\r
-        */\r
-       public boolean matrixSelfInv() throws NyARException\r
-       {\r
-               double[][] ap = this.m;\r
-               int dimen = this.row;\r
-               int dimen_1 = dimen - 1;\r
-               double[] ap_n, ap_ip, ap_i;// wap;\r
-               int j, ip, nwork;\r
-               int[] nos = wk_nos_matrixSelfInv;// この関数で初期化される。\r
-               // double epsl;\r
-               double p, pbuf, work;\r
-\r
-               /* check size */\r
-               switch (dimen) {\r
-               case 0:\r
-                       throw new NyARException();\r
-               case 1:\r
-                       ap[0][0] = 1.0 / ap[0][0];// *ap = 1.0 / (*ap);\r
-                       return true;/* 1 dimension */\r
-               }\r
-\r
-               for (int n = 0; n < dimen; n++) {\r
-                       nos[n] = n;\r
-               }\r
-\r
-               /*\r
-                * nyatla memo ipが定まらないで計算が行われる場合があるので挿入。 ループ内で0初期化していいかが判らない。\r
-                */\r
-               ip = 0;\r
-               // For順変更禁止\r
-               for (int n = 0; n < dimen; n++) {\r
-                       ap_n = ap[n];// wcp = ap + n * rowa;\r
-                       p = 0.0;\r
-                       for (int i = n; i < dimen; i++) {// for(i = n, wap = wcp, p =\r
-                                                                                               // 0.0; i < dimen ; i++, wap +=\r
-                                                                                               // rowa)\r
-                               if (p < (pbuf = Math.abs(ap[i][0]))) {\r
-                                       p = pbuf;\r
-                                       ip = i;\r
-                               }\r
-                       }\r
-                       // if (p <= matrixSelfInv_epsl){\r
-                       if (p == 0.0) {\r
-                               return false;\r
-                               // throw new NyARException();\r
-                       }\r
-\r
-                       nwork = nos[ip];\r
-                       nos[ip] = nos[n];\r
-                       nos[n] = nwork;\r
-\r
-                       ap_ip = ap[ip];\r
-                       for (j = 0; j < dimen; j++) {// for(j = 0, wap = ap + ip * rowa,\r
-                                                                                       // wbp = wcp; j < dimen ; j++) {\r
-                               work = ap_ip[j]; // work = *wap;\r
-                               ap_ip[j] = ap_n[j];\r
-                               ap_n[j] = work;\r
-                       }\r
-\r
-                       work = ap_n[0];\r
-                       for (j = 0; j < dimen_1; j++) {// for(j = 1, wap = wcp, work =\r
-                                                                                       // *wcp; j < dimen ; j++, wap++)\r
-                               ap_n[j] = ap_n[j + 1] / work;// *wap = *(wap + 1) / work;\r
-                       }\r
-                       ap_n[j] = 1.0 / work;// *wap = 1.0 / work;\r
-                       for (int i = 0; i < dimen; i++) {\r
-                               if (i != n) {\r
-                                       ap_i = ap[i];// wap = ap + i * rowa;\r
-\r
-                                       work = ap_i[0];\r
-                                       for (j = 0; j < dimen_1; j++) {// for(j = 1, wbp = wcp,work = *wap;j < dimen ;j++, wap++, wbp++)\r
-                                               ap_i[j] = ap_i[j + 1] - work * ap_n[j];// wap = *(wap +1) - work *(*wbp);\r
-                                       }\r
-                                       ap_i[j] = -work * ap_n[j];// *wap = -work * (*wbp);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               for (int n = 0; n < dimen; n++) {\r
-                       for (j = n; j < dimen; j++) {\r
-                               if (nos[j] == n) {\r
-                                       break;\r
-                               }\r
-                       }\r
-                       nos[j] = nos[n];\r
-                       for (int i = 0; i < dimen; i++) {// for(i = 0, wap = ap + j, wbp\r
-                                                                                               // = ap + n; i < dimen ;i++, wap\r
-                                                                                               // += rowa, wbp += rowa) {\r
-                               ap_i = ap[i];\r
-                               work = ap_i[j];// work = *wap;\r
-                               ap_i[j] = ap_i[n];// *wap = *wbp;\r
-                               ap_i[n] = work;// *wbp = work;\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * sourceの転置行列をdestに得る。arMatrixTrans()の代替品\r
-        * \r
-        * @param dest\r
-        * @param source\r
-        * @return\r
-        */\r
-       public static void matrixTrans(NyARMat dest, NyARMat source) throws NyARException\r
-       {\r
-               if (dest.row != source.clm || dest.clm != source.row) {\r
-                       throw new NyARException();\r
-               }\r
-               NyARException.trap("未チェックのパス");\r
-               // For順変更禁止\r
-               for (int r = 0; r < dest.row; r++) {\r
-                       for (int c = 0; c < dest.clm; c++) {\r
-                               dest.m[r][c] = source.m[c][r];\r
-                       }\r
-               }\r
-       }\r
-\r
-       /**\r
-        * unitを単位行列に初期化する。arMatrixUnitの代替品\r
-        * \r
-        * @param unit\r
-        */\r
-       public static void matrixUnit(NyARMat unit) throws NyARException\r
-       {\r
-               if (unit.row != unit.clm) {\r
-                       throw new NyARException();\r
-               }\r
-               NyARException.trap("未チェックのパス");\r
-               // For順変更禁止\r
-               for (int r = 0; r < unit.getRow(); r++) {\r
-                       for (int c = 0; c < unit.getClm(); c++) {\r
-                               if (r == c) {\r
-                                       unit.m[r][c] = 1.0;\r
-                               } else {\r
-                                       unit.m[r][c] = 0.0;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-       /**\r
-        * sourceの内容を自身に複製する。 Optimized 2008.04.19\r
-        * \r
-        * @param i_source\r
-        * @return\r
-        */\r
-       public void matrixDup(NyARMat i_source) throws NyARException\r
-       {\r
-               // 自身の配列サイズを相手のそれより大きいことを保障する。\r
-               this.realloc(i_source.row, i_source.clm);\r
-               // 内容を転写\r
-               int r, c;\r
-               double[][] src_m, dest_m;\r
-               src_m = i_source.m;\r
-               dest_m = this.m;\r
-               // コピーはFor順を変えてもOK\r
-               for (r = this.row - 1; r >= 0; r--) {\r
-                       for (c = this.clm - 1; c >= 0; c--) {\r
-                               dest_m[r][c] = src_m[r][c];\r
-                       }\r
-               }\r
-       }\r
-\r
-       public NyARMat matrixAllocDup() throws NyARException\r
-       {\r
-               NyARMat result = new NyARMat(this.row, this.clm);\r
-               // コピー\r
-               int r, c;\r
-               double[][] dest_m, src_m;\r
-               dest_m = result.m;\r
-               src_m = this.m;\r
-               // コピーはFor順を変えてもOK\r
-               for (r = this.row - 1; r >= 0; r--) {\r
-                       for (c = this.clm - 1; c >= 0; c--) {\r
-                               dest_m[r][c] = src_m[r][c];\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * arMatrixInv関数の代替品です。 destにsourceの逆行列を返します。\r
-        * \r
-        * @param dest\r
-        * @param source\r
-        * @throws NyARException\r
-        */\r
-       public static void matrixInv(NyARMat dest, NyARMat source)\r
-                       throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               dest.matrixDup(source);\r
-\r
-               NyARException.trap("未チェックのパス");\r
-               dest.matrixSelfInv();\r
-       }\r
-\r
-       public NyARMat matrixAllocInv() throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               NyARMat result = matrixAllocDup();\r
-\r
-               NyARException.trap("未チェックのパス");\r
-               result.matrixSelfInv();\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * dim x dim の単位行列を作る。\r
-        * \r
-        * @param dim\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public static NyARMat matrixAllocUnit(int dim) throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               NyARMat result = new NyARMat(dim, dim);\r
-               NyARException.trap("未チェックのパス");\r
-               NyARMat.matrixUnit(result);\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * arMatrixDispの代替品\r
-        * \r
-        * @param m\r
-        * @return\r
-        */\r
-       public int matrixDisp() throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               System.out.println(" === matrix (" + row + "," + clm + ") ===");// printf(" ===matrix (%d,%d) ===\n", m->row, m->clm);\r
-               for (int r = 0; r < row; r++) {// for(int r = 0; r < m->row; r++) {\r
-                       System.out.print(" |");// printf(" |");\r
-                       for (int c = 0; c < clm; c++) {// for(int c = 0; c < m->clm; c++) {\r
-                               System.out.print(" " + m[r][c]);// printf(" %10g", ARELEM0(m, r, c));\r
-                       }\r
-                       System.out.println(" |");// printf(" |\n");\r
-               }\r
-               System.out.println(" ======================");// printf(" ======================\n");\r
-               return 0;\r
-       }\r
-\r
-       private static final double PCA_EPS = 1e-6; // #define EPS 1e-6\r
-\r
-       private static final int PCA_MAX_ITER = 100; // #define MAX_ITER 100\r
-\r
-       private static final double PCA_VZERO = 1e-16; // #define VZERO 1e-16\r
-\r
-       /**\r
-        * static int EX( ARMat *input, ARVec *mean )の代替関数 Optimize:STEP:[144->110]\r
-        * \r
-        * @param input\r
-        * @param mean\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       private void PCA_EX(NyARVec mean) throws NyARException\r
-       {\r
-               int lrow, lclm;\r
-               int i, i2;\r
-               lrow = this.row;\r
-               lclm = this.clm;\r
-               double[][] lm = this.m;\r
-\r
-               if (lrow <= 0 || lclm <= 0) {\r
-                       throw new NyARException();\r
-               }\r
-               if (mean.getClm() != lclm) {\r
-                       throw new NyARException();\r
-               }\r
-               // double[] mean_array=mean.getArray();\r
-               // mean.zeroClear();\r
-               final double[] mean_array = mean.getArray();\r
-               double w;\r
-               // For順変更禁止\r
-               for (i2 = 0; i2 < lclm; i2++) {\r
-                       w = 0.0;\r
-                       for (i = 0; i < lrow; i++) {\r
-                               // *(v++) += *(m++);\r
-                               w += lm[i][i2];\r
-                       }\r
-                       mean_array[i2] = w / lrow;// mean->v[i] /= row;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * static int CENTER( ARMat *inout, ARVec *mean )の代替関数\r
-        * \r
-        * @param inout\r
-        * @param mean\r
-        * @return\r
-        */\r
-       private static void PCA_CENTER(NyARMat inout, NyARVec mean)throws NyARException\r
-       {\r
-               double[] v;\r
-               int row, clm;\r
-\r
-               row = inout.getRow();\r
-               clm = inout.getClm();\r
-               if (mean.getClm() != clm) {\r
-                       throw new NyARException();\r
-               }\r
-               double[][] im = inout.m;\r
-               double[] im_i;\r
-               double w0, w1;\r
-               v = mean.getArray();\r
-               // 特にパフォーマンスが劣化するclm=1と2ときだけ、別パスで処理します。\r
-               switch (clm) {\r
-               case 1:\r
-                       w0 = v[0];\r
-                       for (int i = 0; i < row; i++) {\r
-                               im[i][0] -= w0;\r
-                       }\r
-                       break;\r
-               case 2:\r
-                       w0 = v[0];\r
-                       w1 = v[1];\r
-                       for (int i = 0; i < row; i++) {\r
-                               im_i = im[i];\r
-                               im_i[0] -= w0;\r
-                               im_i[1] -= w1;\r
-                       }\r
-                       break;\r
-               default:\r
-                       for (int i = 0; i < row; i++) {\r
-                               im_i = im[i];\r
-                               for (int j = 0; j < clm; j++) {\r
-                                       // *(m++) -= *(v++);\r
-                                       im_i[j] -= v[j];\r
-                               }\r
-                       }\r
-                       break;\r
-               }\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * int x_by_xt( ARMat *input, ARMat *output )の代替関数\r
-        * \r
-        * @param input\r
-        * @param output\r
-        * @throws NyARException\r
-        */\r
-       private static void PCA_x_by_xt(NyARMat input, NyARMat output) throws NyARException\r
-       {\r
-               NyARException.trap("動作未チェック/配列化未チェック");\r
-               int row, clm;\r
-               // double[][] out;\r
-               double[] in1, in2;\r
-\r
-               NyARException.trap("未チェックのパス");\r
-               row = input.row;\r
-               clm = input.clm;\r
-               NyARException.trap("未チェックのパス");\r
-               if (output.row != row || output.clm != row) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               // out = output.getArray();\r
-               for (int i = 0; i < row; i++) {\r
-                       for (int j = 0; j < row; j++) {\r
-                               if (j < i) {\r
-                                       NyARException.trap("未チェックのパス");\r
-                                       output.m[i][j] = output.m[j][i];// *out =\r
-                                                                                                       // output->m[j*row+i];\r
-                               } else {\r
-                                       NyARException.trap("未チェックのパス");\r
-                                       in1 = input.m[i];// input.getRowArray(i);//in1 = &(input->m[clm*i]);\r
-                                       in2 = input.m[j];// input.getRowArray(j);//in2 = &(input->m[clm*j]);\r
-                                       output.m[i][j] = 0;// *out = 0.0;\r
-                                       for (int k = 0; k < clm; k++) {\r
-                                               output.m[i][j] += (in1[k] * in2[k]);// *out += *(in1++)\r
-                                                                                                                       // * *(in2++);\r
-                                       }\r
-                               }\r
-                               // out.incPtr();\r
-                       }\r
-               }\r
-       }\r
-\r
-       /**\r
-        * static int xt_by_x( ARMat *input, ARMat *output )の代替関数\r
-        * Optimize:2008.04.19\r
-        * \r
-        * @param input\r
-        * @param i_output\r
-        * @throws NyARException\r
-        */\r
-       private static void PCA_xt_by_x(NyARMat input, NyARMat i_output) throws NyARException\r
-       {\r
-               double[] in_;\r
-               int row, clm;\r
-\r
-               row = input.row;\r
-               clm = input.clm;\r
-               if (i_output.row != clm || i_output.clm != clm) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               int k, j;\r
-               double[][] out_m = i_output.m;\r
-               double w;\r
-               for (int i = 0; i < clm; i++) {\r
-                       for (j = 0; j < clm; j++) {\r
-                               if (j < i) {\r
-                                       out_m[i][j] = out_m[j][i];// *out = output->m[j*clm+i];\r
-                               } else {\r
-                                       w = 0.0;// *out = 0.0;\r
-                                       for (k = 0; k < row; k++) {\r
-                                               in_ = input.m[k];// in=input.getRowArray(k);\r
-                                               w += (in_[i] * in_[j]);// *out += *in1 * *in2;\r
-                                       }\r
-                                       out_m[i][j] = w;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-       private final NyARVec wk_PCA_QRM_ev = new NyARVec(1);\r
-\r
-       /**\r
-        * static int QRM( ARMat *a, ARVec *dv )の代替関数\r
-        * \r
-        * @param a\r
-        * @param dv\r
-        * @throws NyARException\r
-        */\r
-       private void PCA_QRM(NyARVec dv) throws NyARException\r
-       {\r
-               double w, t, s, x, y, c;\r
-               int dim, iter;\r
-               double[] dv_array = dv.getArray();\r
-\r
-               dim = this.row;\r
-               if (dim != this.clm || dim < 2) {\r
-                       throw new NyARException();\r
-               }\r
-               if (dv.getClm() != dim) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               NyARVec ev = this.wk_PCA_QRM_ev;\r
-               ev.realloc(dim);\r
-               double[] ev_array = ev.getArray();\r
-               if (ev == null) {\r
-                       throw new NyARException();\r
-               }\r
-               final double[][] L_m = this.m;\r
-               this.vecTridiagonalize(dv, ev, 1);\r
-\r
-               ev_array[0] = 0.0;// ev->v[0] = 0.0;\r
-               for (int h = dim - 1; h > 0; h--) {\r
-                       int j = h;\r
-                       while (j > 0&& Math.abs(ev_array[j]) > PCA_EPS* (Math.abs(dv_array[j - 1]) + Math.abs(dv_array[j]))) {// while(j>0 && fabs(ev->v[j]) >EPS*(fabs(dv->v[j-1])+fabs(dv->v[j])))\r
-                               // j--;\r
-                               j--;\r
-                       }\r
-                       if (j == h) {\r
-                               continue;\r
-                       }\r
-                       iter = 0;\r
-                       do {\r
-                               iter++;\r
-                               if (iter > PCA_MAX_ITER) {\r
-                                       break;\r
-                               }\r
-                               w = (dv_array[h - 1] - dv_array[h]) / 2;// w = (dv->v[h-1] -dv->v[h]) / 2;//ここ?\r
-                               t = ev_array[h] * ev_array[h];// t = ev->v[h] * ev->v[h];\r
-                               s = Math.sqrt(w * w + t);\r
-                               if (w < 0) {\r
-                                       s = -s;\r
-                               }\r
-                               x = dv_array[j] - dv_array[h] + t / (w + s);// x = dv->v[j] -dv->v[h] +t/(w+s);\r
-                               y = ev_array[j + 1];// y = ev->v[j+1];\r
-                               for (int k = j; k < h; k++) {\r
-                                       if (Math.abs(x) >= Math.abs(y)) {\r
-                                               if (Math.abs(x) > PCA_VZERO) {\r
-                                                       t = -y / x;\r
-                                                       c = 1 / Math.sqrt(t * t + 1);\r
-                                                       s = t * c;\r
-                                               } else {\r
-                                                       c = 1.0;\r
-                                                       s = 0.0;\r
-                                               }\r
-                                       } else {\r
-                                               t = -x / y;\r
-                                               s = 1.0 / Math.sqrt(t * t + 1);\r
-                                               c = t * s;\r
-                                       }\r
-                                       w = dv_array[k] - dv_array[k + 1];// w = dv->v[k] -dv->v[k+1];\r
-                                       t = (w * s + 2 * c * ev_array[k + 1]) * s;// t = (w * s +2 * c *ev->v[k+1]) *s;\r
-                                       dv_array[k] -= t;// dv->v[k] -= t;\r
-                                       dv_array[k + 1] += t;// dv->v[k+1] += t;\r
-                                       if (k > j) {\r
-                                               NyARException.trap("未チェックパス");\r
-                                               {\r
-                                                       ev_array[k] = c * ev_array[k] - s * y;// ev->v[k]= c *ev->v[k]- s * y;\r
-                                               }\r
-                                       }\r
-                                       ev_array[k + 1] += s * (c * w - 2 * s * ev_array[k + 1]);// ev->v[k+1]+= s * (c* w- 2* s *ev->v[k+1]);\r
-\r
-                                       for (int i = 0; i < dim; i++) {\r
-                                               x = L_m[k][i];// x = a->m[k*dim+i];\r
-                                               y = L_m[k + 1][i];// y = a->m[(k+1)*dim+i];\r
-                                               L_m[k][i] = c * x - s * y;// a->m[k*dim+i] = c * x - s* y;\r
-                                               L_m[k + 1][i] = s * x + c * y;// a->m[(k+1)*dim+i] = s* x + c * y;\r
-                                       }\r
-                                       if (k < h - 1) {\r
-                                               NyARException.trap("未チェックパス");\r
-                                               {\r
-                                                       x = ev_array[k + 1];// x = ev->v[k+1];\r
-                                                       y = -s * ev_array[k + 2];// y = -s * ev->v[k+2];\r
-                                                       ev_array[k + 2] *= c;// ev->v[k+2] *= c;\r
-                                               }\r
-                                       }\r
-                               }\r
-                       } while (Math.abs(ev_array[h]) > PCA_EPS\r
-                                       * (Math.abs(dv_array[h - 1]) + Math.abs(dv_array[h])));\r
-               }\r
-               for (int k = 0; k < dim - 1; k++) {\r
-                       int h = k;\r
-                       t = dv_array[h];// t = dv->v[h];\r
-                       for (int i = k + 1; i < dim; i++) {\r
-                               if (dv_array[i] > t) {// if( dv->v[i] > t ) {\r
-                                       h = i;\r
-                                       t = dv_array[h];// t = dv->v[h];\r
-                               }\r
-                       }\r
-                       dv_array[h] = dv_array[k];// dv->v[h] = dv->v[k];\r
-                       dv_array[k] = t;// dv->v[k] = t;\r
-                       this.flipRow(h, k);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * i_row_1番目の行と、i_row_2番目の行を入れ替える。\r
-        * \r
-        * @param i_row_1\r
-        * @param i_row_2\r
-        */\r
-       private void flipRow(int i_row_1, int i_row_2)\r
-       {\r
-               int i;\r
-               double w;\r
-               double[] r1 = this.m[i_row_1], r2 = this.m[i_row_2];\r
-               // For順変更OK\r
-               for (i = clm - 1; i >= 0; i--) {\r
-                       w = r1[i];\r
-                       r1[i] = r2[i];\r
-                       r2[i] = w;\r
-               }\r
-       }\r
-\r
-       /**\r
-        * static int EV_create( ARMat *input, ARMat *u, ARMat *output, ARVec *ev\r
-        * )の代替関数\r
-        * \r
-        * @param input\r
-        * @param u\r
-        * @param output\r
-        * @param ev\r
-        * @throws NyARException\r
-        */\r
-       private static void PCA_EV_create(NyARMat input, NyARMat u, NyARMat output,NyARVec ev) throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               int row, clm;\r
-               row = input.row;// row = input->row;\r
-               clm = input.clm;// clm = input->clm;\r
-               if (row <= 0 || clm <= 0) {\r
-                       throw new NyARException();\r
-               }\r
-               if (u.row != row || u.clm != row) {// if( u->row != row || u->clm !=\r
-                                                                                       // row ){\r
-                       throw new NyARException();\r
-               }\r
-               if (output.row != row || output.clm != clm) {// if( output->row !=\r
-                                                                                                               // row || output->clm !=\r
-                                                                                                               // clm ){\r
-                       throw new NyARException();\r
-               }\r
-               if (ev.getClm() != row) {// if( ev->clm != row ){\r
-                       throw new NyARException();\r
-               }\r
-               double[][] m, in_;\r
-               double[] m1, ev_array;\r
-               double sum, work;\r
-\r
-               NyARException.trap("未チェックのパス");\r
-               m = output.m;// m = output->m;\r
-               in_ = input.m;\r
-               int i;\r
-               ev_array = ev.getArray();\r
-               for (i = 0; i < row; i++) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       if (ev_array[i] < PCA_VZERO) {// if( ev->v[i] < VZERO ){\r
-                               break;\r
-                       }\r
-                       NyARException.trap("未チェックのパス");\r
-                       work = 1 / Math.sqrt(Math.abs(ev_array[i]));// work = 1 /\r
-                                                                                                               // sqrt(fabs(ev->v[i]));\r
-                       for (int j = 0; j < clm; j++) {\r
-                               sum = 0.0;\r
-                               m1 = u.m[i];// m1 = &(u->m[i*row]);\r
-                               // m2=input.getPointer(j);//m2 = &(input->m[j]);\r
-                               for (int k = 0; k < row; k++) {\r
-                                       sum += m1[k] + in_[k][j];// sum += *m1 * *m2;\r
-                                       // m1.incPtr(); //m1++;\r
-                                       // m2.addPtr(clm);//m2 += clm;\r
-                               }\r
-                               m1[j] = sum * work;// *(m++) = sum * work;\r
-                               // {//*(m++) = sum * work;\r
-                               // m.set(sum * work);\r
-                               // m.incPtr();}\r
-                       }\r
-               }\r
-               for (; i < row; i++) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       ev_array[i] = 0.0;// ev->v[i] = 0.0;\r
-                       for (int j = 0; j < clm; j++) {\r
-                               m[i][j] = 0.0;\r
-                               // m.set(0.0);//*(m++) = 0.0;\r
-                               // m.incPtr();\r
-                       }\r
-               }\r
-       }\r
-\r
-       private NyARMat wk_PCA_PCA_u = null;\r
-\r
-       /**\r
-        * static int PCA( ARMat *input, ARMat *output, ARVec *ev )\r
-        * \r
-        * @param output\r
-        * @param o_ev\r
-        * @throws NyARException\r
-        */\r
-       private void PCA_PCA(NyARMat o_output, NyARVec o_ev) throws NyARException\r
-       {\r
-\r
-               int l_row, l_clm, min;\r
-               double[] ev_array = o_ev.getArray();\r
-\r
-               l_row = this.row;// row = input->row;\r
-               l_clm = this.clm;// clm = input->clm;\r
-               min = (l_clm < l_row) ? l_clm : l_row;\r
-               if (l_row < 2 || l_clm < 2) {\r
-                       throw new NyARException();\r
-               }\r
-               if (o_output.clm != this.clm) {// if( output->clm != input->clm ){\r
-                       throw new NyARException();\r
-               }\r
-               if (o_output.row != min) {// if( output->row != min ){\r
-                       throw new NyARException();\r
-               }\r
-               if (o_ev.getClm() != min) {// if( ev->clm != min ){\r
-                       throw new NyARException();\r
-               }\r
-\r
-               NyARMat u;// u =new NyARMat( min, min );\r
-               if (this.wk_PCA_PCA_u == null) {\r
-                       u = new NyARMat(min, min);\r
-                       this.wk_PCA_PCA_u = u;\r
-               } else {\r
-                       u = this.wk_PCA_PCA_u;\r
-                       u.realloc(min, min);\r
-               }\r
-\r
-               if (l_row < l_clm) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       PCA_x_by_xt(this, u);// if(x_by_xt( input, u ) < 0 ) {\r
-               } else {\r
-                       PCA_xt_by_x(this, u);// if(xt_by_x( input, u ) < 0 ) {\r
-               }\r
-               u.PCA_QRM(o_ev);\r
-\r
-               double[][] m1, m2;\r
-               if (l_row < l_clm) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       PCA_EV_create(this, u, o_output, o_ev);\r
-               } else {\r
-                       m1 = u.m;// m1 = u->m;\r
-                       m2 = o_output.m;// m2 = output->m;\r
-                       int i;\r
-                       for (i = 0; i < min; i++) {\r
-                               if (ev_array[i] < PCA_VZERO) {// if( ev->v[i] < VZERO ){\r
-                                       break;\r
-                               }\r
-                               for (int j = 0; j < min; j++) {\r
-                                       m2[i][j] = m1[i][j];// *(m2++) = *(m1++);\r
-                               }\r
-                       }\r
-                       for (; i < min; i++) {// for( ; i < min; i++){\r
-                               // コードを見た限りあってそうだからコメントアウト(2008/03/26)NyARException.trap("未チェックのパス");\r
-                               ev_array[i] = 0.0;// ev->v[i] = 0.0;\r
-                               for (int j = 0; j < min; j++) {\r
-                                       m2[i][j] = 0.0;// *(m2++) = 0.0;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-\r
-       private NyARMat wk_work_matrixPCA = null;\r
-\r
-       /**\r
-        * int arMatrixPCA( ARMat *input, ARMat *evec, ARVec *ev, ARVec *mean );\r
-        * 関数の置き換え。input引数がthisになる。 Optimize:2008.04.19\r
-        * \r
-        * @param o_evec\r
-        * @param o_ev\r
-        * \r
-        * @param mean\r
-        * @throws NyARException\r
-        */\r
-       public void matrixPCA(NyARMat o_evec, NyARVec o_ev, NyARVec mean)throws NyARException\r
-       {\r
-               double srow, sum;\r
-               int l_row, l_clm;\r
-               int check;\r
-\r
-               l_row = this.row;// row = input->row;\r
-               l_clm = this.clm;// clm = input->clm;\r
-               check = (l_row < l_clm) ? l_row : l_clm;\r
-               if (l_row < 2 || l_clm < 2) {\r
-                       throw new NyARException();\r
-               }\r
-               if (o_evec.clm != l_clm || o_evec.row != check) {// if( evec->clm !=\r
-                                                                                                                       // input->clm ||\r
-                                                                                                                       // evec->row !=\r
-                                                                                                                       // check ){\r
-                       throw new NyARException();\r
-               }\r
-               if (o_ev.getClm() != check) {// if( ev->clm != check ){\r
-                       throw new NyARException();\r
-               }\r
-               if (mean.getClm() != l_clm) {// if( mean->clm != input->clm ){\r
-                       throw new NyARException();\r
-               }\r
-\r
-               // 自分の内容をワークにコピー(高速化の為に、1度作ったインスタンスは使いまわす)\r
-               NyARMat work;\r
-               if (this.wk_work_matrixPCA == null) {\r
-                       work = this.matrixAllocDup();\r
-                       this.wk_work_matrixPCA = work;\r
-               } else {\r
-                       work = this.wk_work_matrixPCA;\r
-                       work.matrixDup(this);// arMatrixAllocDup( input );work =\r
-                                                                       // arMatrixAllocDup( input );\r
-               }\r
-\r
-               srow = Math.sqrt((double) l_row);\r
-               work.PCA_EX(mean);\r
-\r
-               PCA_CENTER(work, mean);\r
-\r
-               int i, j;\r
-               // For順変更OK\r
-               for (i = 0; i < l_row; i++) {\r
-                       for (j = 0; j < l_clm; j++) {\r
-                               work.m[i][j] /= srow;// work->m[i] /= srow;\r
-                       }\r
-               }\r
-\r
-               work.PCA_PCA(o_evec, o_ev);\r
-\r
-               sum = 0.0;\r
-               double[] ev_array = o_ev.getArray();\r
-               int ev_clm = o_ev.getClm();\r
-               // For順変更禁止\r
-               for (i = 0; i < ev_clm; i++) {// for(int i = 0; i < ev->clm; i++ ){\r
-                       sum += ev_array[i];// sum += ev->v[i];\r
-               }\r
-               // For順変更禁止\r
-               for (i = 0; i < ev_clm; i++) {// for(int i = 0; i < ev->clm; i++ ){\r
-                       ev_array[i] /= sum;// ev->v[i] /= sum;\r
-               }\r
-       }\r
-\r
-       /* int arMatrixPCA2( ARMat *input, ARMat *evec, ARVec *ev ); */\r
-       public static void arMatrixPCA2(NyARMat input, NyARMat evec, NyARVec ev) throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               NyARMat work;\r
-               // double srow; // unreferenced\r
-               double sum;\r
-               int row, clm;\r
-               int check;\r
-\r
-               row = input.row;// row = input->row;\r
-               clm = input.clm;// clm = input->clm;\r
-               check = (row < clm) ? row : clm;\r
-               if (row < 2 || clm < 2) {\r
-                       throw new NyARException();\r
-               }\r
-               if (evec.getClm() != input.clm || evec.row != check) {// if( evec->clm!= input->clm|| evec->row!= check ){\r
-                       throw new NyARException();\r
-               }\r
-               if (ev.getClm() != check) {// if( ev->clm != check ){\r
-                       throw new NyARException();\r
-               }\r
-\r
-               NyARException.trap("未チェックのパス");\r
-               work = input.matrixAllocDup();\r
-\r
-               NyARException.trap("未チェックパス");\r
-               work.PCA_PCA(evec, ev);// rval = PCA( work, evec, ev );\r
-               sum = 0.0;\r
-               double[] ev_array = ev.getArray();\r
-               for (int i = 0; i < ev.getClm(); i++) {// for( i = 0; i < ev->clm; i++\r
-                                                                                               // ){\r
-                       NyARException.trap("未チェックパス");\r
-                       sum += ev_array[i];// sum += ev->v[i];\r
-               }\r
-               for (int i = 0; i < ev.getClm(); i++) {// for(int i = 0; i < ev->clm;i++ ){\r
-                       NyARException.trap("未チェックパス");\r
-                       ev_array[i] /= sum;// ev->v[i] /= sum;\r
-               }\r
-               return;\r
-       }\r
-\r
-       public static NyARMat matrixAllocMul(NyARMat a, NyARMat b) throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               NyARMat dest = new NyARMat(a.row, b.clm);\r
-               NyARException.trap("未チェックのパス");\r
-               dest.matrixMul(a, b);\r
-               return dest;\r
-       }\r
-\r
-       /* static double mdet(double *ap, int dimen, int rowa) */\r
-       private static double Det_mdet(double[][] ap, int dimen, int rowa) throws NyARException\r
-       {\r
-               NyARException.trap("動作未チェック/配列化未チェック");\r
-               double det = 1.0;\r
-               double work;\r
-               int is_ = 0;\r
-               int mmax;\r
-\r
-               for (int k = 0; k < dimen - 1; k++) {\r
-                       mmax = k;\r
-                       for (int i = k + 1; i < dimen; i++) {\r
-                               // if (Math.abs(arMatrixDet_MATRIX_get(ap, i, k, rowa)) >\r
-                               // Math.abs(arMatrixDet_MATRIX_get(ap, mmax, k, rowa))){\r
-                               if (Math.abs(ap[i][k]) > Math.abs(ap[mmax][k])) {\r
-                                       mmax = i;\r
-                               }\r
-                       }\r
-                       if (mmax != k) {\r
-                               for (int j = k; j < dimen; j++) {\r
-                                       work = ap[k][j];// work = MATRIX(ap, k, j, rowa);\r
-                                       ap[k][j] = ap[mmax][j];// MATRIX(ap, k, j, rowa) =MATRIX(ap, mmax, j, rowa);\r
-                                       ap[mmax][j] = work;// MATRIX(ap, mmax, j, rowa) = work;\r
-                               }\r
-                               is_++;\r
-                       }\r
-                       for (int i = k + 1; i < dimen; i++) {\r
-                               work = ap[i][k] / ap[k][k];// work = arMatrixDet_MATRIX_get(ap,i, k, rowa) /arMatrixDet_MATRIX_get(ap, k, k,rowa);\r
-                               for (int j = k + 1; j < dimen; j++) {\r
-                                       // MATRIX(ap, i, j, rowa) -= work * MATRIX(ap, k, j, rowa);\r
-                                       ap[i][j] -= work * ap[k][j];\r
-                               }\r
-                       }\r
-               }\r
-               for (int i = 0; i < dimen; i++) {\r
-                       det = ap[i][i];// det *= MATRIX(ap, i, i, rowa);\r
-               }\r
-               for (int i = 0; i < is_; i++) {\r
-                       det *= -1.0;\r
-               }\r
-               return det;\r
-       }\r
-\r
-       /* double arMatrixDet(ARMat *m); */\r
-       public static double arMatrixDet(NyARMat m) throws NyARException\r
-       {\r
-               NyARException.trap("動作未チェック/配列化未チェック");\r
-               if (m.row != m.clm) {\r
-                       return 0.0;\r
-               }\r
-               return Det_mdet(m.getArray(), m.row, m.clm);// return mdet(m->m, m->row,m->row);\r
-       }\r
-\r
-       private final NyARVec wk_vecTridiagonalize_vec = new NyARVec(0);\r
-\r
-       private final NyARVec wk_vecTridiagonalize_vec2 = new NyARVec(0);\r
-\r
-       /**\r
-        * arVecTridiagonalize関数の代替品 a,d,e間で演算をしてる。何をどうしているかはさっぱりさっぱり\r
-        * \r
-        * @param a\r
-        * @param d\r
-        * @param e\r
-        * @param i_e_start\r
-        *            演算開始列(よくわからないけどarVecTridiagonalizeの呼び出し元でなんかしてる)\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       private void vecTridiagonalize(NyARVec d, NyARVec e, int i_e_start)throws NyARException\r
-       {\r
-               NyARVec vec = wk_vecTridiagonalize_vec;\r
-               // double[][] a_array=a.getArray();\r
-               double s, t, p, q;\r
-               int dim;\r
-\r
-               if (this.clm != this.row) {// if(a.getClm()!=a.getRow()){\r
-                       throw new NyARException();\r
-               }\r
-               if (this.clm != d.getClm()) {// if(a.getClm() != d.clm){\r
-                       throw new NyARException();\r
-               }\r
-               if (this.clm != e.getClm()) {// if(a.getClm() != e.clm){\r
-                       throw new NyARException();\r
-               }\r
-               dim = this.getClm();\r
-\r
-               double[] d_vec, e_vec;\r
-               d_vec = d.getArray();\r
-               e_vec = e.getArray();\r
-               double[] a_vec_k;\r
-\r
-               for (int k = 0; k < dim - 2; k++) {\r
-\r
-                       a_vec_k = this.m[k];\r
-                       vec.setNewArray(a_vec_k, clm);// vec=this.getRowVec(k);//double[]\r
-                                                                                       // vec_array=vec.getArray();\r
-                       NyARException.trap("未チェックパス");\r
-                       d_vec[k] = a_vec_k[k];// d.v[k]=vec.v[k];//d.set(k,v.get(k));\r
-                                                                       // //d->v[k] = v[k];\r
-\r
-                       // wv1.clm = dim-k-1;\r
-                       // wv1.v = &(v[k+1]);\r
-                       NyARException.trap("未チェックパス");\r
-                       e_vec[k + i_e_start] = vec.vecHousehold(k + 1);// e.v[k+i_e_start]=vec.vecHousehold(k+1);//e->v[k]= arVecHousehold(&wv1);\r
-                       if (e_vec[k + i_e_start] == 0.0) {// if(e.v[k+i_e_start]== 0.0){//if(e.v[k+i_e_start]== 0.0){\r
-                               continue;\r
-                       }\r
-\r
-                       for (int i = k + 1; i < dim; i++) {\r
-                               s = 0.0;\r
-                               for (int j = k + 1; j < i; j++) {\r
-                                       NyARException.trap("未チェックのパス");\r
-                                       s += this.m[j][i] * a_vec_k[j];// s += a_array[j][i] *vec.v[j];//s +=a.get(j*dim+i) *v.get(j);//s +=a->m[j*dim+i] * v[j];\r
-                               }\r
-                               for (int j = i; j < dim; j++) {\r
-                                       NyARException.trap("未チェックのパス");\r
-                                       s += this.m[i][j] * a_vec_k[j];// s += a_array[i][j] *vec.v[j];//s +=a.get(i*dim+j) *v.get(j);//s +=a->m[i*dim+j] * v[j];\r
-                               }\r
-                               NyARException.trap("未チェックのパス");\r
-                               d_vec[i] = s;// d.v[i]=s;//d->v[i] = s;\r
-                       }\r
-\r
-                       // wv1.clm = wv2.clm = dim-k-1;\r
-                       // wv1.v = &(v[k+1]);\r
-                       // wv2.v = &(d->v[k+1]);\r
-                       a_vec_k = this.m[k];\r
-                       vec.setNewArray(a_vec_k, clm);// vec=this.getRowVec(k);\r
-                       // vec_array=vec.getArray();\r
-                       NyARException.trap("未チェックパス");\r
-                       t = vec.vecInnerproduct(d, k + 1) / 2;\r
-                       for (int i = dim - 1; i > k; i--) {\r
-                               NyARException.trap("未チェックパス");\r
-                               p = a_vec_k[i];// p = v.get(i);//p = v[i];\r
-                               d_vec[i] -= t * p;\r
-                               q = d_vec[i];// d.v[i]-=t*p;q=d.v[i];//q = d->v[i] -= t*p;\r
-                               for (int j = i; j < dim; j++) {\r
-                                       NyARException.trap("未チェックパス");\r
-                                       this.m[i][j] -= p * (d_vec[j] + q * a_vec_k[j]);// a.m[i][j]-=p*(d.v[j] +q*vec.v[j]);//a->m[i*dim+j] -=p*(d->v[j]) + q*v[j];\r
-                               }\r
-                       }\r
-               }\r
-\r
-               if (dim >= 2) {\r
-                       d_vec[dim - 2] = this.m[dim - 2][dim - 2];// d.v[dim-2]=a.m[dim-2][dim-2];//d->v[dim-2]=a->m[(dim-2)*dim+(dim-2)];\r
-                       e_vec[dim - 2 + i_e_start] = this.m[dim - 2][dim - 1];// e.v[dim-2+i_e_start]=a.m[dim-2][dim-1];//e->v[dim-2] = a->m[(dim-2)*dim+(dim-1)];\r
-               }\r
-\r
-               if (dim >= 1) {\r
-                       d_vec[dim - 1] = this.m[dim - 1][dim - 1];// d.v[dim-1]=a_array[dim-1][dim-1];//d->v[dim-1] =a->m[(dim-1)*dim+(dim-1)];\r
-               }\r
-               NyARVec vec2 = this.wk_vecTridiagonalize_vec2;\r
-               for (int k = dim - 1; k >= 0; k--) {\r
-                       a_vec_k = this.m[k];\r
-                       vec.setNewArray(a_vec_k, clm);// vec=this.getRowVec(k);//v =a.getPointer(k*dim);//v = &(a->m[k*dim]);\r
-                       if (k < dim - 2) {\r
-                               for (int i = k + 1; i < dim; i++) {\r
-                                       // wv1.clm = wv2.clm = dim-k-1;\r
-                                       // wv1.v = &(v[k+1]);\r
-                                       // wv2.v = &(a->m[i*dim+k+1]);\r
-                                       vec2.setNewArray(this.m[i], clm);// vec2=this.getRowVec(i);\r
-\r
-                                       t = vec.vecInnerproduct(vec2, k + 1);\r
-                                       for (int j = k + 1; j < dim; j++) {\r
-                                               NyARException.trap("未チェックパス");\r
-                                               this.m[i][j] -= t * a_vec_k[j];// a_array[i][j]-=t*vec.v[j];//a.subValue(i*dim+j,t*v.get(j));//a->m[i*dim+j]-= t * v[j];\r
-                                       }\r
-                               }\r
-                       }\r
-                       for (int i = 0; i < dim; i++) {\r
-                               a_vec_k[i] = 0.0;// v.set(i,0.0);//v[i] = 0.0;\r
-                       }\r
-                       a_vec_k[k] = 1;// v.set(k,1);//v[k] = 1;\r
-               }\r
-               return;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquare.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquare.java
deleted file mode 100644 (file)
index 78f18e9..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * ARMarkerInfoに相当するクラス。 矩形情報を保持します。\r
- * \r
- */\r
-public class NyARSquare\r
-{\r
-       public NyARLinear[] line = new NyARLinear[4];\r
-       public NyARDoublePoint2d[] sqvertex = new NyARDoublePoint2d[4];\r
-       public NyARIntPoint[] imvertex = new NyARIntPoint[4];\r
-       public NyARSquare()\r
-       {\r
-               for(int i=0;i<4;i++){\r
-                       this.sqvertex[i]=new NyARDoublePoint2d();\r
-                       this.imvertex[i]=new NyARIntPoint();\r
-                       this.line[i]=new NyARLinear();\r
-               }\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareDetector.java
deleted file mode 100644 (file)
index 5ffcb5f..0000000
+++ /dev/null
@@ -1,525 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.labeling.*;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.param.*;\r
-\r
-\r
-\r
-\r
-\r
-/**\r
- * イメージから正方形候補を検出するクラス。\r
- * このクラスは、arDetectMarker2.cとの置き換えになります。\r
- * \r
- */\r
-public class NyARSquareDetector implements INyARSquareDetector\r
-{\r
-       private static final double VERTEX_FACTOR = 1.0;// 線検出のファクタ\r
-\r
-       private static final int AR_AREA_MAX = 100000;// #define AR_AREA_MAX 100000\r
-\r
-       private static final int AR_AREA_MIN = 70;// #define AR_AREA_MIN 70\r
-       private final int _width;\r
-       private final int _height;\r
-\r
-       private final NyARLabeling_ARToolKit _labeling;\r
-\r
-       private final NyARLabelingImage _limage;\r
-\r
-       private final OverlapChecker _overlap_checker = new OverlapChecker();\r
-       private final NyARCameraDistortionFactor _dist_factor_ref;\r
-\r
-       /**\r
-        * 最大i_squre_max個のマーカーを検出するクラスを作成する。\r
-        * \r
-        * @param i_param\r
-        */\r
-       public NyARSquareDetector(NyARCameraDistortionFactor i_dist_factor_ref,NyARIntSize i_size) throws NyARException\r
-       {\r
-               this._width = i_size.w;\r
-               this._height = i_size.h;\r
-               this._dist_factor_ref = i_dist_factor_ref;\r
-               this._labeling = new NyARLabeling_ARToolKit();\r
-               this._limage = new NyARLabelingImage(this._width, this._height);\r
-               this._labeling.attachDestination(this._limage);\r
-\r
-               // 輪郭の最大長は画面に映りうる最大の長方形サイズ。\r
-               int number_of_coord = (this._width + this._height) * 2;\r
-\r
-               // 輪郭バッファは頂点変換をするので、輪郭バッファの2倍取る。\r
-               this._max_coord = number_of_coord;\r
-               this._xcoord = new int[number_of_coord * 2];\r
-               this._ycoord = new int[number_of_coord * 2];\r
-       }\r
-\r
-       private final int _max_coord;\r
-       private final int[] _xcoord;\r
-       private final int[] _ycoord;\r
-\r
-       private void normalizeCoord(int[] i_coord_x, int[] i_coord_y, int i_index, int i_coord_num)\r
-       {\r
-               // vertex1を境界にして、後方に配列を連結\r
-               System.arraycopy(i_coord_x, 1, i_coord_x, i_coord_num, i_index);\r
-               System.arraycopy(i_coord_y, 1, i_coord_y, i_coord_num, i_index);\r
-       }\r
-\r
-       private final int[] __detectMarker_mkvertex = new int[5];\r
-\r
-       /**\r
-        * ARMarkerInfo2 *arDetectMarker2( ARInt16 *limage, int label_num, int *label_ref,int *warea, double *wpos, int *wclip,int area_max, int area_min, double\r
-        * factor, int *marker_num ) 関数の代替品 ラベリング情報からマーカー一覧を作成してo_marker_listを更新します。 関数はo_marker_listに重なりを除外したマーカーリストを作成します。\r
-        * \r
-        * @param i_raster\r
-        * 解析する2値ラスタイメージを指定します。\r
-        * @param o_square_stack\r
-        * 抽出した正方形候補を格納するリスト\r
-        * @throws NyARException\r
-        */\r
-       public final void detectMarker(NyARBinRaster i_raster, NyARSquareStack o_square_stack) throws NyARException\r
-       {\r
-               final INyARLabeling labeling_proc = this._labeling;\r
-               final NyARLabelingImage limage = this._limage;\r
-\r
-               // 初期化\r
-\r
-               // マーカーホルダをリセット\r
-               o_square_stack.clear();\r
-\r
-               // ラベリング\r
-               labeling_proc.labeling(i_raster);\r
-\r
-               // ラベル数が0ならここまで\r
-               final int label_num = limage.getLabelStack().getLength();\r
-               if (label_num < 1) {\r
-                       return;\r
-               }\r
-\r
-               final NyARLabelingLabelStack stack = limage.getLabelStack();\r
-               final NyARLabelingLabel[] labels = (NyARLabelingLabel[])stack.getArray();\r
-               \r
-               \r
-               // ラベルを大きい順に整列\r
-               stack.sortByArea();\r
-\r
-               // デカいラベルを読み飛ばし\r
-               int i;\r
-               for (i = 0; i < label_num; i++) {\r
-                       // 検査対象内のラベルサイズになるまで無視\r
-                       if (labels[i].area <= AR_AREA_MAX) {\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               final int xsize = this._width;\r
-               final int ysize = this._height;\r
-               final int[] xcoord = this._xcoord;\r
-               final int[] ycoord = this._ycoord;\r
-               final int coord_max = this._max_coord;\r
-               final int[] mkvertex = this.__detectMarker_mkvertex;\r
-               final OverlapChecker overlap = this._overlap_checker;\r
-               int coord_num;\r
-               int label_area;\r
-               NyARLabelingLabel label_pt;\r
-\r
-               //重なりチェッカの最大数を設定\r
-               overlap.reset(label_num);\r
-\r
-               for (; i < label_num; i++) {\r
-                       label_pt = labels[i];\r
-                       label_area = label_pt.area;\r
-                       // 検査対象サイズよりも小さくなったら終了\r
-                       if (label_area < AR_AREA_MIN) {\r
-                               break;\r
-                       }\r
-                       // クリップ領域が画面の枠に接していれば除外\r
-                       if (label_pt.clip_l == 1 || label_pt.clip_r == xsize - 2) {// if(wclip[i*4+0] == 1 || wclip[i*4+1] ==xsize-2){\r
-                               continue;\r
-                       }\r
-                       if (label_pt.clip_t == 1 || label_pt.clip_b == ysize - 2) {// if( wclip[i*4+2] == 1 || wclip[i*4+3] ==ysize-2){\r
-                               continue;\r
-                       }\r
-                       // 既に検出された矩形との重なりを確認\r
-                       if (!overlap.check(label_pt)) {\r
-                               // 重なっているようだ。\r
-                               continue;\r
-                       }\r
-\r
-                       // 輪郭を取得\r
-                       coord_num = limage.getContour(i, coord_max, xcoord, ycoord);\r
-                       if (coord_num == coord_max) {\r
-                               // 輪郭が大きすぎる。\r
-                               continue;\r
-                       }\r
-                       //頂点候補のインデクスを取得\r
-                       final int vertex1 = scanVertex(xcoord, ycoord, coord_num);\r
-\r
-                       // 頂点候補(vertex1)を先頭に並べなおした配列を作成する。\r
-                       normalizeCoord(xcoord, ycoord, vertex1, coord_num);\r
-\r
-                       // 領域を準備する。\r
-                       NyARSquare square_ptr = (NyARSquare)o_square_stack.prePush();\r
-\r
-                       // 頂点情報を取得\r
-                       if (!getSquareVertex(xcoord, ycoord, vertex1, coord_num, label_area, mkvertex)) {\r
-                               o_square_stack.pop();// 頂点の取得が出来なかったので破棄\r
-                               continue;\r
-                       }\r
-\r
-                       if (!getSquareLine(mkvertex, xcoord, ycoord, square_ptr)) {\r
-                               // 矩形が成立しなかった。\r
-                               o_square_stack.pop();\r
-                               continue;\r
-                       }\r
-                       // 検出済の矩形の属したラベルを重なりチェックに追加する。\r
-                       overlap.push(label_pt);\r
-               }       \r
-               return;\r
-       }\r
-\r
-       /**\r
-        * 辺からの対角線が最長になる点を対角線候補として返す。\r
-        * \r
-        * @param i_xcoord\r
-        * @param i_ycoord\r
-        * @param i_coord_num\r
-        * @return\r
-        */\r
-       private int scanVertex(int[] i_xcoord, int[] i_ycoord, int i_coord_num)\r
-       {\r
-               final int sx = i_xcoord[0];\r
-               final int sy = i_ycoord[0];\r
-               int d = 0;\r
-               int w, x, y;\r
-               int ret = 0;\r
-               for (int i = 1; i < i_coord_num; i++) {\r
-                       x = i_xcoord[i] - sx;\r
-                       y = i_ycoord[i] - sy;\r
-                       w = x * x + y * y;\r
-                       if (w > d) {\r
-                               d = w;\r
-                               ret = i;\r
-                       }\r
-                       // ここでうまく終了条件入れられないかな。\r
-               }\r
-               return ret;\r
-       }\r
-\r
-       private final NyARVertexCounter __getSquareVertex_wv1 = new NyARVertexCounter();\r
-\r
-       private final NyARVertexCounter __getSquareVertex_wv2 = new NyARVertexCounter();\r
-\r
-       /**\r
-        * static int arDetectMarker2_check_square( int area, ARMarkerInfo2 *marker_info2, double factor ) 関数の代替関数 OPTIMIZED STEP [450->415] o_squareに頂点情報をセットします。\r
-        * \r
-        * @param i_x_coord\r
-        * @param i_y_coord\r
-        * @param i_vertex1_index\r
-        * @param i_coord_num\r
-        * @param i_area\r
-        * @param o_vertex\r
-        * 要素数はint[4]である事\r
-        * @return\r
-        */\r
-       private boolean getSquareVertex(int[] i_x_coord, int[] i_y_coord, int i_vertex1_index, int i_coord_num, int i_area, int[] o_vertex)\r
-       {\r
-               final NyARVertexCounter wv1 = this.__getSquareVertex_wv1;\r
-               final NyARVertexCounter wv2 = this.__getSquareVertex_wv2;\r
-               final int end_of_coord = i_vertex1_index + i_coord_num - 1;\r
-               final int sx = i_x_coord[i_vertex1_index];// sx = marker_info2->x_coord[0];\r
-               final int sy = i_y_coord[i_vertex1_index];// sy = marker_info2->y_coord[0];\r
-               int dmax = 0;\r
-               int v1 = i_vertex1_index;\r
-               for (int i = 1 + i_vertex1_index; i < end_of_coord; i++) {// for(i=1;i<marker_info2->coord_num-1;i++)\r
-                       // {\r
-                       final int d = (i_x_coord[i] - sx) * (i_x_coord[i] - sx) + (i_y_coord[i] - sy) * (i_y_coord[i] - sy);\r
-                       if (d > dmax) {\r
-                               dmax = d;\r
-                               v1 = i;\r
-                       }\r
-               }\r
-               final double thresh = (i_area / 0.75) * 0.01 * VERTEX_FACTOR;\r
-\r
-               o_vertex[0] = i_vertex1_index;\r
-\r
-               if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v1, thresh)) { // if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,0,v1,thresh,wv1,&wvnum1)<\r
-                                                                                                                                                                       // 0 ) {\r
-                       return false;\r
-               }\r
-               if (!wv2.getVertex(i_x_coord, i_y_coord, v1, end_of_coord, thresh)) {// if(get_vertex(marker_info2->x_coord,marker_info2->y_coord,v1,marker_info2->coord_num-1,thresh,wv2,&wvnum2)\r
-                       // < 0) {\r
-                       return false;\r
-               }\r
-\r
-               int v2;\r
-               if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {// if(wvnum1 == 1 && wvnum2== 1) {\r
-                       o_vertex[1] = wv1.vertex[0];\r
-                       o_vertex[2] = v1;\r
-                       o_vertex[3] = wv2.vertex[0];\r
-               } else if (wv1.number_of_vertex > 1 && wv2.number_of_vertex == 0) {// }else if( wvnum1 > 1 && wvnum2== 0) {\r
-                       //頂点位置を、起点から対角点の間の1/2にあると予想して、検索する。\r
-                       v2 = (v1-i_vertex1_index)/2+i_vertex1_index;\r
-                       if (!wv1.getVertex(i_x_coord, i_y_coord, i_vertex1_index, v2, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (!wv2.getVertex(i_x_coord, i_y_coord, v2, v1, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {\r
-                               o_vertex[1] = wv1.vertex[0];\r
-                               o_vertex[2] = wv2.vertex[0];\r
-                               o_vertex[3] = v1;\r
-                       } else {\r
-                               return false;\r
-                       }\r
-               } else if (wv1.number_of_vertex == 0 && wv2.number_of_vertex > 1) {\r
-                       //v2 = (v1-i_vertex1_index+ end_of_coord-i_vertex1_index) / 2+i_vertex1_index;\r
-                       v2 = (v1+ end_of_coord)/2;\r
-\r
-                       if (!wv1.getVertex(i_x_coord, i_y_coord, v1, v2, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (!wv2.getVertex(i_x_coord, i_y_coord, v2, end_of_coord, thresh)) {\r
-                               return false;\r
-                       }\r
-                       if (wv1.number_of_vertex == 1 && wv2.number_of_vertex == 1) {\r
-                               o_vertex[1] = v1;\r
-                               o_vertex[2] = wv1.vertex[0];\r
-                               o_vertex[3] = wv2.vertex[0];\r
-                       } else {\r
-                               return false;\r
-                       }\r
-               } else {\r
-                       return false;\r
-               }\r
-               o_vertex[4] = end_of_coord;\r
-               return true;\r
-       }\r
-\r
-       private final NyARMat __getSquareLine_input = new NyARMat(1, 2);\r
-\r
-       private final NyARMat __getSquareLine_evec = new NyARMat(2, 2);\r
-\r
-       private final NyARVec __getSquareLine_ev = new NyARVec(2);\r
-\r
-       private final NyARVec __getSquareLine_mean = new NyARVec(2);\r
-\r
-       /**\r
-        * arGetLine(int x_coord[], int y_coord[], int coord_num,int vertex[], double line[4][3], double v[4][2]) arGetLine2(int x_coord[], int y_coord[], int\r
-        * coord_num,int vertex[], double line[4][3], double v[4][2], double *dist_factor) の2関数の合成品です。 マーカーのvertex,lineを計算して、結果をo_squareに保管します。\r
-        * Optimize:STEP[424->391]\r
-        * \r
-        * @param i_cparam\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       private boolean getSquareLine(int[] i_mkvertex, int[] i_xcoord, int[] i_ycoord, NyARSquare o_square) throws NyARException\r
-       {\r
-               final NyARLinear[] l_line = o_square.line;\r
-               final NyARVec ev = this.__getSquareLine_ev; // matrixPCAの戻り値を受け取る\r
-               final NyARVec mean = this.__getSquareLine_mean;// matrixPCAの戻り値を受け取る\r
-               final double[] mean_array = mean.getArray();\r
-               final NyARCameraDistortionFactor dist_factor=this._dist_factor_ref;  \r
-               final NyARMat input = this.__getSquareLine_input;// 次処理で初期化される。\r
-               final NyARMat evec = this.__getSquareLine_evec;// アウトパラメータを受け取るから初期化不要//new NyARMat(2,2);\r
-               final double[][] evec_array = evec.getArray();\r
-               for (int i = 0; i < 4; i++) {\r
-                       final double w1 = (double) (i_mkvertex[i + 1] - i_mkvertex[i] + 1) * 0.05 + 0.5;\r
-                       final int st = (int) (i_mkvertex[i] + w1);\r
-                       final int ed = (int) (i_mkvertex[i + 1] - w1);\r
-                       final int n = ed - st + 1;\r
-                       if (n < 2) {\r
-                               // nが2以下でmatrix.PCAを計算することはできないので、エラー\r
-                               return false;\r
-                       }\r
-                       // pcaの準備\r
-                       input.realloc(n, 2);\r
-                       // バッチ取得\r
-                       dist_factor.observ2IdealBatch(i_xcoord, i_ycoord, st, n, input.getArray());\r
-\r
-                       // 主成分分析\r
-                       input.matrixPCA(evec, ev, mean);\r
-                       final NyARLinear l_line_i = l_line[i];\r
-                       l_line_i.run = evec_array[0][1];// line[i][0] = evec->m[1];\r
-                       l_line_i.rise = -evec_array[0][0];// line[i][1] = -evec->m[0];\r
-                       l_line_i.intercept = -(l_line_i.run * mean_array[0] + l_line_i.rise * mean_array[1]);// line[i][2] = -(line[i][0]*mean->v[0] + line[i][1]*mean->v[1]);\r
-               }\r
-\r
-               final NyARDoublePoint2d[] l_sqvertex = o_square.sqvertex;\r
-               final NyARIntPoint[] l_imvertex = o_square.imvertex;\r
-               for (int i = 0; i < 4; i++) {\r
-                       final NyARLinear l_line_i = l_line[i];\r
-                       final NyARLinear l_line_2 = l_line[(i + 3) % 4];\r
-                       final double w1 = l_line_2.run * l_line_i.rise - l_line_i.run * l_line_2.rise;\r
-                       if (w1 == 0.0) {\r
-                               return false;\r
-                       }\r
-                       l_sqvertex[i].x = (l_line_2.rise * l_line_i.intercept - l_line_i.rise * l_line_2.intercept) / w1;\r
-                       l_sqvertex[i].y = (l_line_i.run * l_line_2.intercept - l_line_2.run * l_line_i.intercept) / w1;\r
-                       // 頂点インデクスから頂点座標を得て保存\r
-                       l_imvertex[i].x = i_xcoord[i_mkvertex[i]];\r
-                       l_imvertex[i].y = i_ycoord[i_mkvertex[i]];\r
-               }\r
-               return true;\r
-       }\r
-}\r
-\r
-/**\r
- * get_vertex関数を切り離すためのクラス\r
- * \r
- */\r
-final class NyARVertexCounter\r
-{\r
-       public final int[] vertex = new int[10];// 5まで削れる\r
-\r
-       public int number_of_vertex;\r
-\r
-       private double thresh;\r
-\r
-       private int[] x_coord;\r
-\r
-       private int[] y_coord;\r
-\r
-       public boolean getVertex(int[] i_x_coord, int[] i_y_coord, int st, int ed, double i_thresh)\r
-       {\r
-               this.number_of_vertex = 0;\r
-               this.thresh = i_thresh;\r
-               this.x_coord = i_x_coord;\r
-               this.y_coord = i_y_coord;\r
-               return get_vertex(st, ed);\r
-       }\r
-\r
-       /**\r
-        * static int get_vertex( int x_coord[], int y_coord[], int st, int ed,double thresh, int vertex[], int *vnum) 関数の代替関数\r
-        * \r
-        * @param x_coord\r
-        * @param y_coord\r
-        * @param st\r
-        * @param ed\r
-        * @param thresh\r
-        * @return\r
-        */\r
-       private boolean get_vertex(int st, int ed)\r
-       {\r
-               int v1 = 0;\r
-               final int[] lx_coord = this.x_coord;\r
-               final int[] ly_coord = this.y_coord;\r
-               final double a = ly_coord[ed] - ly_coord[st];\r
-               final double b = lx_coord[st] - lx_coord[ed];\r
-               final double c = lx_coord[ed] * ly_coord[st] - ly_coord[ed] * lx_coord[st];\r
-               double dmax = 0;\r
-               for (int i = st + 1; i < ed; i++) {\r
-                       final double d = a * lx_coord[i] + b * ly_coord[i] + c;\r
-                       if (d * d > dmax) {\r
-                               dmax = d * d;\r
-                               v1 = i;\r
-                       }\r
-               }\r
-               if (dmax / (a * a + b * b) > thresh) {\r
-                       if (!get_vertex(st, v1)) {\r
-                               return false;\r
-                       }\r
-                       if (number_of_vertex > 5) {\r
-                               return false;\r
-                       }\r
-                       vertex[number_of_vertex] = v1;// vertex[(*vnum)] = v1;\r
-                       number_of_vertex++;// (*vnum)++;\r
-\r
-                       if (!get_vertex(v1, ed)) {\r
-                               return false;\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-}\r
-\r
-/**\r
- * ラベル同士の重なり(内包関係)を調べるクラスです。 ラベルリストに内包するラベルを蓄積し、それにターゲットのラベルが内包されているか を確認します。\r
- */\r
-class OverlapChecker\r
-{\r
-       private NyARLabelingLabel[] _labels = new NyARLabelingLabel[32];\r
-\r
-       private int _length;\r
-\r
-       /**\r
-        * 最大i_max_label個のラベルを蓄積できるようにオブジェクトをリセットする\r
-        * \r
-        * @param i_max_label\r
-        */\r
-       public void reset(int i_max_label)\r
-       {\r
-               if (i_max_label > this._labels.length) {\r
-                       this._labels = new NyARLabelingLabel[i_max_label];\r
-               }\r
-               this._length = 0;\r
-       }\r
-\r
-       /**\r
-        * チェック対象のラベルを追加する。\r
-        * \r
-        * @param i_label_ref\r
-        */\r
-       public void push(NyARLabelingLabel i_label_ref)\r
-       {\r
-               this._labels[this._length] = i_label_ref;\r
-               this._length++;\r
-       }\r
-\r
-       /**\r
-        * 現在リストにあるラベルと重なっているかを返す。\r
-        * \r
-        * @param i_label\r
-        * @return 何れかのラベルの内側にあるならばfalse,独立したラベルである可能性が高ければtrueです.\r
-        */\r
-       public boolean check(NyARLabelingLabel i_label)\r
-       {\r
-               // 重なり処理かな?\r
-               final NyARLabelingLabel[] label_pt = this._labels;\r
-               final int px1 = (int) i_label.pos_x;\r
-               final int py1 = (int) i_label.pos_y;\r
-               for (int i = this._length - 1; i >= 0; i--) {\r
-                       final int px2 = (int) label_pt[i].pos_x;\r
-                       final int py2 = (int) label_pt[i].pos_y;\r
-                       final int d = (px1 - px2) * (px1 - px2) + (py1 - py2) * (py1 - py2);\r
-                       if (d < label_pt[i].area / 4) {\r
-                               // 対象外\r
-                               return false;\r
-                       }\r
-               }\r
-               // 対象\r
-               return true;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARSquareStack.java
deleted file mode 100644 (file)
index a88109a..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\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
-{\r
-       public NyARSquareStack(int i_length)\r
-       {\r
-               super(new NyARSquare[i_length]);\r
-\r
-       }\r
-\r
-       protected void onReservRequest(int i_start, int i_end, Object[] i_buffer)\r
-       {\r
-               for (int i = i_start; i < i_end; i++) {\r
-                       i_buffer[i] = new NyARSquare();\r
-               }\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVec.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVec.java
deleted file mode 100644 (file)
index 8bc84d7..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-\r
-\r
-public class NyARVec\r
-{\r
-       private int clm;\r
-\r
-       public NyARVec(int i_clm)\r
-       {\r
-               v = new double[i_clm];\r
-               clm = i_clm;\r
-       }\r
-\r
-       private double[] v;\r
-\r
-       /**\r
-        * i_clmサイズの列を格納できるように列サイズを変更します。 実行後、列の各値は不定になります。\r
-        * \r
-        * @param i_clm\r
-        */\r
-       public void realloc(int i_clm)\r
-       {\r
-               if (i_clm <= this.v.length) {\r
-                       // 十分な配列があれば何もしない。\r
-               } else {\r
-                       // 不十分なら取り直す。\r
-                       v = new double[i_clm];\r
-               }\r
-               this.clm = i_clm;\r
-       }\r
-\r
-       public int getClm()\r
-       {\r
-               return clm;\r
-       }\r
-\r
-       public double[] getArray()\r
-       {\r
-               return v;\r
-       }\r
-\r
-       /**\r
-        * arVecDispの代替品\r
-        * \r
-        * @param value\r
-        * @return\r
-        */\r
-       public int arVecDisp() throws NyARException\r
-       {\r
-               NyARException.trap("未チェックのパス");\r
-               System.out.println(" === vector (" + clm + ") ===\n");// printf(" ===\r
-                                                                                                                               // vector (%d)\r
-                                                                                                                               // ===\n",\r
-                                                                                                                               // v->clm);\r
-               System.out.print(" |");// printf(" |");\r
-               for (int c = 0; c < clm; c++) {// for( c = 0; c < v->clm; c++ ){\r
-                       System.out.print(" " + v[c]);// printf( " %10g", v->v[c] );\r
-               }\r
-               System.out.println(" |");// printf(" |\n");\r
-               System.out.println(" ===================");// printf("\r
-                                                                                                       // ===================\n");\r
-               return 0;\r
-       }\r
-\r
-       /**\r
-        * arVecInnerproduct関数の代替品\r
-        * \r
-        * @param x\r
-        * @param y\r
-        * @param i_start\r
-        *            演算開始列(よくわからないけどarVecTridiagonalizeの呼び出し元でなんかしてる)\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public double vecInnerproduct(NyARVec y, int i_start) throws NyARException\r
-       {\r
-               NyARException.trap("この関数は動作確認できていません。");\r
-               double result = 0.0;\r
-               // double[] x_array=x.v;.getArray();\r
-               // double[] y_array=y.getArray();\r
-\r
-               if (this.clm != y.clm) {\r
-                       throw new NyARException();// exit();\r
-               }\r
-               for (int i = i_start; i < this.clm; i++) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       result += this.v[i] * y.v[i];// result += x->v[i] * y->v[i];\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * double arVecHousehold関数の代替品\r
-        * \r
-        * @param x\r
-        * @param i_start\r
-        *            演算開始列(よくわからないけどarVecTridiagonalizeの呼び出し元でなんかしてる)\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public double vecHousehold(int i_start) throws NyARException\r
-       {\r
-               NyARException.trap("この関数は動作確認できていません。");\r
-               double s, t;\r
-               s = Math.sqrt(this.vecInnerproduct(this, i_start));\r
-               // double[] x_array=x.getArray();\r
-               if (s != 0.0) {\r
-                       NyARException.trap("未チェックのパス");\r
-                       if (this.v[i_start] < 0) {\r
-                               s = -s;\r
-                       }\r
-                       NyARException.trap("未チェックのパス");\r
-                       {\r
-                               this.v[i_start] += s;// x->v[0] += s;\r
-                               t = 1 / Math.sqrt(this.v[i_start] * s);// t = 1 / sqrt(x->v[0] * s);\r
-                       }\r
-                       for (int i = i_start; i < this.clm; i++) {\r
-                               NyARException.trap("未チェックのパス");\r
-                               this.v[i] *= t;// x->v[i] *= t;\r
-                       }\r
-               }\r
-               return -s;\r
-       }\r
-\r
-       // /**\r
-       // * arVecTridiagonalize関数の代替品\r
-       // * a,d,e間で演算をしてる。何をどうしているかはさっぱりさっぱり\r
-       // * @param a\r
-       // * @param d\r
-       // * @param e\r
-       // * @param i_e_start\r
-       // * 演算開始列(よくわからないけどarVecTridiagonalizeの呼び出し元でなんかしてる)\r
-       // * @return\r
-       // * @throws NyARException\r
-       // */\r
-       // public static void vecTridiagonalize(NyARMat a, NyARVec d, NyARVec e,int\r
-       // i_e_start) throws NyARException\r
-       // {\r
-       // NyARVec vec,vec2;\r
-       // double[][] a_array=a.getArray();\r
-       // double s, t, p, q;\r
-       // int dim;\r
-       //\r
-       // if(a.getClm()!=a.getRow()){\r
-       // throw new NyARException();\r
-       // }\r
-       // if(a.getClm() != d.clm){\r
-       // throw new NyARException();\r
-       // }\r
-       // if(a.getClm() != e.clm){\r
-       // throw new NyARException();\r
-       // }\r
-       // dim = a.getClm();\r
-       //\r
-       // for(int k = 0; k < dim-2; k++ ){\r
-       // vec=a.getRowVec(k);\r
-       // // double[] vec_array=vec.getArray();\r
-       // NyARException.trap("未チェックパス");\r
-       // d.v[k]=vec.v[k];//d.set(k,v.get(k)); //d->v[k] = v[k];\r
-       //\r
-       // //wv1.clm = dim-k-1;\r
-       // //wv1.v = &(v[k+1]);\r
-       // NyARException.trap("未チェックパス");\r
-       // e.v[k+i_e_start]=vec.vecHousehold(k+1);//e->v[k] = arVecHousehold(&wv1);\r
-       // if(e.v[k+i_e_start]== 0.0 ){\r
-       // continue;\r
-       // }\r
-       //\r
-       // for(int i = k+1; i < dim; i++ ){\r
-       // s = 0.0;\r
-       // for(int j = k+1; j < i; j++ ) {\r
-       // NyARException.trap("未チェックのパス");\r
-       // s += a_array[j][i] * vec.v[j];//s += a.get(j*dim+i) * v.get(j);//s +=\r
-       // a->m[j*dim+i] * v[j];\r
-       // }\r
-       // for(int j = i; j < dim; j++ ) {\r
-       // NyARException.trap("未チェックのパス");\r
-       // s += a_array[i][j] * vec.v[j];//s += a.get(i*dim+j) * v.get(j);//s +=\r
-       // a->m[i*dim+j] * v[j];\r
-       // }\r
-       // NyARException.trap("未チェックのパス");\r
-       // d.v[i]=s;//d->v[i] = s;\r
-       // }\r
-       //\r
-       //\r
-       // //wv1.clm = wv2.clm = dim-k-1;\r
-       // //wv1.v = &(v[k+1]);\r
-       // //wv2.v = &(d->v[k+1]);\r
-       // vec=a.getRowVec(k);\r
-       // // vec_array=vec.getArray();\r
-       // NyARException.trap("未チェックパス");\r
-       // t = vec.vecInnerproduct(d,k+1)/ 2;\r
-       // for(int i = dim-1; i > k; i-- ) {\r
-       // NyARException.trap("未チェックパス");\r
-       // p = vec.v[i];//p = v.get(i);//p = v[i];\r
-       // d.v[i]-=t*p;q=d.v[i];//q = d->v[i] -= t*p;\r
-       // for(int j = i; j < dim; j++ ){\r
-       // NyARException.trap("未チェックパス");\r
-       // a_array[i][j]-=p*(d.v[j] + q*vec.v[j]);//a->m[i*dim+j] -= p*(d->v[j]) +\r
-       // q*v[j];\r
-       // }\r
-       // }\r
-       // }\r
-       //\r
-       // if( dim >= 2) {\r
-       // d.v[dim-2]=a_array[dim-2][dim-2];//d->v[dim-2] =\r
-       // a->m[(dim-2)*dim+(dim-2)];\r
-       // e.v[dim-2+i_e_start]=a_array[dim-2][dim-1];//e->v[dim-2] =\r
-       // a->m[(dim-2)*dim+(dim-1)];\r
-       // }\r
-       //\r
-       // if( dim >= 1 ){\r
-       // d.v[dim-1]=a_array[dim-1][dim-1];//d->v[dim-1] =\r
-       // a->m[(dim-1)*dim+(dim-1)];\r
-       // }\r
-       //\r
-       // for(int k = dim-1; k >= 0; k--) {\r
-       // vec=a.getRowVec(k);//v = a.getPointer(k*dim);//v = &(a->m[k*dim]);\r
-       // if( k < dim-2 ) {\r
-       // for(int i = k+1; i < dim; i++ ){\r
-       // //wv1.clm = wv2.clm = dim-k-1;\r
-       // //wv1.v = &(v[k+1]);\r
-       // //wv2.v = &(a->m[i*dim+k+1]);\r
-       // vec2=a.getRowVec(i);\r
-       //\r
-       // t = vec.vecInnerproduct(vec2,k+1);\r
-       // for(int j = k+1; j < dim; j++ ){\r
-       // NyARException.trap("未チェックパス");\r
-       // a_array[i][j]-=t*vec.v[j];//a.subValue(i*dim+j,t*v.get(j));//a->m[i*dim+j]\r
-       // -= t * v[j];\r
-       // }\r
-       // }\r
-       // }\r
-       // for(int i = 0; i < dim; i++ ){\r
-       // vec.v[i]=0.0;//v.set(i,0.0);//v[i] = 0.0;\r
-       // }\r
-       // vec.v[k]=1;//v.set(k,1);//v[k] = 1;\r
-       // }\r
-       // }\r
-       /**\r
-        * 現在ラップしている配列を取り外して、新しい配列をラップします。\r
-        * \r
-        * @param i_v\r
-        * @param i_clm\r
-        */\r
-       public void setNewArray(double[] i_array, int i_clm)\r
-       {\r
-               this.v = i_array;\r
-               this.clm = i_clm;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVersion.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/NyARVersion.java
deleted file mode 100644 (file)
index 92497ba..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core;\r
-\r
-/**\r
- * ARUint32 arGetVersion(char **versionStringRef); 関数の置き換え\r
- */\r
-public class NyARVersion\r
-{\r
-       private static final int AR_HEADER_VERSION_MAJOR = 2; // #define\r
-                                                                                                                       // AR_HEADER_VERSION_MAJOR\r
-                                                                                                                       // 2\r
-\r
-       private static final int AR_HEADER_VERSION_MINOR = 72;// #define AR_HEADER_VERSION_MINOR 72\r
-\r
-       private static final int AR_HEADER_VERSION_TINY = 0;// #define AR_HEADER_VERSION_TINY 0\r
-\r
-       private static final int AR_HEADER_VERSION_BUILD = 0;// #define AR_HEADER_VERSION_BUILD 0\r
-\r
-       private static final String AR_HEADER_VERSION_STRING = "2.72.0";// #define AR_HEADER_VERSION_STRING "2.72.0"\r
-\r
-       public static final boolean AR_HAVE_HEADER_VERSION_2 = true;// #define AR_HAVE_HEADER_VERSION_2\r
-\r
-       public static final boolean AR_HAVE_HEADER_VERSION_2_72 = true;// #define AR_HAVE_HEADER_VERSION_2_72\r
-\r
-       public static String getARVersion()\r
-       {\r
-               return AR_HEADER_VERSION_STRING;\r
-       }\r
-\r
-       public static int getARVersionInt()\r
-       {\r
-               // Represent full version number (major, minor, tiny, build) in\r
-               // binary coded decimal. N.B: Integer division.\r
-               return (int) (0x10000000 * (AR_HEADER_VERSION_MAJOR / 10))\r
-                               + (int) (0x01000000 * (AR_HEADER_VERSION_MAJOR % 10))\r
-                               + (int) (0x00100000 * (AR_HEADER_VERSION_MINOR / 10))\r
-                               + (int) (0x00010000 * (AR_HEADER_VERSION_MINOR % 10))\r
-                               + (int) (0x00001000 * (AR_HEADER_VERSION_TINY / 10))\r
-                               + (int) (0x00000100 * (AR_HEADER_VERSION_TINY % 10))\r
-                               + (int) (0x00000010 * (AR_HEADER_VERSION_BUILD / 10))\r
-                               + (int) (0x00000001 * (AR_HEADER_VERSION_BUILD % 10));\r
-\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabeling.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabeling.java
deleted file mode 100644 (file)
index 42d885f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-\r
-public interface INyARLabeling\r
-{\r
-       public void attachDestination(INyARLabelingImage i_destination_image) throws NyARException;\r
-       public INyARLabelingImage getAttachedDestination();\r
-\r
-       public void labeling(NyARBinRaster i_raster) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabelingImage.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/INyARLabelingImage.java
deleted file mode 100644 (file)
index 8d66292..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-\r
-public interface INyARLabelingImage extends INyARRaster\r
-{\r
-       public int[] getIndexArray();\r
-       public NyARLabelingLabelStack getLabelStack();\r
-       public void reset(boolean i_label_index_enable);\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingImage.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingImage.java
deleted file mode 100644 (file)
index fb8d096..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.NyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- *\r
- */\r
-public class NyARLabelingImage extends NyARRaster_BasicClass implements INyARLabelingImage\r
-{\r
-       private final static int MAX_LABELS = 1024*32;  \r
-       protected int[][] _ref_buf;\r
-       private INyARBufferReader _buffer_reader;\r
-       protected NyARLabelingLabelStack _label_list;\r
-       protected int[] _index_table;\r
-       protected boolean _is_index_table_enable;\r
-       public NyARLabelingImage(int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf =new int[i_height][i_width];\r
-               this._label_list = new NyARLabelingLabelStack(MAX_LABELS);\r
-               this._index_table=new int[MAX_LABELS];\r
-               this._is_index_table_enable=false;\r
-               this._buffer_reader=new NyARBufferReader(this._ref_buf,INyARBufferReader.BUFFERFORMAT_INT2D);\r
-               \r
-               return;\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }\r
-\r
-\r
-       /**\r
-        * ラベリング結果がインデックステーブルを持つ場合、その配列を返します。\r
-        * 持たない場合、nullを返します。\r
-        * \r
-        * 値がnullの時はラベル番号そのものがラスタに格納されていますが、\r
-        * null以外の時はラスタに格納されているのはインデクス番号です。\r
-        * \r
-        * インデクス番号とラベル番号の関係は、以下の式で表されます。\r
-        * ラベル番号:=value[インデクス番号]\r
-        * \r
-        */\r
-       public int[] getIndexArray()\r
-       {\r
-               return this._is_index_table_enable?this._index_table:null;\r
-       }\r
-       \r
-       public NyARLabelingLabelStack getLabelStack()\r
-       {\r
-               return this._label_list;\r
-       }\r
-       public void reset(boolean i_label_index_enable)\r
-       {\r
-               assert(i_label_index_enable==true);//非ラベルモードは未実装\r
-               this._label_list.clear();\r
-               this._is_index_table_enable=i_label_index_enable;\r
-               return;\r
-       }\r
-       \r
-       protected final int[] _getContour_xdir = { 0, 1, 1, 1, 0,-1,-1,-1};\r
-       protected final int[] _getContour_ydir = {-1,-1, 0, 1, 1, 1, 0,-1};\r
-       /**\r
-        * i_labelのラベルの、クリップ領域が上辺に接しているx座標を返します。\r
-        * @param i_index\r
-        * @return\r
-        */\r
-       protected int getTopClipTangentX(NyARLabelingLabel i_label) throws NyARException\r
-       {\r
-               int w;\r
-               int i_label_id=i_label.id;\r
-               int[] index_table=this._index_table;\r
-               int[] limage_j=this._ref_buf[i_label.clip_t];\r
-               final int clip1 = i_label.clip_r;\r
-               // p1=ShortPointer.wrap(limage,j*xsize+clip.get());//p1 =&(limage[j*xsize+clip[0]]);\r
-               for (int i = i_label.clip_l; i <= clip1; i++) {// for( i = clip[0]; i <=clip[1]; i++, p1++ ) {\r
-                       w = limage_j[i];\r
-                       if (w > 0 && index_table[w-1] == i_label_id){\r
-                               return i;\r
-                       }\r
-               }\r
-               //あれ?見つからないよ?\r
-               throw new NyARException();\r
-       }\r
-       /**\r
-        * i_index番目のラベルの輪郭線を配列に返します。\r
-        * @param i_index\r
-        * @param i_array_size\r
-        * @param o_coord_x\r
-        * @param o_coord_y\r
-        * @return\r
-        * 輪郭線の長さを返します。\r
-        * @throws NyARException\r
-        */\r
-       public int getContour(int i_index,int i_array_size,int[] o_coord_x,int[] o_coord_y) throws NyARException\r
-       {\r
-               final int[] xdir = this._getContour_xdir;// static int xdir[8] = { 0,1, 1, 1, 0,-1,-1,-1};\r
-               final int[] ydir = this._getContour_ydir;// static int ydir[8] = {-1,-1,0, 1, 1, 1, 0,-1};\r
-               final NyARLabelingLabel label=(NyARLabelingLabel)this._label_list.getItem(i_index);             \r
-               int i;\r
-               //クリップ領域の上端に接しているポイントを得る。\r
-               int sx=getTopClipTangentX(label);\r
-               int sy=label.clip_t;\r
-\r
-               int coord_num = 1;// marker_info2->coord_num = 1;\r
-               o_coord_x[0] = sx;// marker_info2->x_coord[0] = sx;\r
-               o_coord_y[0] = sy;// marker_info2->y_coord[0] = sy;\r
-               int dir = 5;\r
-\r
-               int[][] limage=this._ref_buf;\r
-               int c = o_coord_x[0];\r
-               int r = o_coord_y[0];\r
-               for (;;) {\r
-                       dir = (dir + 5) % 8;\r
-                       for (i = 0; i < 8; i++) {\r
-                               if (limage[r + ydir[dir]][c + xdir[dir]] > 0) {// if(\r
-                                       // p1[ydir[dir]*xsize+xdir[dir]] > 0 ){\r
-                                       break;\r
-                               }\r
-                               dir = (dir + 1) % 8;\r
-                       }\r
-                       if (i == 8) {\r
-                               //8方向全て調べたけどラベルが無いよ?\r
-                               throw new NyARException();// return(-1);\r
-                       }\r
-                       // xcoordとycoordをc,rにも保存\r
-                       c = c + xdir[dir];// marker_info2->x_coord[marker_info2->coord_num]=marker_info2->x_coord[marker_info2->coord_num-1]\r
-                       // + xdir[dir];\r
-                       r = r + ydir[dir];// marker_info2->y_coord[marker_info2->coord_num]=marker_info2->y_coord[marker_info2->coord_num-1]+ ydir[dir];\r
-                       o_coord_x[coord_num] = c;// marker_info2->x_coord[marker_info2->coord_num]=marker_info2->x_coord[marker_info2->coord_num-1]+ xdir[dir];\r
-                       o_coord_y[coord_num] = r;// marker_info2->y_coord[marker_info2->coord_num]=marker_info2->y_coord[marker_info2->coord_num-1]+ ydir[dir];\r
-                       // 終了条件判定\r
-                       if (c == sx && r == sy){\r
-                               coord_num++;\r
-                               break;\r
-                       }\r
-                       coord_num++;\r
-                       if (coord_num == i_array_size) {// if( marker_info2.coord_num ==Config.AR_CHAIN_MAX-1 ){\r
-                               //輪郭が末端に達した\r
-                               return coord_num;\r
-                       }\r
-               }\r
-               return coord_num;               \r
-               \r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabel.java
deleted file mode 100644 (file)
index 28e4ef1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-\r
-public class NyARLabelingLabel\r
-{\r
-       public int id;\r
-       public int area;\r
-       public int clip_r;// 0\r
-       public int clip_l;// 1\r
-       public int clip_b;// 2\r
-       public int clip_t;// 3\r
-       public double pos_x;\r
-       public double pos_y;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabelingLabelStack.java
deleted file mode 100644 (file)
index 0ed1c0b..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.utils.*;\r
-\r
-/**\r
- * NyLabelの予約型動的配列\r
- * \r
- */\r
-public class NyARLabelingLabelStack extends NyObjectStack\r
-{\r
-       protected NyARLabelingLabelStack(NyARLabelingLabel[] i_label_array)\r
-       {\r
-               super(i_label_array);           \r
-       }\r
-       public NyARLabelingLabelStack(int i_max_array_size)\r
-       {\r
-               super(new NyARLabelingLabel[i_max_array_size]);\r
-       }\r
-\r
-       protected void onReservRequest(int i_start, int i_end, Object[] i_buffer)\r
-       {\r
-               for (int i = i_start; i < i_end; i++) {\r
-                       i_buffer[i] = new NyARLabelingLabel();\r
-               }\r
-       }\r
-\r
-       /**\r
-        * エリアの大きい順にラベルをソートします。\r
-        */\r
-       final public void sortByArea()\r
-       {\r
-               int len=this._length;\r
-               int h = len *13/10;\r
-               NyARLabelingLabel[] item=(NyARLabelingLabel[])this._items;\r
-               for(;;){\r
-                   int swaps = 0;\r
-                   for (int i = 0; i + h < len; i++) {\r
-                       if (item[i + h].area > item[i].area) {\r
-                           final NyARLabelingLabel temp = item[i + h];\r
-                           item[i + h] = item[i];\r
-                           item[i] = temp;\r
-                           swaps++;\r
-                       }\r
-                   }\r
-                   if (h == 1) {\r
-                       if (swaps == 0){\r
-                               break;\r
-                       }\r
-                   }else{\r
-                       h=h*10/13;\r
-                   }\r
-               }               \r
-       } \r
-}\r
-       \r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/labeling/NyARLabeling_ARToolKit.java
deleted file mode 100644 (file)
index 76bf91e..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.labeling;\r
-\r
-\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * ARToolKit互換のラベリングクラスです。 ARToolKitと同一な評価結果を返します。\r
- * \r
- */\r
-public class NyARLabeling_ARToolKit implements INyARLabeling\r
-{\r
-       private static final int WORK_SIZE = 1024 * 32;// #define WORK_SIZE 1024*32\r
-       private final NyARWorkHolder work_holder = new NyARWorkHolder(WORK_SIZE);\r
-       private NyARIntSize _dest_size;\r
-       private INyARLabelingImage _out_image;\r
-\r
-       public void attachDestination(INyARLabelingImage i_destination_image)throws NyARException\r
-       {\r
-               // サイズチェック\r
-               NyARIntSize size = i_destination_image.getSize();\r
-               this._out_image = i_destination_image;\r
-\r
-               // NyLabelingImageのイメージ初期化(枠書き)\r
-               int[][] img = (int[][])i_destination_image.getBufferReader().getBuffer();\r
-               for (int i = 0; i < size.w; i++) {\r
-                       img[0][i] = 0;\r
-                       img[size.h - 1][i] = 0;\r
-               }\r
-               for (int i = 0; i < size.h; i++) {\r
-                       img[i][0] = 0;\r
-                       img[i][size.w - 1] = 0;\r
-               }\r
-\r
-               // サイズ(参照値)を保存\r
-               this._dest_size = size;\r
-       }\r
-       public INyARLabelingImage getAttachedDestination()\r
-       {\r
-               return this._out_image;\r
-       }\r
-       /**\r
-        * static ARInt16 *labeling2( ARUint8 *image, int thresh,int *label_num, int **area, double **pos, int **clip,int **label_ref, int LorR ) 関数の代替品\r
-        * ラスタimageをラベリングして、結果を保存します。 Optimize:STEP[1514->1493]\r
-        * \r
-        * @param i_raster\r
-        * @throws NyARException\r
-        */\r
-       public void labeling(NyARBinRaster i_raster) throws NyARException\r
-       {\r
-               int m, n; /* work */\r
-               int i, j, k;\r
-               INyARLabelingImage out_image = this._out_image;\r
-\r
-               // サイズチェック\r
-               NyARIntSize in_size = i_raster.getSize();\r
-               this._dest_size.isEqualSize(in_size);\r
-\r
-               final int lxsize = in_size.w;// lxsize = arUtil_c.arImXsize;\r
-               final int lysize = in_size.h;// lysize = arUtil_c.arImYsize;\r
-               int[][] label_img = (int[][])out_image.getBufferReader().getBuffer();\r
-\r
-               // 枠作成はインスタンスを作った直後にやってしまう。\r
-               \r
-               //ラベリング情報のリセット(ラベリングインデックスを使用)\r
-               out_image.reset(true);\r
-               \r
-               int[] label_idxtbl=out_image.getIndexArray();\r
-\r
-               int[] work2_pt;\r
-               int wk_max = 0;\r
-\r
-               int label_pixel;\r
-               int[][] raster_buf=(int[][])i_raster.getBufferReader().getBuffer();\r
-               int[] line_ptr;\r
-               int[][] work2 = this.work_holder.work2;\r
-               int[] label_img_pt0, label_img_pt1;\r
-               for (j = 1; j < lysize - 1; j++) {// for (int j = 1; j < lysize - 1;j++, pnt += poff*2, pnt2 += 2) {\r
-                       line_ptr=raster_buf[j];\r
-                       label_img_pt0 = label_img[j];\r
-                       label_img_pt1 = label_img[j - 1];\r
-                       for (i = 1; i < lxsize - 1; i++) {// for(int i = 1; i < lxsize-1;i++, pnt+=poff, pnt2++) {\r
-                               // RGBの合計値が閾値より小さいかな?\r
-                               if (line_ptr[i]==0) {\r
-                                       // pnt1 = ShortPointer.wrap(pnt2, -lxsize);//pnt1 =&(pnt2[-lxsize]);\r
-                                       if (label_img_pt1[i] > 0) {// if( *pnt1 > 0 ) {\r
-                                               label_pixel = label_img_pt1[i];// *pnt2 = *pnt1;\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                       } else if (label_img_pt1[i + 1] > 0) {// }else if(*(pnt1+1) > 0 ) {\r
-                                               if (label_img_pt1[i - 1] > 0) {// if( *(pnt1-1) > 0 ) {\r
-                                                       m = label_idxtbl[label_img_pt1[i + 1] - 1];// m =work[*(pnt1+1)-1];\r
-                                                       n = label_idxtbl[label_img_pt1[i - 1] - 1];// n =work[*(pnt1-1)-1];\r
-                                                       if (m > n) {\r
-                                                               label_pixel = n;// *pnt2 = n;\r
-                                                               // wk=IntPointer.wrap(work, 0);//wk =\r
-                                                               // &(work[0]);\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == m) {// if( *wk == m )\r
-                                                                               label_idxtbl[k] = n;// *wk = n;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else if (m < n) {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                               // wk=IntPointer.wrap(work,0);//wk = &(work[0]);\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == n) {// if( *wk == n ){\r
-                                                                               label_idxtbl[k] = m;// *wk = m;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                       }\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;\r
-                                                       work2_pt[1] += i;\r
-                                                       work2_pt[2] += j;\r
-                                                       work2_pt[6] = j;\r
-                                               } else if ((label_img_pt0[i - 1]) > 0) {// }else if(*(pnt2-1) > 0) {\r
-                                                       m = label_idxtbl[(label_img_pt1[i + 1]) - 1];// m =work[*(pnt1+1)-1];\r
-                                                       n = label_idxtbl[label_img_pt0[i - 1] - 1];// n =work[*(pnt2-1)-1];\r
-                                                       if (m > n) {\r
-\r
-                                                               label_pixel = n;// *pnt2 = n;\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == m) {// if( *wk == m ){\r
-                                                                               label_idxtbl[k] = n;// *wk = n;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else if (m < n) {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == n) {// if( *wk == n ){\r
-                                                                               label_idxtbl[k] = m;// *wk = m;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                       }\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                                       work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                                       work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               } else {\r
-\r
-                                                       label_pixel = label_img_pt1[i + 1];// *pnt2 =\r
-                                                                                                                               // *(pnt1+1);\r
-\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                                       work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                                       work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                                       if (work2_pt[3] > i) {// if(\r
-                                                                                                       // work2[((*pnt2)-1)*7+3] >\r
-                                                                                                       // i ){\r
-                                                               work2_pt[3] = i;// work2[((*pnt2)-1)*7+3] = i;\r
-                                                       }\r
-                                                       work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                               }\r
-                                       } else if ((label_img_pt1[i - 1]) > 0) {// }else if(\r
-                                                                                                                       // *(pnt1-1) > 0 ) {\r
-                                               label_pixel = label_img_pt1[i - 1];// *pnt2 =\r
-                                                                                                                       // *(pnt1-1);\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               if (work2_pt[4] < i) {// if( work2[((*pnt2)-1)*7+4] <i ){\r
-                                                       work2_pt[4] = i;// work2[((*pnt2)-1)*7+4] = i;\r
-                                               }\r
-                                               work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                       } else if (label_img_pt0[i - 1] > 0) {// }else if(*(pnt2-1) > 0) {\r
-                                               label_pixel = label_img_pt0[i - 1];// *pnt2 =*(pnt2-1);\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               if (work2_pt[4] < i) {// if( work2[((*pnt2)-1)*7+4] <i ){\r
-                                                       work2_pt[4] = i;// work2[((*pnt2)-1)*7+4] = i;\r
-                                               }\r
-                                       } else {\r
-                                               // 現在地までの領域を予約\r
-                                               this.work_holder.reserv(wk_max);\r
-                                               wk_max++;\r
-                                               label_idxtbl[wk_max - 1] = wk_max;\r
-                                               label_pixel = wk_max;// work[wk_max-1] = *pnt2 = wk_max;\r
-                                               work2_pt = work2[wk_max - 1];\r
-                                               work2_pt[0] = 1;\r
-                                               work2_pt[1] = i;\r
-                                               work2_pt[2] = j;\r
-                                               work2_pt[3] = i;\r
-                                               work2_pt[4] = i;\r
-                                               work2_pt[5] = j;\r
-                                               work2_pt[6] = j;\r
-                                       }\r
-                                       label_img_pt0[i] = label_pixel;\r
-                               } else {\r
-                                       label_img_pt0[i] = 0;// *pnt2 = 0;\r
-                               }\r
-                       }\r
-               }\r
-               // インデックステーブルとラベル数の計算\r
-               int wlabel_num = 1;// *label_num = *wlabel_num = j - 1;\r
-\r
-               for (i = 0; i < wk_max; i++) {// for(int i = 1; i <= wk_max; i++,wk++) {\r
-                       label_idxtbl[i] = (label_idxtbl[i] == i + 1) ? wlabel_num++ : label_idxtbl[label_idxtbl[i] - 1];// *wk=(*wk==i)?j++:work[(*wk)-1];\r
-               }\r
-               wlabel_num -= 1;// *label_num = *wlabel_num = j - 1;\r
-               if (wlabel_num == 0) {// if( *label_num == 0 ) {\r
-                       // 発見数0\r
-                       out_image.getLabelStack().clear();\r
-                       return;\r
-               }\r
-               // ラベル情報の保存等\r
-               NyARLabelingLabelStack label_list = out_image.getLabelStack();\r
-\r
-               // ラベルバッファを予約\r
-               label_list.reserv(wlabel_num);\r
-\r
-               // エリアと重心、クリップ領域を計算\r
-               NyARLabelingLabel label_pt;\r
-               NyARLabelingLabel[] labels = (NyARLabelingLabel[])label_list.getArray();\r
-               for (i = 0; i < wlabel_num; i++) {\r
-                       label_pt =labels[i];\r
-                       label_pt.id =i+1;\r
-                       label_pt.area = 0;\r
-                       label_pt.pos_x =label_pt.pos_y = 0;\r
-                       label_pt.clip_l = lxsize;// wclip[i*4+0] = lxsize;\r
-                       label_pt.clip_t = lysize;// wclip[i*4+2] = lysize;\r
-                       label_pt.clip_r =label_pt.clip_b = 0;// wclip[i*4+3] = 0;\r
-               }\r
-\r
-               for (i = 0; i < wk_max; i++) {\r
-                       label_pt = labels[label_idxtbl[i] - 1];\r
-                       work2_pt = work2[i];\r
-                       label_pt.area += work2_pt[0];\r
-                       label_pt.pos_x += work2_pt[1];\r
-                       label_pt.pos_y += work2_pt[2];\r
-                       if (label_pt.clip_l > work2_pt[3]) {\r
-                               label_pt.clip_l = work2_pt[3];\r
-                       }\r
-                       if (label_pt.clip_r < work2_pt[4]) {\r
-                               label_pt.clip_r = work2_pt[4];\r
-                       }\r
-                       if (label_pt.clip_t > work2_pt[5]) {\r
-                               label_pt.clip_t = work2_pt[5];\r
-                       }\r
-                       if (label_pt.clip_b < work2_pt[6]) {\r
-                               label_pt.clip_b = work2_pt[6];\r
-                       }\r
-               }\r
-\r
-               for (i = 0; i < wlabel_num; i++) {// for(int i = 0; i < *label_num; i++ ) {\r
-                       label_pt = labels[i];\r
-                       label_pt.pos_x /= label_pt.area;\r
-                       label_pt.pos_y /= label_pt.area;\r
-               }\r
-               return;\r
-       }\r
-\r
-}\r
-\r
-/**\r
- * NyARLabeling_O2のworkとwork2を可変長にするためのクラス\r
- * \r
- * \r
- */\r
-final class NyARWorkHolder\r
-{\r
-       private final static int ARRAY_APPEND_STEP = 256;\r
-\r
-       public final int[][] work2;\r
-\r
-       private int allocate_size;\r
-\r
-       /**\r
-        * 最大i_holder_size個の動的割り当てバッファを準備する。\r
-        * \r
-        * @param i_holder_size\r
-        */\r
-       public NyARWorkHolder(int i_holder_size)\r
-       {\r
-               // ポインタだけははじめに確保しておく\r
-               this.work2 = new int[i_holder_size][];\r
-               this.allocate_size = 0;\r
-       }\r
-\r
-       /**\r
-        * i_indexで指定した番号までのバッファを準備する。\r
-        * \r
-        * @param i_index\r
-        */\r
-       public final void reserv(int i_index) throws NyARException\r
-       {\r
-               // アロケート済みなら即リターン\r
-               if (this.allocate_size > i_index) {\r
-                       return;\r
-               }\r
-               // 要求されたインデクスは範囲外\r
-               if (i_index >= this.work2.length) {\r
-                       throw new NyARException();\r
-               }\r
-               // 追加アロケート範囲を計算\r
-               int range = i_index + ARRAY_APPEND_STEP;\r
-               if (range >= this.work2.length) {\r
-                       range = this.work2.length;\r
-               }\r
-               // アロケート\r
-               for (int i = this.allocate_size; i < range; i++) {\r
-                       this.work2[i] = new int[7];\r
-               }\r
-               this.allocate_size = range;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/INyARMatchPatt.java
deleted file mode 100644 (file)
index 4d53e5b..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.match;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-import jp.nyatla.nyartoolkit.core.pickup.INyARColorPatt;\r
-\r
-/**\r
- * ARColorPattのマッチング計算をするインタフェイスです。 基準Patに対して、計算済みのARCodeデータとの間で比較演算をします。\r
- * pattern_match関数を分解した3種類のパターン検出クラスを定義します。\r
- * \r
- */\r
-public interface INyARMatchPatt\r
-{\r
-       public double getConfidence();\r
-\r
-       public int getDirection();\r
-\r
-       public void evaluate(NyARCode i_code);\r
-\r
-       public boolean setPatt(INyARColorPatt i_target_patt) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_BlackWhite.java
deleted file mode 100644 (file)
index 1073196..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.match;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.pickup.INyARColorPatt;\r
-\r
-/**\r
- * AR_TEMPLATE_MATCHING_BWと同等のルールで マーカーを評価します。\r
- * \r
- */\r
-public class NyARMatchPatt_BlackWhite implements INyARMatchPatt\r
-{\r
-       private double datapow;\r
-\r
-       private int width;\r
-\r
-       private int height;\r
-\r
-       private double cf = 0;\r
-\r
-       private int dir = 0;\r
-\r
-       private int ave;\r
-\r
-       private int[][][] input = new int[height][width][3];\r
-\r
-       public boolean setPatt(INyARColorPatt i_target_patt) throws NyARException\r
-       {\r
-               width = i_target_patt.getWidth();\r
-               height = i_target_patt.getHeight();\r
-               int[][][] data = i_target_patt.getPatArray();\r
-               input = new int[height][width][3];\r
-\r
-               int sum = ave = 0;\r
-               for (int i = 0; i < height; i++) {// for(int\r
-                                                                                       // i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       for (int i2 = 0; i2 < width; i2++) {// for(int\r
-                                                                                               // i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               ave += (255 - data[i][i2][0]) + (255 - data[i][i2][1])\r
-                                               + (255 - data[i][i2][2]);\r
-                       }\r
-               }\r
-               ave /= (height * width * 3);\r
-\r
-               for (int i = 0; i < height; i++) {// for(int\r
-                                                                                       // i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       for (int i2 = 0; i2 < width; i2++) {// for(int\r
-                                                                                               // i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               input[i][i2][0] = ((255 - data[i][i2][0])\r
-                                               + (255 - data[i][i2][1]) + (255 - data[i][i2][2]))\r
-                                               / 3 - ave;\r
-                               sum += input[i][i2][0] * input[i][i2][0];\r
-                       }\r
-               }\r
-\r
-               datapow = Math.sqrt((double) sum);\r
-               if (datapow == 0.0) {\r
-                       return false;// throw new NyARException();\r
-                       // dir.set(0);//*dir = 0;\r
-                       // cf.set(-1.0);//*cf = -1.0;\r
-                       // return -1;\r
-               }\r
-               return true;\r
-       }\r
-\r
-       public double getConfidence()\r
-       {\r
-               return cf;\r
-       }\r
-\r
-       public int getDirection()\r
-       {\r
-               return dir;\r
-       }\r
-\r
-       public void evaluate(NyARCode i_code)\r
-       {\r
-               short[][][] patBW = i_code.getPatBW();// static int\r
-                                                                                               // patBW[AR_PATT_NUM_MAX][4][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-               double[] patpowBW = i_code.getPatPowBW();// static double\r
-                                                                                                       // patpowBW[AR_PATT_NUM_MAX][4];\r
-\r
-               double max = 0.0;\r
-               int res = -1;\r
-               // 本家が飛ぶ。試験データで0.77767376888がが出ればOKってことで\r
-               for (int j = 0; j < 4; j++) {\r
-                       int sum = 0;\r
-                       for (int i = 0; i < height; i++) {\r
-                               for (int i2 = 0; i2 < width; i2++) {\r
-                                       sum += input[i][i2][0] * patBW[j][i][i2];\r
-                               }\r
-                       }\r
-                       double sum2 = sum / patpowBW[j] / datapow;\r
-                       if (sum2 > max) {\r
-                               max = sum2;\r
-                               res = j;\r
-                       }\r
-               }\r
-               dir = res;\r
-               cf = max;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITHOUT_PCA.java
deleted file mode 100644 (file)
index 358a4ec..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.match;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.pickup.INyARColorPatt;\r
-\r
-/**\r
- * AR_TEMPLATE_MATCHING_COLORかつAR_MATCHING_WITHOUT_PCAと同等のルールで マーカーを評価します。\r
- * \r
- */\r
-public class NyARMatchPatt_Color_WITHOUT_PCA implements INyARMatchPatt\r
-{\r
-       private int[][][] input = new int[1][1][3];\r
-\r
-       private double datapow;\r
-\r
-       private int width = 1;\r
-\r
-       private int height = 1;\r
-\r
-       private double cf = 0;\r
-\r
-       private int dir = 0;\r
-\r
-       public double getConfidence()\r
-       {\r
-               return cf;\r
-       }\r
-\r
-       public int getDirection()\r
-       {\r
-               return dir;\r
-       }\r
-\r
-       /**\r
-        * input配列サイズを必要に応じて再アロケートする。\r
-        * \r
-        * @param i_width\r
-        * @param i_height\r
-        */\r
-       private void reallocInputArray(int i_width, int i_height)\r
-       {\r
-               if (this.input.length < i_height || this.input[0].length < i_width) {\r
-                       // 配列が十分なサイズでなければ取り直す\r
-                       this.input = new int[i_height][i_width][3];\r
-               }\r
-               this.height = i_height;\r
-               this.width = i_width;\r
-       }\r
-\r
-       public boolean setPatt(INyARColorPatt i_target_patt) throws NyARException\r
-       {\r
-               int i, k;\r
-               int[][][] data, linput;\r
-\r
-               // input配列のサイズとwhも更新// input=new int[height][width][3];\r
-               reallocInputArray(i_target_patt.getWidth(), i_target_patt.getHeight());\r
-               int lwidth = this.width;\r
-               int lheight = this.height;\r
-               linput = this.input;\r
-               data = i_target_patt.getPatArray();\r
-\r
-               int sum = 0, l_ave = 0, w_sum;\r
-               int[][] data_i, input_i;\r
-               int[] data_i_k, input_i_k;\r
-               for (i = lheight - 1; i >= 0; i--) {// <Optimize/>for(int i=0;i<height;i++) {\r
-                       //for(int i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       data_i = data[i];\r
-                       for (k = lwidth - 1; k >= 0; k--) {// <Optimize/>for(int\r
-                                                                                               // i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               // <Optimize/>l_ave +=(255-data[i][i2][0])+(255-data[i][i2][1])+(255-data[i][i2][2]);\r
-                               data_i_k = data_i[k];\r
-                               l_ave += 255 * 3 - data_i_k[0] - data_i_k[1] - data_i_k[2];\r
-                       }\r
-               }\r
-               l_ave /= (lheight * lwidth * 3);\r
-               for (i = lheight - 1; i >= 0; i--) {// for(i=0;i<height;i++){//for(int i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       input_i = linput[i];\r
-                       data_i = data[i];\r
-                       for (k = lwidth - 1; k >= 0; k--) {// for(i2=0;i2<width;i2++){//for(int i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               // <Optimize>\r
-                               // for(int i3=0;i3<3;i3++){\r
-                               // input[i][i2][i3] = (255-data[i][i2][i3]) - l_ave;\r
-                               // sum += input[i][i2][i3]*input[i][i2][i3];\r
-                               // }\r
-                               data_i_k = data_i[k];\r
-                               input_i_k = input_i[k];\r
-                               w_sum = (255 - data_i_k[0]) - l_ave;\r
-                               input_i_k[0] = w_sum;\r
-                               sum += w_sum * w_sum;\r
-\r
-                               w_sum = (255 - data_i_k[1]) - l_ave;\r
-                               input_i_k[1] = w_sum;\r
-                               sum += w_sum * w_sum;\r
-\r
-                               w_sum = (255 - data_i_k[2]) - l_ave;\r
-                               input_i_k[2] = w_sum;\r
-                               sum += w_sum * w_sum;\r
-                               // </Optimize>\r
-                       }\r
-               }\r
-               datapow = Math.sqrt((double) sum);\r
-               if (datapow == 0.0) {\r
-                       return false;// throw new NyARException();\r
-                       // dir.set(0);//*dir = 0;\r
-                       // cf.set(-1.0);//*cf = -1.0;\r
-                       // return -1;\r
-               }\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * public int pattern_match(short[][][] data,IntPointer dir,DoublePointer\r
-        * cf)\r
-        * \r
-        */\r
-       public void evaluate(NyARCode i_code)\r
-       {\r
-               int[][][][] pat = i_code.getPat();\r
-               double[] patpow = i_code.getPatPow();\r
-               int res = -1;\r
-               double max = 0.0;\r
-               int[][][] pat_j, linput;\r
-               int[][] pat_j_i, input_i;\r
-               int[] pat_j_i_k, input_i_k;\r
-               int l_width = this.width;\r
-               int l_height = this.height;\r
-               linput = this.input;\r
-               for (int j = 0; j < 4; j++) {\r
-                       int sum = 0;\r
-                       pat_j = pat[j];\r
-                       for (int i = l_height - 1; i >= 0; i--) {// for(int i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                               input_i = linput[i];\r
-                               pat_j_i = pat_j[i];\r
-                               for (int k = l_width - 1; k >= 0; k--) {\r
-                                       pat_j_i_k = pat_j_i[k];\r
-                                       input_i_k = input_i[k];\r
-                                       // for(int i3=0;i3<3;i3++){\r
-                                       sum += input_i_k[0] * pat_j_i_k[0];// sum +=input[i][i2][i3]*pat[k][j][i][i2][i3];\r
-                                       sum += input_i_k[1] * pat_j_i_k[1];// sum +=input[i][i2][i3]*pat[k][j][i][i2][i3];\r
-                                       sum += input_i_k[2] * pat_j_i_k[2];// sum +=input[i][i2][i3]*pat[k][j][i][i2][i3];\r
-                                       // }\r
-                               }\r
-                       }\r
-                       double sum2 = sum / patpow[j] / datapow;// sum2 = sum / patpow[k][j]/ datapow;\r
-                       if (sum2 > max) {\r
-                               max = sum2;\r
-                               res = j;\r
-                       }\r
-               }\r
-               dir = res;\r
-               cf = max;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/match/NyARMatchPatt_Color_WITH_PCA.java
deleted file mode 100644 (file)
index 0cfd37c..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.match;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARCode;\r
-import jp.nyatla.nyartoolkit.core.pickup.INyARColorPatt;\r
-\r
-/**\r
- * AR_TEMPLATE_MATCHING_COLORかつAR_MATCHING_WITH_PCAと同等のルールで マーカーを評価します。\r
- * \r
- */\r
-public class NyARMatchPatt_Color_WITH_PCA implements INyARMatchPatt\r
-{\r
-       private final int EVEC_MAX = 10;// #define EVEC_MAX 10\r
-\r
-       private int evec_dim;// static int evec_dim;\r
-\r
-       private int[][][] input;\r
-\r
-       private double[][][][] evec;// static double evec[EVEC_MAX][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-\r
-       private double[][] epat = new double[4][EVEC_MAX];// static double epat[AR_PATT_NUM_MAX][4][EVEC_MAX];\r
-\r
-       private int ave;\r
-\r
-       private double datapow;\r
-\r
-       private int width;\r
-\r
-       private int height;\r
-\r
-       private double cf = 0;\r
-\r
-       private int dir = 0;// 向きか!\r
-\r
-       public double getConfidence()\r
-       {\r
-               return cf;\r
-       }\r
-\r
-       public int getDirection()\r
-       {\r
-               return dir;\r
-       }\r
-\r
-       public boolean setPatt(INyARColorPatt i_target_patt) throws NyARException\r
-       {\r
-               width = i_target_patt.getWidth();\r
-               height = i_target_patt.getHeight();\r
-               int[][][] data = i_target_patt.getPatArray();\r
-\r
-               input = new int[height][width][3];\r
-               evec = new double[EVEC_MAX][height][width][3];// static double evec[EVEC_MAX][AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3];\r
-               int sum;\r
-\r
-               sum = ave = 0;\r
-               for (int i = 0; i < height; i++) {// for(int i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       for (int i2 = 0; i2 < width; i2++) {// for(int i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               ave += (255 - data[i][i2][0]) + (255 - data[i][i2][1])\r
-                                               + (255 - data[i][i2][2]);\r
-                       }\r
-               }\r
-               ave /= (height * width * 3);\r
-\r
-               for (int i = 0; i < height; i++) {// for(int\r
-                                                                                       // i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       for (int i2 = 0; i2 < width; i2++) {// for(int\r
-                                                                                               // i2=0;i2<Config.AR_PATT_SIZE_X;i2++){\r
-                               for (int i3 = 0; i3 < 3; i3++) {\r
-                                       input[i][i2][i3] = (255 - data[i][i2][i3]) - ave;\r
-                                       sum += input[i][i2][i3] * input[i][i2][i3];\r
-                               }\r
-                       }\r
-               }\r
-               datapow = Math.sqrt((double) sum);\r
-               if (datapow == 0.0) {\r
-                       return false;// throw new NyARException();\r
-                       // dir.set(0);//*dir = 0;\r
-                       // cf.set(-1.0);//*cf = -1.0;\r
-                       // return -1;\r
-               }\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * public int pattern_match(short[][][] data,IntPointer dir,DoublePointer\r
-        * cf)\r
-        * \r
-        */\r
-       public void evaluate(NyARCode i_code)\r
-       {\r
-               int[][][][] pat = i_code.getPat();\r
-               double[] patpow = i_code.getPatPow();\r
-               double[] invec = new double[EVEC_MAX];\r
-\r
-               double max = 0.0; // fix VC7 compiler warning: uninitialized variable\r
-               // 確認\r
-               for (int i = 0; i < evec_dim; i++) {\r
-                       invec[i] = 0.0;\r
-                       for (int j = 0; j < height; j++) {// for(int j = 0; j<Config.AR_PATT_SIZE_Y; j++){\r
-                               for (int j2 = 0; j2 < width; j2++) {\r
-                                       for (int j3 = 0; j3 < 3; j3++) {\r
-                                               invec[i] += evec[i][j][j2][j3] * input[j][j2][j3];// invec[i]+=evec[i][j]*input[j];\r
-                                       }\r
-                               }\r
-                       }\r
-                       invec[i] /= datapow;\r
-               }\r
-\r
-               double min = 10000.0;\r
-               int res = -1;\r
-               for (int j = 0; j < 4; j++) {\r
-                       double sum2 = 0;\r
-                       for (int i = 0; i < evec_dim; i++) {\r
-                               sum2 += (invec[i] - epat[j][i]) * (invec[i] - epat[j][i]);\r
-                       }\r
-                       if (sum2 < min) {\r
-                               min = sum2;\r
-                               res = j;\r
-                               // res2 = k;//kは常にインスタンスを刺すから、省略可能\r
-                       }\r
-               }\r
-\r
-               int sum = 0;\r
-               for (int i = 0; i < height; i++) {// for(int\r
-                                                                                       // i=0;i<Config.AR_PATT_SIZE_Y;i++){\r
-                       for (int i2 = 0; i2 < width; i2++) {// for(int\r
-                                                                                               // i2=0;i<Config.AR_PATT_SIZE_X;i2++){\r
-                               for (int i3 = 0; i3 < 3; i3++) {\r
-                                       sum += input[i][i2][i3] * pat[res][i][i2][i3];// sum +=input[i][i2][i3]*pat[res2][res][i][i2][i3];\r
-                               }\r
-                       }\r
-               }\r
-               max = sum / patpow[res] / datapow;\r
-               dir = res;\r
-               cf = max;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARCameraDistortionFactor.java
deleted file mode 100644 (file)
index 12910a6..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-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
- * http://www.hitl.washington.edu/artoolkit/Papers/ART02-Tutorial.pdf\r
- * 11ページを読むといいよ。\r
- * \r
- * x=x(xi-x0),y=s(yi-y0)\r
- * d^2=x^2+y^2\r
- * p=(1-fd^2)\r
- * xd=px+x0,yd=py+y0\r
- */\r
-final public class NyARCameraDistortionFactor\r
-{\r
-       private static final int PD_LOOP = 3;\r
-       private double _f0;//x0\r
-       private double _f1;//y0\r
-       private double _f2;//100000000.0*f\r
-       private double _f3;//s\r
-       /**\r
-        * 配列の値をファクタ値としてセットする。\r
-        * @param i_factor\r
-        * 4要素以上の配列\r
-        */\r
-       public void setValue(double[] i_factor)\r
-       {\r
-               this._f0=i_factor[0];\r
-               this._f1=i_factor[1];\r
-               this._f2=i_factor[2];\r
-               this._f3=i_factor[3];\r
-               return;\r
-       }\r
-       public void getValue(double[] o_factor)\r
-       {\r
-               o_factor[0]=this._f0;\r
-               o_factor[1]=this._f1;\r
-               o_factor[2]=this._f2;\r
-               o_factor[3]=this._f3;\r
-               return;\r
-       }       \r
-       public void changeScale(double i_scale)\r
-       {\r
-               this._f0=this._f0*i_scale;// newparam->dist_factor[0] =source->dist_factor[0] *scale;\r
-               this._f1=this._f1*i_scale;// newparam->dist_factor[1] =source->dist_factor[1] *scale;\r
-               this._f2=this._f2/ (i_scale * i_scale);// newparam->dist_factor[2]=source->dist_factor[2]/ (scale*scale);\r
-               //this.f3=this.f3;// newparam->dist_factor[3] =source->dist_factor[3];\r
-               return;\r
-       }\r
-       /**\r
-        * int arParamIdeal2Observ( const double dist_factor[4], const double ix,const double iy,double *ox, double *oy ) 関数の代替関数\r
-        * \r
-        * @param i_in\r
-        * @param o_out\r
-        */\r
-       public void ideal2Observ(final NyARDoublePoint2d i_in, NyARDoublePoint2d o_out)\r
-       {\r
-               final double x = (i_in.x - this._f0) * this._f3;\r
-               final double y = (i_in.y - this._f1) * this._f3;\r
-               if (x == 0.0 && y == 0.0) {\r
-                       o_out.x = this._f0;\r
-                       o_out.y = this._f1;\r
-               } else {\r
-                       final double d = 1.0 - this._f2 / 100000000.0 * (x * x + y * y);\r
-                       o_out.x = x * d + this._f0;\r
-                       o_out.y = y * d + this._f1;\r
-               }\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * ideal2Observをまとめて実行します。\r
-        * @param i_in\r
-        * @param o_out\r
-        */\r
-       public void ideal2ObservBatch(final NyARDoublePoint2d[] i_in, NyARDoublePoint2d[] o_out, int i_size)\r
-       {\r
-               double x, y;\r
-               final double d0 = this._f0;\r
-               final double d1 = this._f1;\r
-               final double d3 = this._f3;\r
-               final double d2_w = this._f2 / 100000000.0;\r
-               for (int i = 0; i < i_size; i++) {\r
-                       x = (i_in[i].x - d0) * d3;\r
-                       y = (i_in[i].y - d1) * d3;\r
-                       if (x == 0.0 && y == 0.0) {\r
-                               o_out[i].x = d0;\r
-                               o_out[i].y = d1;\r
-                       } else {\r
-                               final double d = 1.0 - d2_w * (x * x + y * y);\r
-                               o_out[i].x = x * d + d0;\r
-                               o_out[i].y = y * d + d1;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * int arParamObserv2Ideal( const double dist_factor[4], const double ox,const double oy,double *ix, double *iy );\r
-        * \r
-        * @param ox\r
-        * @param oy\r
-        * @param ix\r
-        * @param iy\r
-        * @return\r
-        */\r
-       public void observ2Ideal(double ox, double oy, DoubleValue ix, DoubleValue iy)\r
-       {\r
-               double z02, z0, p, q, z, px, py, opttmp_1;\r
-               final double d0 = this._f0;\r
-               final double d1 = this._f1;\r
-\r
-               px = ox - d0;\r
-               py = oy - d1;\r
-               p = this._f2 / 100000000.0;\r
-               z02 = px * px + py * py;\r
-               q = z0 = Math.sqrt(z02);// Optimize//q = z0 = Math.sqrt(px*px+ py*py);\r
-\r
-               for (int i = 1;; i++) {\r
-                       if (z0 != 0.0) {\r
-                               // Optimize opttmp_1\r
-                               opttmp_1 = p * z02;\r
-                               z = z0 - ((1.0 - opttmp_1) * z0 - q) / (1.0 - 3.0 * opttmp_1);\r
-                               px = px * z / z0;\r
-                               py = py * z / z0;\r
-                       } else {\r
-                               px = 0.0;\r
-                               py = 0.0;\r
-                               break;\r
-                       }\r
-                       if (i == PD_LOOP) {\r
-                               break;\r
-                       }\r
-                       z02 = px * px + py * py;\r
-                       z0 = Math.sqrt(z02);// Optimize//z0 = Math.sqrt(px*px+ py*py);\r
-               }\r
-               ix.value = px / this._f3 + d0;\r
-               iy.value = py / this._f3 + d1;\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * 指定範囲のobserv2Idealをまとめて実行して、結果をo_idealに格納します。\r
-        * \r
-        * @param i_x_coord\r
-        * @param i_y_coord\r
-        * @param i_start\r
-        *            coord開始点\r
-        * @param i_num\r
-        *            計算数\r
-        * @param o_ideal\r
-        *            出力バッファ[i_num][2]であること。\r
-        */\r
-       public void observ2IdealBatch(int[] i_x_coord, int[] i_y_coord,int i_start, int i_num, double[][] o_ideal)\r
-       {\r
-               double z02, z0, q, z, px, py, opttmp_1;\r
-               final double d0 = this._f0;\r
-               final double d1 = this._f1;\r
-               final double d3 = this._f3;\r
-               final double p = this._f2 / 100000000.0;\r
-               for (int j = 0; j < i_num; j++) {\r
-\r
-                       px = i_x_coord[i_start + j] - d0;\r
-                       py = i_y_coord[i_start + j] - d1;\r
-\r
-                       z02 = px * px + py * py;\r
-                       q = z0 = Math.sqrt(z02);// Optimize//q = z0 = Math.sqrt(px*px+py*py);\r
-\r
-                       for (int i = 1;; i++) {\r
-                               if (z0 != 0.0) {\r
-                                       // Optimize opttmp_1\r
-                                       opttmp_1 = p * z02;\r
-                                       z = z0 - ((1.0 - opttmp_1) * z0 - q)/ (1.0 - 3.0 * opttmp_1);\r
-                                       px = px * z / z0;\r
-                                       py = py * z / z0;\r
-                               } else {\r
-                                       px = 0.0;\r
-                                       py = 0.0;\r
-                                       break;\r
-                               }\r
-                               if (i == PD_LOOP) {\r
-                                       break;\r
-                               }\r
-                               z02 = px * px + py * py;\r
-                               z0 = Math.sqrt(z02);// Optimize//z0 = Math.sqrt(px*px+ py*py);\r
-                       }\r
-                       o_ideal[j][0] = px / d3 + d0;\r
-                       o_ideal[j][1] = py / d3 + d1;\r
-               }\r
-               return;\r
-       }       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARParam.java
deleted file mode 100644 (file)
index 4267207..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.param;\r
-\r
-import java.io.*;\r
-import java.nio.*;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * typedef struct { int xsize, ysize; double mat[3][4]; double dist_factor[4]; } ARParam;\r
- * NyARの動作パラメータを格納するクラス\r
- *\r
- */\r
-public class NyARParam\r
-{\r
-       protected NyARIntSize _screen_size=new NyARIntSize();\r
-       private static final int SIZE_OF_PARAM_SET = 4 + 4 + (3 * 4 * 8) + (4 * 8);\r
-       private NyARCameraDistortionFactor _dist=new NyARCameraDistortionFactor();\r
-       private NyARPerspectiveProjectionMatrix _projection_matrix=new NyARPerspectiveProjectionMatrix();\r
-\r
-       public NyARIntSize getScreenSize()\r
-       {\r
-               return this._screen_size;\r
-       }\r
-\r
-       public NyARPerspectiveProjectionMatrix getPerspectiveProjectionMatrix()\r
-       {\r
-               return this._projection_matrix;\r
-       }\r
-       public NyARCameraDistortionFactor getDistortionFactor()\r
-       {\r
-               return this._dist;\r
-       }\r
-\r
-       /**\r
-        * ARToolKit標準ファイルから1個目の設定をロードする。\r
-        * \r
-        * @param i_filename\r
-        * @throws NyARException\r
-        */\r
-       public void loadARParamFromFile(String i_filename) throws NyARException\r
-       {\r
-               try {\r
-                       loadARParam(new FileInputStream(i_filename));\r
-               } catch (Exception e) {\r
-                       throw new NyARException(e);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * int arParamChangeSize( ARParam *source, int xsize, int ysize, ARParam *newparam );\r
-        * 関数の代替関数 サイズプロパティをi_xsize,i_ysizeに変更します。\r
-        * @param i_xsize\r
-        * @param i_ysize\r
-        * @param newparam\r
-        * @return\r
-        * \r
-        */\r
-       public void changeScreenSize(int i_xsize, int i_ysize)\r
-       {\r
-               final double scale = (double) i_xsize / (double) (this._screen_size.w);// scale = (double)xsize / (double)(source->xsize);\r
-               //スケールを変更\r
-               this._dist.changeScale(scale);\r
-               this._projection_matrix.changeScale(scale);\r
-               //for (int i = 0; i < 4; i++) {\r
-               //      array34[0 * 4 + i] = array34[0 * 4 + i] * scale;// newparam->mat[0][i]=source->mat[0][i]* scale;\r
-               //      array34[1 * 4 + i] = array34[1 * 4 + i] * scale;// newparam->mat[1][i]=source->mat[1][i]* scale;\r
-               //      array34[2 * 4 + i] = array34[2 * 4 + i];// newparam->mat[2][i] = source->mat[2][i];\r
-               //}\r
-\r
-\r
-               this._screen_size.w = i_xsize;// newparam->xsize = xsize;\r
-               this._screen_size.h = i_ysize;// newparam->ysize = ysize;\r
-               return;\r
-       }\r
-\r
-\r
-       /**\r
-        * int arParamLoad( const char *filename, int num, ARParam *param, ...);\r
-        * i_streamの入力ストリームからi_num個の設定を読み込み、パラメタを配列にして返します。\r
-        * \r
-        * @param i_stream\r
-        * @throws Exception\r
-        */\r
-       public void loadARParam(InputStream i_stream)throws NyARException\r
-       {\r
-               try {\r
-                       byte[] buf = new byte[SIZE_OF_PARAM_SET];\r
-                       i_stream.read(buf);\r
-                       double[] tmp=new double[12];\r
-\r
-                       // バッファを加工\r
-                       ByteBuffer bb = ByteBuffer.wrap(buf);\r
-                       bb.order(ByteOrder.BIG_ENDIAN);\r
-                       this._screen_size.w = bb.getInt();\r
-                       this._screen_size.h = bb.getInt();\r
-                       //double値を12個読み込む\r
-                       for(int i=0;i<12;i++){\r
-                               tmp[i]=bb.getDouble();\r
-                       }\r
-                       //Projectionオブジェクトにセット\r
-                       this._projection_matrix.setValue(tmp);\r
-                       //double値を4個読み込む\r
-                       for (int i = 0; i < 4; i++) {\r
-                               tmp[i]=bb.getDouble();\r
-                       }\r
-                       //Factorオブジェクトにセット\r
-                       this._dist.setValue(tmp);\r
-               } catch (Exception e) {\r
-                       throw new NyARException(e);\r
-               }\r
-               return;\r
-       }\r
-\r
-       public void saveARParam(OutputStream i_stream)throws Exception\r
-       {\r
-               NyARException.trap("未チェックの関数");\r
-               byte[] buf = new byte[SIZE_OF_PARAM_SET];\r
-               // バッファをラップ\r
-               ByteBuffer bb = ByteBuffer.wrap(buf);\r
-               bb.order(ByteOrder.BIG_ENDIAN);\r
-\r
-               // 書き込み\r
-               bb.putInt(this._screen_size.w);\r
-               bb.putInt(this._screen_size.h);\r
-               double[] tmp=new double[12];\r
-               //Projectionを読み出し\r
-               this._projection_matrix.getValue(tmp);\r
-               //double値を12個書き込む\r
-               for(int i=0;i<12;i++){\r
-                       tmp[i]=bb.getDouble();\r
-               }\r
-               //Factorを読み出し\r
-               this._dist.getValue(tmp);\r
-               //double値を4個書き込む\r
-               for (int i = 0; i < 4; i++) {\r
-                       tmp[i]=bb.getDouble();\r
-               }\r
-               i_stream.write(buf);\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/param/NyARPerspectiveProjectionMatrix.java
deleted file mode 100644 (file)
index c025160..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.param;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix34;\r
-\r
-/**\r
- * 透視変換行列を格納します。\r
- * http://www.hitl.washington.edu/artoolkit/Papers/ART02-Tutorial.pdf\r
- * 7ページを見るといいよ。\r
- *\r
- */\r
-final public class NyARPerspectiveProjectionMatrix extends NyARDoubleMatrix34\r
-{\r
-       /*\r
-        * static double dot( double a1, double a2, double a3,double b1, double b2,double b3 )\r
-        */\r
-       private final static double dot(double a1, double a2, double a3, double b1,double b2, double b3)\r
-       {\r
-               return (a1 * b1 + a2 * b2 + a3 * b3);\r
-       }\r
-\r
-       /* static double norm( double a, double b, double c ) */\r
-       private final static double norm(double a, double b, double c)\r
-       {\r
-               return Math.sqrt(a * a + b * b + c * c);\r
-       }\r
-\r
-       /**\r
-        * int arParamDecompMat( double source[3][4], double cpara[3][4], double trans[3][4] ); 関数の置き換え Optimize STEP[754->665]\r
-        * \r
-        * @param o_cpara\r
-        *            戻り引数。3x4のマトリクスを指定すること。\r
-        * @param o_trans\r
-        *            戻り引数。3x4のマトリクスを指定すること。\r
-        * @return\r
-        */\r
-       public void decompMat(NyARMat o_cpara, NyARMat o_trans)\r
-       {\r
-               double rem1, rem2, rem3;\r
-               double c00,c01,c02,c03,c10,c11,c12,c13,c20,c21,c22,c23;\r
-               if (this.m23>= 0) {// if( source[2][3] >= 0 ) {\r
-                       // <Optimize>\r
-                       // for(int r = 0; r < 3; r++ ){\r
-                       // for(int c = 0; c < 4; c++ ){\r
-                       // Cpara[r][c]=source[r][c];//Cpara[r][c] = source[r][c];\r
-                       // }\r
-                       // }\r
-                       c00=this.m00;\r
-                       c01=this.m01;\r
-                       c02=this.m02;\r
-                       c03=this.m03;\r
-                       c10=this.m10;\r
-                       c11=this.m11;\r
-                       c12=this.m12;\r
-                       c13=this.m13;\r
-                       c20=this.m20;\r
-                       c21=this.m21;\r
-                       c22=this.m22;\r
-                       c23=this.m23;\r
-               } else {\r
-                       // <Optimize>\r
-                       // for(int r = 0; r < 3; r++ ){\r
-                       // for(int c = 0; c < 4; c++ ){\r
-                       // Cpara[r][c]=-source[r][c];//Cpara[r][c] = -(source[r][c]);\r
-                       // }\r
-                       // }\r
-                       c00=-this.m00;\r
-                       c01=-this.m01;\r
-                       c02=-this.m02;\r
-                       c03=-this.m03;\r
-                       c10=-this.m10;\r
-                       c11=-this.m11;\r
-                       c12=-this.m12;\r
-                       c13=-this.m13;\r
-                       c20=-this.m20;\r
-                       c21=-this.m21;\r
-                       c22=-this.m22;\r
-                       c23=-this.m23;\r
-               }\r
-\r
-               double[][] cpara = o_cpara.getArray();\r
-               double[][] trans = o_trans.getArray();\r
-               for (int r = 0; r < 3; r++) {\r
-                       for (int c = 0; c < 4; c++) {\r
-                               cpara[r][c] = 0.0;// cpara[r][c] = 0.0;\r
-                       }\r
-               }\r
-               cpara[2][2] = norm(c20, c21, c22);// cpara[2][2] =norm( Cpara[2][0],Cpara[2][1],Cpara[2][2]);\r
-               trans[2][0] = c20 / cpara[2][2];// trans[2][0] = Cpara[2][0] /cpara[2][2];\r
-               trans[2][1] = c21 / cpara[2][2];// trans[2][1] = Cpara[2][1] / cpara[2][2];\r
-               trans[2][2] = c22 / cpara[2][2];// trans[2][2] =Cpara[2][2] /cpara[2][2];\r
-               trans[2][3] = c23 / cpara[2][2];// trans[2][3] =Cpara[2][3] /cpara[2][2];\r
-\r
-               cpara[1][2] = dot(trans[2][0], trans[2][1], trans[2][2], c10, c11, c12);// cpara[1][2]=dot(trans[2][0],trans[2][1],trans[2][2],Cpara[1][0],Cpara[1][1],Cpara[1][2]);\r
-               rem1 = c10 - cpara[1][2] * trans[2][0];// rem1 =Cpara[1][0] -cpara[1][2] *trans[2][0];\r
-               rem2 = c11 - cpara[1][2] * trans[2][1];// rem2 =Cpara[1][1] -cpara[1][2] *trans[2][1];\r
-               rem3 = c12 - cpara[1][2] * trans[2][2];// rem3 =Cpara[1][2] -cpara[1][2] *trans[2][2];\r
-               cpara[1][1] = norm(rem1, rem2, rem3);// cpara[1][1] = norm( rem1,// rem2, rem3 );\r
-               trans[1][0] = rem1 / cpara[1][1];// trans[1][0] = rem1 / cpara[1][1];\r
-               trans[1][1] = rem2 / cpara[1][1];// trans[1][1] = rem2 / cpara[1][1];\r
-               trans[1][2] = rem3 / cpara[1][1];// trans[1][2] = rem3 / cpara[1][1];\r
-\r
-               cpara[0][2] = dot(trans[2][0], trans[2][1], trans[2][2], c00, c01, c02);// cpara[0][2] =dot(trans[2][0], trans[2][1],trans[2][2],Cpara[0][0],Cpara[0][1],Cpara[0][2]);\r
-               cpara[0][1] = dot(trans[1][0], trans[1][1], trans[1][2], c00, c01, c02);// cpara[0][1]=dot(trans[1][0],trans[1][1],trans[1][2],Cpara[0][0],Cpara[0][1],Cpara[0][2]);\r
-               rem1 = c00 - cpara[0][1] * trans[1][0] - cpara[0][2]* trans[2][0];// rem1 = Cpara[0][0] - cpara[0][1]*trans[1][0]- cpara[0][2]*trans[2][0];\r
-               rem2 = c01 - cpara[0][1] * trans[1][1] - cpara[0][2]* trans[2][1];// rem2 = Cpara[0][1] - cpara[0][1]*trans[1][1]- cpara[0][2]*trans[2][1];\r
-               rem3 = c02 - cpara[0][1] * trans[1][2] - cpara[0][2]* trans[2][2];// rem3 = Cpara[0][2] - cpara[0][1]*trans[1][2] - cpara[0][2]*trans[2][2];\r
-               cpara[0][0] = norm(rem1, rem2, rem3);// cpara[0][0] = norm( rem1,rem2, rem3 );\r
-               trans[0][0] = rem1 / cpara[0][0];// trans[0][0] = rem1 / cpara[0][0];\r
-               trans[0][1] = rem2 / cpara[0][0];// trans[0][1] = rem2 / cpara[0][0];\r
-               trans[0][2] = rem3 / cpara[0][0];// trans[0][2] = rem3 / cpara[0][0];\r
-\r
-               trans[1][3] = (c13 - cpara[1][2] * trans[2][3])/ cpara[1][1];// trans[1][3] = (Cpara[1][3] -cpara[1][2]*trans[2][3]) / cpara[1][1];\r
-               trans[0][3] = (c03 - cpara[0][1] * trans[1][3] - cpara[0][2]* trans[2][3])/ cpara[0][0];// trans[0][3] = (Cpara[0][3] -cpara[0][1]*trans[1][3]-cpara[0][2]*trans[2][3]) / cpara[0][0];\r
-\r
-               for (int r = 0; r < 3; r++) {\r
-                       for (int c = 0; c < 3; c++) {\r
-                               cpara[r][c] /= cpara[2][2];// cpara[r][c] /= cpara[2][2];\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-       /**\r
-        * int arParamChangeSize( ARParam *source, int xsize, int ysize, ARParam *newparam );\r
-        * Matrixのスケールを変換します。\r
-        * @param i_scale\r
-        * \r
-        */\r
-       public void changeScale(double i_scale)\r
-       {\r
-               this.m00=this.m00*i_scale;\r
-               this.m10=this.m10*i_scale;\r
-               this.m01=this.m01*i_scale;\r
-               this.m11=this.m11*i_scale;\r
-               this.m02=this.m02*i_scale;\r
-               this.m12=this.m12*i_scale;\r
-               this.m03=this.m03*i_scale;\r
-               this.m13=this.m13*i_scale;\r
-               //for (int i = 0; i < 4; i++) {\r
-               //      array34[0 * 4 + i] = array34[0 * 4 + i] * scale;// newparam->mat[0][i]=source->mat[0][i]* scale;\r
-               //      array34[1 * 4 + i] = array34[1 * 4 + i] * scale;// newparam->mat[1][i]=source->mat[1][i]* scale;\r
-               //      array34[2 * 4 + i] = array34[2 * 4 + i];// newparam->mat[2][i] = source->mat[2][i];\r
-               //}\r
-               return;\r
-       }\r
-\r
-       \r
-       \r
-       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/INyARColorPatt.java
deleted file mode 100644 (file)
index a56479c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.pickup;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARSquare;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-\r
-public interface INyARColorPatt\r
-{\r
-       /**\r
-        * カラーパターンの幅をピクセル値で返します。\r
-        * \r
-        * @return\r
-        */\r
-       public int getWidth();\r
-\r
-       /**\r
-        * カラーパターンの高さをピクセル値で返します。\r
-        * \r
-        * @return\r
-        */\r
-       public int getHeight();\r
-       /**\r
-        * カメラパターンを格納した配列への参照値を返します。 配列は最低でも[height][wight][3]のサイズを持ちますが、\r
-        * 配列のlengthとwidth,heightの数は一致しないことがあります。\r
-        * setSize関数を実行すると、以前に呼び出されたgetPatArrayが返した値は不定になります。\r
-        * \r
-        * @return\r
-        */\r
-       public int[][][] getPatArray();\r
-\r
-       /**\r
-        * ラスタイメージからi_square部分のカラーパターンを抽出して、保持します。\r
-        * \r
-        * @param image\r
-        * @param i_square\r
-        * @return ラスターの取得に成功するとTRUE/失敗するとFALSE\r
-        * @throws NyARException\r
-        */\r
-       public boolean pickFromRaster(INyARRgbRaster image, NyARSquare i_square) throws NyARException;\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O1.java
deleted file mode 100644 (file)
index a8edbbf..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.pickup;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARMat;\r
-import jp.nyatla.nyartoolkit.core.NyARSquare;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-/**\r
- * 24ビットカラーのマーカーを保持するために使うクラスです。 このクラスは、ARToolkitのパターンと、ラスタから取得したパターンを保持します。\r
- * 演算順序以外の最適化をしたもの\r
- * \r
- */\r
-public class NyARColorPatt_O1 implements INyARColorPatt\r
-{\r
-       private static final int AR_PATT_SAMPLE_NUM = 64;// #define\r
-                                                                                                               // AR_PATT_SAMPLE_NUM 64\r
-\r
-       private int extpat[][][];\r
-\r
-       private int width;\r
-\r
-       private int height;\r
-\r
-       public NyARColorPatt_O1(int i_width, int i_height)\r
-       {\r
-               this.width = i_width;\r
-               this.height = i_height;\r
-               this.extpat = new int[i_height][i_width][3];\r
-               this.wk_pickFromRaster_ext_pat2 = new int[i_height][i_width][3];\r
-       }\r
-\r
-       // public void setSize(int i_new_width,int i_new_height)\r
-       // {\r
-       // int array_w=this.extpat[0].length;\r
-       // int array_h=this.extpat.length;\r
-       // //十分なサイズのバッファがあるか確認\r
-       // if(array_w>=i_new_width && array_h>=i_new_height){\r
-       // //OK 十分だ→サイズ調整のみ\r
-       // }else{\r
-       // //足りないよ→取り直し\r
-       // this.wk_pickFromRaster_ext_pat2=new int[i_new_height][i_new_width][3];\r
-       // this.extpat=new int[i_new_height][i_new_width][3];\r
-       // }\r
-       // this.width =i_new_width;\r
-       // this.height=i_new_height;\r
-       // return;\r
-       // }\r
-\r
-       public int[][][] getPatArray()\r
-       {\r
-               return extpat;\r
-       }\r
-\r
-       public int getWidth()\r
-       {\r
-               return width;\r
-       }\r
-\r
-       public int getHeight()\r
-       {\r
-               return height;\r
-       }\r
-\r
-       private final NyARMat wk_get_cpara_a = new NyARMat(8, 8);\r
-\r
-       private final NyARMat wk_get_cpara_b = new NyARMat(8, 1);\r
-\r
-       private final NyARMat wk_get_cpara_c = new NyARMat(8, 1);\r
-\r
-       /**\r
-        * \r
-        * @param world\r
-        * @param vertex\r
-        * @param para\r
-        *            [3x3]\r
-        * @throws NyARException\r
-        */\r
-       private boolean get_cpara(double world[][], double vertex[][], double[] para)\r
-                       throws NyARException\r
-       {\r
-               NyARMat a = wk_get_cpara_a;// 次処理で値を設定するので、初期化不要// new NyARMat( 8, 8 );\r
-               double[][] a_array = a.getArray();\r
-               NyARMat b = wk_get_cpara_b;// 次処理で値を設定するので、初期化不要// new NyARMat( 8, 1 );\r
-               double[][] b_array = b.getArray();\r
-               double[] a_pt0, a_pt1, world_pti;\r
-\r
-               for (int i = 0; i < 4; i++) {\r
-                       a_pt0 = a_array[i * 2];\r
-                       a_pt1 = a_array[i * 2 + 1];\r
-                       world_pti = world[i];\r
-\r
-                       a_pt0[0] = world_pti[0];// a->m[i*16+0] = world[i][0];\r
-                       a_pt0[1] = world_pti[1];// a->m[i*16+1] = world[i][1];\r
-                       a_pt0[2] = 1.0;// a->m[i*16+2] = 1.0;\r
-                       a_pt0[3] = 0.0;// a->m[i*16+3] = 0.0;\r
-                       a_pt0[4] = 0.0;// a->m[i*16+4] = 0.0;\r
-                       a_pt0[5] = 0.0;// a->m[i*16+5] = 0.0;\r
-                       a_pt0[6] = -world_pti[0] * vertex[i][0];// a->m[i*16+6] =\r
-                                                                                                       // -world[i][0] *\r
-                                                                                                       // vertex[i][0];\r
-                       a_pt0[7] = -world_pti[1] * vertex[i][0];// a->m[i*16+7] =\r
-                                                                                                       // -world[i][1] *\r
-                                                                                                       // vertex[i][0];\r
-                       a_pt1[0] = 0.0;// a->m[i*16+8] = 0.0;\r
-                       a_pt1[1] = 0.0;// a->m[i*16+9] = 0.0;\r
-                       a_pt1[2] = 0.0;// a->m[i*16+10] = 0.0;\r
-                       a_pt1[3] = world_pti[0];// a->m[i*16+11] = world[i][0];\r
-                       a_pt1[4] = world_pti[1];// a->m[i*16+12] = world[i][1];\r
-                       a_pt1[5] = 1.0;// a->m[i*16+13] = 1.0;\r
-                       a_pt1[6] = -world_pti[0] * vertex[i][1];// a->m[i*16+14] =\r
-                                                                                                       // -world[i][0] *\r
-                                                                                                       // vertex[i][1];\r
-                       a_pt1[7] = -world_pti[1] * vertex[i][1];// a->m[i*16+15] =\r
-                                                                                                       // -world[i][1] *\r
-                                                                                                       // vertex[i][1];\r
-                       b_array[i * 2 + 0][0] = vertex[i][0];// b->m[i*2+0] =\r
-                                                                                                       // vertex[i][0];\r
-                       b_array[i * 2 + 1][0] = vertex[i][1];// b->m[i*2+1] =\r
-                                                                                                       // vertex[i][1];\r
-               }\r
-               // JartkException.trap("未チェックのパス");\r
-               if (!a.matrixSelfInv()) {\r
-                       return false;// 逆行列を求められないので失敗\r
-               }\r
-\r
-               // JartkException.trap("未チェックのパス");\r
-               NyARMat c = wk_get_cpara_c;// 次処理で結果を受け取るので、初期化不要//new NyARMat( 8, 1 );\r
-               double[][] c_array = c.getArray();\r
-\r
-               c.matrixMul(a, b);\r
-               for (int i = 0; i < 2; i++) {\r
-                       para[i * 3 + 0] = c_array[i * 3 + 0][0];// para[i][0] = c->m[i*3+0];\r
-                       para[i * 3 + 1] = c_array[i * 3 + 1][0];// para[i][1] = c->m[i*3+1];\r
-                       para[i * 3 + 2] = c_array[i * 3 + 2][0];// para[i][2] = c->m[i*3+2];\r
-               }\r
-               para[2 * 3 + 0] = c_array[2 * 3 + 0][0];// para[2][0] = c->m[2*3+0];\r
-               para[2 * 3 + 1] = c_array[2 * 3 + 1][0];// para[2][1] = c->m[2*3+1];\r
-               para[2 * 3 + 2] = 1.0;// para[2][2] = 1.0;\r
-               return true;\r
-       }\r
-\r
-       private final double[][] wk_pickFromRaster_local = new double[4][2];\r
-\r
-       private final double[] wk_pickFromRaster_para = new double[9];// [3][3];\r
-\r
-       private int[][][] wk_pickFromRaster_ext_pat2 = null;// コンストラクタでint[height][width][3]を作る\r
-\r
-       private final double[][] wk_pickFromRaster_world = {// double world[4][2];\r
-       { 100.0, 100.0 }, { 100.0 + 10.0, 100.0 }, { 100.0 + 10.0, 100.0 + 10.0 },\r
-                       { 100.0, 100.0 + 10.0 } };\r
-\r
-       /**\r
-        * pickFromRaster関数から使う変数です。\r
-        * \r
-        */\r
-       private static void initValue_wk_pickFromRaster_ext_pat2(\r
-                       int[][][] i_ext_pat2, int i_width, int i_height)\r
-       {\r
-               int i, i2;\r
-               int[][] pt2;\r
-               int[] pt1;\r
-               for (i = i_height - 1; i >= 0; i--) {\r
-                       pt2 = i_ext_pat2[i];\r
-                       for (i2 = i_width - 1; i2 >= 0; i2--) {\r
-                               pt1 = pt2[i2];\r
-                               pt1[0] = 0;\r
-                               pt1[1] = 0;\r
-                               pt1[2] = 0;\r
-                       }\r
-               }\r
-       }\r
-\r
-       private final int[] wk_pickFromRaster_rgb_tmp = new int[3];\r
-\r
-       /**\r
-        * imageから、i_markerの位置にあるパターンを切り出して、保持します。 Optimize:STEP[769->]\r
-        * \r
-        * @param image\r
-        * @param i_marker\r
-        * @return 切り出しに失敗した\r
-        * @throws Exception\r
-        */\r
-       public boolean pickFromRaster(INyARRgbRaster image, NyARSquare i_square)throws NyARException\r
-       {\r
-               double d, xw, yw;\r
-               int xc, yc;\r
-               int xdiv, ydiv;\r
-               int xdiv2, ydiv2;\r
-               int lx1, lx2, ly1, ly2;\r
-\r
-               int img_x = image.getWidth();\r
-               int img_y = image.getHeight();\r
-\r
-               double xdiv2_reciprocal; // [tp]\r
-               double ydiv2_reciprocal; // [tp]\r
-\r
-               // int[] x_coord=i_marker.x_coord;\r
-               // int[] y_coord=i_marker.y_coord;\r
-               // int[] vertex=i_marker.mkvertex;\r
-               double[][] local = wk_pickFromRaster_local;// double local[4][2];\r
-               //\r
-               for (int i = 0; i < 4; i++) {\r
-                       local[i][0] = i_square.imvertex[i].x;\r
-                       local[i][1] = i_square.imvertex[i].y;\r
-               }\r
-\r
-               double[][] world = wk_pickFromRaster_world;\r
-               /*\r
-                * world[0][0] = 100.0; world[0][1] = 100.0; world[1][0] = 100.0 + 10.0;\r
-                * world[1][1] = 100.0; world[2][0] = 100.0 + 10.0; world[2][1] = 100.0 +\r
-                * 10.0; world[3][0] = 100.0; world[3][1] = 100.0 + 10.0;\r
-                */\r
-               double[] para = wk_pickFromRaster_para; // double para[3][3];\r
-               // パターンの切り出しに失敗することもある。\r
-               if (!get_cpara(world, local, para)) {\r
-                       return false;\r
-               }\r
-               lx1 = (int) ((local[0][0] - local[1][0]) * (local[0][0] - local[1][0]) + (local[0][1] - local[1][1])\r
-                               * (local[0][1] - local[1][1]));\r
-               lx2 = (int) ((local[2][0] - local[3][0]) * (local[2][0] - local[3][0]) + (local[2][1] - local[3][1])\r
-                               * (local[2][1] - local[3][1]));\r
-               ly1 = (int) ((local[1][0] - local[2][0]) * (local[1][0] - local[2][0]) + (local[1][1] - local[2][1])\r
-                               * (local[1][1] - local[2][1]));\r
-               ly2 = (int) ((local[3][0] - local[0][0]) * (local[3][0] - local[0][0]) + (local[3][1] - local[0][1])\r
-                               * (local[3][1] - local[0][1]));\r
-               if (lx2 > lx1) {\r
-                       lx1 = lx2;\r
-               }\r
-               if (ly2 > ly1) {\r
-                       ly1 = ly2;\r
-               }\r
-               xdiv2 = this.width;\r
-               ydiv2 = this.height;\r
-\r
-               while (xdiv2 * xdiv2 < lx1 / 4) {\r
-                       xdiv2 *= 2;\r
-               }\r
-               while (ydiv2 * ydiv2 < ly1 / 4) {\r
-                       ydiv2 *= 2;\r
-               }\r
-\r
-               if (xdiv2 > AR_PATT_SAMPLE_NUM) {\r
-                       xdiv2 = AR_PATT_SAMPLE_NUM;\r
-               }\r
-               if (ydiv2 > AR_PATT_SAMPLE_NUM) {\r
-                       ydiv2 = AR_PATT_SAMPLE_NUM;\r
-               }\r
-\r
-               xdiv = xdiv2 / width;// xdiv = xdiv2/Config.AR_PATT_SIZE_X;\r
-               ydiv = ydiv2 / height;// ydiv = ydiv2/Config.AR_PATT_SIZE_Y;\r
-\r
-               /* wk_pickFromRaster_ext_pat2ワーク変数を初期化する。 */\r
-               int[][][] ext_pat2 = wk_pickFromRaster_ext_pat2;// ARUint32 ext_pat2[AR_PATT_SIZE_Y][AR_PATT_SIZE_X][3];\r
-               int extpat_j[][], extpat_j_i[];\r
-               int ext_pat2_j[][], ext_pat2_j_i[];\r
-\r
-               initValue_wk_pickFromRaster_ext_pat2(ext_pat2, this.width, this.height);\r
-\r
-               xdiv2_reciprocal = 1.0 / xdiv2;\r
-               ydiv2_reciprocal = 1.0 / ydiv2;\r
-               int i, j;\r
-               int[] rgb_tmp = wk_pickFromRaster_rgb_tmp;\r
-\r
-               //ピクセルリーダーを取得\r
-               INyARRgbPixelReader reader=image.getRgbPixelReader();\r
-               \r
-               // arGetCode_put_zero(ext_pat2);//put_zero( (ARUint8 *)ext_pat2,\r
-               // AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3*sizeof(ARUint32) );\r
-               for (j = 0; j < ydiv2; j++) {\r
-                       yw = 102.5 + 5.0 * (j + 0.5) * ydiv2_reciprocal;\r
-                       for (i = 0; i < xdiv2; i++) {\r
-                               xw = 102.5 + 5.0 * (i + 0.5) * xdiv2_reciprocal;\r
-                               d = para[2 * 3 + 0] * xw + para[2 * 3 + 1] * yw+ para[2 * 3 + 2];\r
-                               if (d == 0) {\r
-                                       throw new NyARException();\r
-                               }\r
-                               xc = (int) ((para[0 * 3 + 0] * xw + para[0 * 3 + 1] * yw + para[0 * 3 + 2]) / d);\r
-                               yc = (int) ((para[1 * 3 + 0] * xw + para[1 * 3 + 1] * yw + para[1 * 3 + 2]) / d);\r
-\r
-                               if (xc >= 0 && xc < img_x && yc >= 0 && yc < img_y) {\r
-                                       reader.getPixel(xc, yc, rgb_tmp);\r
-                                       ext_pat2_j_i = ext_pat2[j / ydiv][i / xdiv];\r
-\r
-                                       ext_pat2_j_i[0] += rgb_tmp[0];// R\r
-                                       ext_pat2_j_i[1] += rgb_tmp[1];// G\r
-                                       ext_pat2_j_i[2] += rgb_tmp[2];// B\r
-                                       // System.out.println(xc+":"+yc+":"+rgb_tmp[0]+":"+rgb_tmp[1]+":"+rgb_tmp[2]);\r
-                               }\r
-                       }\r
-               }\r
-               // short[][][] ext_pat=new short[Config.AR_PATT_SIZE_Y][Config.AR_PATT_SIZE_X][3];//ARUint32\r
-               // ext_pat2[AR_PATT_SIZE_Y][AR_PATT_SIZE_X][3];\r
-               /* <Optimize> */\r
-               int xdiv_x_ydiv = xdiv * ydiv;\r
-               for (j = this.height - 1; j >= 0; j--) {\r
-                       extpat_j = extpat[j];\r
-                       ext_pat2_j = ext_pat2[j];\r
-                       for (i = this.width - 1; i >= 0; i--) { // PRL 2006-06-08.\r
-                               ext_pat2_j_i = ext_pat2_j[i];\r
-                               extpat_j_i = extpat_j[i];\r
-                               extpat_j_i[0] = (ext_pat2_j_i[0] / xdiv_x_ydiv);// ext_pat[j][i][0]=(byte)(ext_pat2[j][i][0] / (xdiv*ydiv));\r
-                               extpat_j_i[1] = (ext_pat2_j_i[1] / xdiv_x_ydiv);// ext_pat[j][i][1]=(byte)(ext_pat2[j][i][1]/(xdiv*ydiv));\r
-                               extpat_j_i[2] = (ext_pat2_j_i[2] / xdiv_x_ydiv);// ext_pat[j][i][2]=(byte)(ext_pat2[j][i][2]/(xdiv*ydiv));\r
-                       }\r
-               }\r
-               return true;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/pickup/NyARColorPatt_O3.java
deleted file mode 100644 (file)
index 27711a1..0000000
+++ /dev/null
@@ -1,391 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.pickup;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARMat;\r
-import jp.nyatla.nyartoolkit.core.NyARSquare;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * 24ビットカラーのマーカーを保持するために使うクラスです。 このクラスは、ARToolkitのパターンと、ラスタから取得したパターンを保持します。\r
- * 演算順序を含む最適化をしたもの\r
- * \r
- */\r
-public class NyARColorPatt_O3 implements INyARColorPatt\r
-{\r
-       private static final int AR_PATT_SAMPLE_NUM = 64;// #define\r
-                                                                                                               // AR_PATT_SAMPLE_NUM 64\r
-\r
-       private int[][][] extpat;\r
-\r
-       private int width;\r
-\r
-       private int height;\r
-\r
-       public NyARColorPatt_O3(int i_width, int i_height)\r
-       {\r
-               this.width = i_width;\r
-               this.height = i_height;\r
-               this.extpat = new int[i_height][i_width][3];\r
-       }\r
-\r
-       // public void setSize(int i_new_width,int i_new_height)\r
-       // {\r
-       // int array_w=this.extpat[0].length;\r
-       // int array_h=this.extpat.length;\r
-       // //十分なサイズのバッファがあるか確認\r
-       // if(array_w>=i_new_width && array_h>=i_new_height){\r
-       // //OK 十分だ→サイズ調整のみ\r
-       // }else{\r
-       // //足りないよ→取り直し\r
-       // this.extpat=new int[i_new_height][i_new_width][3];\r
-       // }\r
-       // this.width =i_new_width;\r
-       // this.height=i_new_height;\r
-       // return;\r
-       // }\r
-       public int[][][] getPatArray()\r
-       {\r
-               return extpat;\r
-       }\r
-\r
-       public int getWidth()\r
-       {\r
-               return width;\r
-       }\r
-\r
-       public int getHeight()\r
-       {\r
-               return height;\r
-       }\r
-\r
-       private final NyARMat wk_get_cpara_a = new NyARMat(8, 8);\r
-\r
-       private final NyARMat wk_get_cpara_b = new NyARMat(8, 1);\r
-\r
-       /**\r
-        * @param world\r
-        * @param vertex\r
-        * @param o_para\r
-        * @throws NyARException\r
-        */\r
-       private boolean get_cpara(final NyARIntPoint[] i_vertex, NyARMat o_para)throws NyARException\r
-       {\r
-               int[][] world = this.wk_pickFromRaster_world;\r
-               NyARMat a = wk_get_cpara_a;// 次処理で値を設定するので、初期化不要// new NyARMat( 8, 8 );\r
-               double[][] a_array = a.getArray();\r
-               NyARMat b = wk_get_cpara_b;// 次処理で値を設定するので、初期化不要// new NyARMat( 8, 1 );\r
-               double[][] b_array = b.getArray();\r
-               double[] a_pt0, a_pt1;\r
-               int[] world_pti;\r
-\r
-               for (int i = 0; i < 4; i++) {\r
-                       a_pt0 = a_array[i * 2];\r
-                       a_pt1 = a_array[i * 2 + 1];\r
-                       world_pti = world[i];\r
-\r
-                       a_pt0[0] = (double) world_pti[0];// a->m[i*16+0] = world[i][0];\r
-                       a_pt0[1] = (double) world_pti[1];// a->m[i*16+1] = world[i][1];\r
-                       a_pt0[2] = 1.0;// a->m[i*16+2] = 1.0;\r
-                       a_pt0[3] = 0.0;// a->m[i*16+3] = 0.0;\r
-                       a_pt0[4] = 0.0;// a->m[i*16+4] = 0.0;\r
-                       a_pt0[5] = 0.0;// a->m[i*16+5] = 0.0;\r
-                       a_pt0[6] = (double) (-world_pti[0] * i_vertex[i].x);// a->m[i*16+6]= -world[i][0]*vertex[i][0];\r
-                       a_pt0[7] = (double) (-world_pti[1] * i_vertex[i].x);// a->m[i*16+7]=-world[i][1]*vertex[i][0];\r
-                       a_pt1[0] = 0.0;// a->m[i*16+8] = 0.0;\r
-                       a_pt1[1] = 0.0;// a->m[i*16+9] = 0.0;\r
-                       a_pt1[2] = 0.0;// a->m[i*16+10] = 0.0;\r
-                       a_pt1[3] = (double) world_pti[0];// a->m[i*16+11] = world[i][0];\r
-                       a_pt1[4] = (double) world_pti[1];// a->m[i*16+12] = world[i][1];\r
-                       a_pt1[5] = 1.0;// a->m[i*16+13] = 1.0;\r
-                       a_pt1[6] = (double) (-world_pti[0] * i_vertex[i].y);// a->m[i*16+14]=-world[i][0]*vertex[i][1];\r
-                       a_pt1[7] = (double) (-world_pti[1] * i_vertex[i].y);// a->m[i*16+15]=-world[i][1]*vertex[i][1];\r
-                       b_array[i * 2 + 0][0] = (double) i_vertex[i].x;// b->m[i*2+0] =vertex[i][0];\r
-                       b_array[i * 2 + 1][0] = (double) i_vertex[i].y;// b->m[i*2+1] =vertex[i][1];\r
-               }\r
-               if (!a.matrixSelfInv()) {\r
-                       return false;\r
-               }\r
-\r
-               o_para.matrixMul(a, b);\r
-               return true;\r
-       }\r
-\r
-       // private final double[] wk_pickFromRaster_para=new double[9];//[3][3];\r
-       private final int[][] wk_pickFromRaster_world = {// double world[4][2];\r
-       { 100, 100 }, { 100 + 10, 100 }, { 100 + 10, 100 + 10 }, { 100, 100 + 10 } };\r
-\r
-       /**\r
-        * pickFromRaster関数から使う変数です。\r
-        * \r
-        */\r
-       private static void initValue_wk_pickFromRaster_ext_pat2(int[][][] i_ext_pat2, int i_width, int i_height)\r
-       {\r
-               int i, i2;\r
-               int[][] pt2;\r
-               int[] pt1;\r
-               for (i = i_height - 1; i >= 0; i--) {\r
-                       pt2 = i_ext_pat2[i];\r
-                       for (i2 = i_width - 1; i2 >= 0; i2--) {\r
-                               pt1 = pt2[i2];\r
-                               pt1[0] = 0;\r
-                               pt1[1] = 0;\r
-                               pt1[2] = 0;\r
-                       }\r
-               }\r
-       }\r
-\r
-       private final NyARMat wk_pickFromRaster_cpara = new NyARMat(8, 1);\r
-\r
-       /**\r
-        * imageから、i_markerの位置にあるパターンを切り出して、保持します。 Optimize:STEP[769->750]\r
-        * \r
-        * @param image\r
-        * @param i_marker\r
-        * @throws Exception\r
-        */\r
-       public boolean pickFromRaster(INyARRgbRaster image, NyARSquare i_square)throws NyARException\r
-       {\r
-               NyARMat cpara = this.wk_pickFromRaster_cpara;\r
-               NyARIntPoint[] local = i_square.imvertex;\r
-               // //localの計算\r
-               // int[] local_0=wk_pickFromRaster_local[0];//double local[4][2];\r
-               // int[] local_1=wk_pickFromRaster_local[1];//double local[4][2];\r
-               // //\r
-               // for(int i = 0; i < 4; i++ ) {\r
-               // local_0[i] = i_square.imvertex[i][0];\r
-               // local_1[i] = i_square.imvertex[i][1];\r
-               // }\r
-               // xdiv2,ydiv2の計算\r
-               int xdiv2, ydiv2;\r
-               int l1, l2;\r
-               int w1, w2;\r
-\r
-               // x計算\r
-               w1 = local[0].x - local[1].x;\r
-               w2 = local[0].y - local[1].y;\r
-               l1 = (w1 * w1 + w2 * w2);\r
-               w1 = local[2].x - local[3].x;\r
-               w2 = local[2].y - local[3].y;\r
-               l2 = (w1 * w1 + w2 * w2);\r
-               if (l2 > l1) {\r
-                       l1 = l2;\r
-               }\r
-               l1 = l1 / 4;\r
-               xdiv2 = this.width;\r
-               while (xdiv2 * xdiv2 < l1) {\r
-                       xdiv2 *= 2;\r
-               }\r
-               if (xdiv2 > AR_PATT_SAMPLE_NUM) {\r
-                       xdiv2 = AR_PATT_SAMPLE_NUM;\r
-               }\r
-\r
-               // y計算\r
-               w1 = local[1].x - local[2].x;\r
-               w2 = local[1].y - local[2].y;\r
-               l1 = (w1 * w1 + w2 * w2);\r
-               w1 = local[3].x - local[0].x;\r
-               w2 = local[3].y - local[0].y;\r
-               l2 = (w1 * w1 + w2 * w2);\r
-               if (l2 > l1) {\r
-                       l1 = l2;\r
-               }\r
-               ydiv2 = this.height;\r
-               l1 = l1 / 4;\r
-               while (ydiv2 * ydiv2 < l1) {\r
-                       ydiv2 *= 2;\r
-               }\r
-               if (ydiv2 > AR_PATT_SAMPLE_NUM) {\r
-                       ydiv2 = AR_PATT_SAMPLE_NUM;\r
-               }\r
-\r
-               // cparaの計算\r
-               if (!get_cpara(local, cpara)) {\r
-                       return false;\r
-               }\r
-               updateExtpat(image, cpara, xdiv2, ydiv2);\r
-\r
-               return true;\r
-       }\r
-\r
-       // かなり大きいワークバッファを取るな…。\r
-       private double[] wk_updateExtpat_para00_xw;\r
-\r
-       private double[] wk_updateExtpat_para10_xw;\r
-\r
-       private double[] wk_updateExtpat_para20_xw;\r
-\r
-       private int[] wk_updateExtpat_rgb_buf;\r
-\r
-       private int[] wk_updateExtpat_x_rgb_index;\r
-\r
-       private int[] wk_updateExtpat_y_rgb_index;\r
-\r
-       private int[] wk_updateExtpat_i_rgb_index;\r
-\r
-       private int wk_updateExtpat_buffer_size = 0;\r
-\r
-       /**\r
-        * ワークバッファを予約する\r
-        * \r
-        * @param i_xdiv2\r
-        */\r
-       private void reservWorkBuffers(int i_xdiv2)\r
-       {\r
-               if (this.wk_updateExtpat_buffer_size < i_xdiv2) {\r
-                       wk_updateExtpat_para00_xw = new double[i_xdiv2];\r
-                       wk_updateExtpat_para10_xw = new double[i_xdiv2];\r
-                       wk_updateExtpat_para20_xw = new double[i_xdiv2];\r
-                       wk_updateExtpat_rgb_buf = new int[i_xdiv2 * 3];\r
-                       wk_updateExtpat_x_rgb_index = new int[i_xdiv2];\r
-                       wk_updateExtpat_y_rgb_index = new int[i_xdiv2];\r
-                       wk_updateExtpat_i_rgb_index = new int[i_xdiv2];\r
-                       this.wk_updateExtpat_buffer_size = i_xdiv2;\r
-               }\r
-               // 十分なら何もしない。\r
-               return;\r
-       }\r
-\r
-       private void updateExtpat(INyARRgbRaster image, NyARMat i_cpara, int i_xdiv2,int i_ydiv2) throws NyARException\r
-       {\r
-               int img_x = image.getWidth();\r
-               int img_y = image.getHeight();\r
-               final int[][][] L_extpat = this.extpat;\r
-               final int L_WIDTH = this.width;\r
-               final int L_HEIGHT = this.height;\r
-               /* wk_pickFromRaster_ext_pat2ワーク変数を初期化する。 */\r
-               // int[][][] ext_pat2=wk_pickFromRaster_ext_pat2;//ARUint32\r
-               // ext_pat2[AR_PATT_SIZE_Y][AR_PATT_SIZE_X][3];\r
-               int[][] extpat_j;\r
-               int[] extpat_j_i;\r
-               // int ext_pat2_j[][],ext_pat2_j_i[];\r
-\r
-               initValue_wk_pickFromRaster_ext_pat2(L_extpat, L_WIDTH, L_HEIGHT);\r
-\r
-               double[][] cpara_array = i_cpara.getArray();\r
-               double para21_x_yw, para01_x_yw, para11_x_yw;\r
-               double para00, para01, para02, para10, para11, para12, para20, para21;\r
-               para00 = cpara_array[0 * 3 + 0][0];// para[i][0] = c->m[i*3+0];\r
-               para01 = cpara_array[0 * 3 + 1][0];// para[i][1] = c->m[i*3+1];\r
-               para02 = cpara_array[0 * 3 + 2][0];// para[i][2] = c->m[i*3+2];\r
-               para10 = cpara_array[1 * 3 + 0][0];// para[i][0] = c->m[i*3+0];\r
-               para11 = cpara_array[1 * 3 + 1][0];// para[i][1] = c->m[i*3+1];\r
-               para12 = cpara_array[1 * 3 + 2][0];// para[i][2] = c->m[i*3+2];\r
-               para20 = cpara_array[2 * 3 + 0][0];// para[2][0] = c->m[2*3+0];\r
-               para21 = cpara_array[2 * 3 + 1][0];// para[2][1] = c->m[2*3+1];\r
-\r
-               double d, yw;\r
-               int xc, yc;\r
-               int i, j;\r
-               // arGetCode_put_zero(ext_pat2);//put_zero( (ARUint8 *)ext_pat2,\r
-               // AR_PATT_SIZE_Y*AR_PATT_SIZE_X*3*sizeof(ARUint32) );\r
-               int xdiv = i_xdiv2 / L_WIDTH;// xdiv = xdiv2/Config.AR_PATT_SIZE_X;\r
-               int ydiv = i_ydiv2 / L_HEIGHT;// ydiv = ydiv2/Config.AR_PATT_SIZE_Y;\r
-\r
-               // 計算バッファを予約する\r
-               this.reservWorkBuffers(i_xdiv2);\r
-               double[] para00_xw = this.wk_updateExtpat_para00_xw;\r
-               double[] para10_xw = this.wk_updateExtpat_para10_xw;\r
-               double[] para20_xw = this.wk_updateExtpat_para20_xw;\r
-               int[] x_rgb_index = this.wk_updateExtpat_x_rgb_index;\r
-               int[] y_rgb_index = this.wk_updateExtpat_y_rgb_index;\r
-               int[] i_rgb_index = this.wk_updateExtpat_i_rgb_index;\r
-               int[] rgb_buf = this.wk_updateExtpat_rgb_buf;\r
-               double xw;\r
-               for (i = 0; i < i_xdiv2; i++) {\r
-                       xw = 102.5 + 5.0 * ((double) i + 0.5) / i_xdiv2;\r
-                       para20_xw[i] = para20 * xw;\r
-                       para00_xw[i] = para00 * xw;\r
-                       para10_xw[i] = para10 * xw;\r
-               }\r
-\r
-               int index_num;\r
-               //ピクセルリーダーを取得\r
-               INyARRgbPixelReader reader=image.getRgbPixelReader();\r
-               \r
-               for (j = 0; j < i_ydiv2; j++) {\r
-                       yw = 102.5 + 5.0 * ((double) j + 0.5) / i_ydiv2;\r
-                       para21_x_yw = para21 * yw + 1.0;\r
-                       para11_x_yw = para11 * yw + para12;\r
-                       para01_x_yw = para01 * yw + para02;\r
-                       extpat_j = L_extpat[j / ydiv];\r
-                       index_num = 0;\r
-                       // ステップ1.RGB取得用のマップを作成\r
-                       for (i = 0; i < i_xdiv2; i++) {\r
-                               d = para20_xw[i] + para21_x_yw;\r
-                               if (d == 0) {\r
-                                       throw new NyARException();\r
-                               }\r
-                               xc = (int) ((para00_xw[i] + para01_x_yw) / d);\r
-                               yc = (int) ((para10_xw[i] + para11_x_yw) / d);\r
-                               // 範囲外は無視\r
-                               if (xc < 0 || xc >= img_x || yc < 0 || yc >= img_y) {\r
-                                       continue;\r
-                               }\r
-                               // ピクセル値の計算\r
-                               // image.getPixel(xc,yc,rgb_buf);\r
-                               // ext_pat2_j_i=ext_pat2_j[i/xdiv];\r
-                               // ext_pat2_j_i[0] += rgb_buf[0];//R\r
-                               // ext_pat2_j_i[1] += rgb_buf[1];//G\r
-                               // ext_pat2_j_i[2] += rgb_buf[2];//B\r
-\r
-                               x_rgb_index[index_num] = xc;\r
-                               y_rgb_index[index_num] = yc;\r
-                               i_rgb_index[index_num] = i / xdiv;\r
-                               index_num++;\r
-                       }\r
-                       // //ステップ2.ピクセル配列を取得\r
-                       reader.getPixelSet(x_rgb_index, y_rgb_index, index_num, rgb_buf);\r
-                       // //ピクセル値の計算\r
-                       for (i = index_num - 1; i >= 0; i--) {\r
-                               extpat_j_i = extpat_j[i_rgb_index[i]];\r
-                               extpat_j_i[0] += rgb_buf[i * 3 + 0];// R\r
-                               extpat_j_i[1] += rgb_buf[i * 3 + 1];// G\r
-                               extpat_j_i[2] += rgb_buf[i * 3 + 2];// B\r
-                       }\r
-               }\r
-               /* <Optimize> */\r
-               int xdiv_x_ydiv = xdiv * ydiv;\r
-               for (j = L_HEIGHT - 1; j >= 0; j--) {\r
-                       extpat_j = L_extpat[j];\r
-                       for (i = L_WIDTH - 1; i >= 0; i--) { // PRL 2006-06-08.\r
-                               extpat_j_i = extpat_j[i];\r
-                               extpat_j_i[0] /= (xdiv_x_ydiv);// ext_pat[j][i][0] =(byte)(ext_pat2[j][i][0] /(xdiv*ydiv));\r
-                               extpat_j_i[1] /= (xdiv_x_ydiv);// ext_pat[j][i][1] =(byte)(ext_pat2[j][i][1] /(xdiv*ydiv));\r
-                               extpat_j_i[2] /= (xdiv_x_ydiv);// ext_pat[j][i][2] =(byte)(ext_pat2[j][i][2] /(xdiv*ydiv));\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/INyARRaster.java
deleted file mode 100644 (file)
index fce31d0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-\r
-public interface INyARRaster\r
-{\r
-       public int getWidth();\r
-\r
-       public int getHeight();\r
-\r
-       public NyARIntSize getSize();\r
-       public INyARBufferReader getBufferReader();\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARBinRaster.java
deleted file mode 100644 (file)
index 418017e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster;\r
-\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-public final class NyARBinRaster extends NyARRaster_BasicClass\r
-{\r
-       private INyARBufferReader _buffer_reader;\r
-       protected int[][] _ref_buf;\r
-\r
-       public NyARBinRaster(int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = new int[i_height][i_width];\r
-               this._buffer_reader=new NyARBufferReader(this._ref_buf,INyARBufferReader.BUFFERFORMAT_INT2D_BIN_8);\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARGlayscaleRaster.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARGlayscaleRaster.java
deleted file mode 100644 (file)
index b828df1..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster;\r
-\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.NyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-public final class NyARGlayscaleRaster extends NyARRaster_BasicClass\r
-{\r
-\r
-       protected int[][] _ref_buf;\r
-       private INyARBufferReader _buffer_reader;\r
-       \r
-       public NyARGlayscaleRaster(int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = new int[i_height][i_width];\r
-               this._buffer_reader=new NyARBufferReader(this._ref_buf,INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8);\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/NyARRaster_BasicClass.java
deleted file mode 100644 (file)
index 095ee84..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster;\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-public abstract class NyARRaster_BasicClass implements INyARRaster\r
-{\r
-       final protected NyARIntSize _size;\r
-       protected NyARRaster_BasicClass(final NyARIntSize i_size)\r
-       {\r
-               this._size= i_size;\r
-       }\r
-\r
-       final public int getWidth()\r
-       {\r
-               return this._size.w;\r
-       }\r
-\r
-       final public int getHeight()\r
-       {\r
-               return this._size.h;\r
-       }\r
-\r
-       final public NyARIntSize getSize()\r
-       {\r
-               return this._size;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/INyARRgbRaster.java
deleted file mode 100644 (file)
index a3a16fa..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster.rgb;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.INyARRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-\r
-/**\r
- * 8bitRGBを表現できるラスタ\r
- * \r
- */\r
-public interface INyARRgbRaster extends INyARRaster\r
-{\r
-       public INyARRgbPixelReader getRgbPixelReader() throws NyARException;\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BGRA.java
deleted file mode 100644 (file)
index 995eb45..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster.rgb;\r
-\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-public class NyARRgbRaster_BGRA extends NyARRgbRaster_BasicClass implements INyARRgbRaster\r
-{\r
-       private class PixelReader implements INyARRgbPixelReader\r
-       {\r
-               private NyARRgbRaster_BGRA _parent;\r
-\r
-               public PixelReader(NyARRgbRaster_BGRA i_parent)\r
-               {\r
-                       this._parent = i_parent;\r
-               }\r
-\r
-               public void getPixel(int i_x, int i_y, int[] o_rgb)\r
-               {\r
-                       byte[] ref_buf = this._parent._ref_buf;\r
-                       int bp = (i_x + i_y * this._parent._size.w) * 4;\r
-                       o_rgb[0] = (ref_buf[bp + 2] & 0xff);// R\r
-                       o_rgb[1] = (ref_buf[bp + 1] & 0xff);// G\r
-                       o_rgb[2] = (ref_buf[bp + 0] & 0xff);// B\r
-                       return;\r
-               }\r
-\r
-               public void getPixelSet(int[] i_x, int[] i_y, int i_num, int[] o_rgb)\r
-               {\r
-                       int width = _parent._size.w;\r
-                       byte[] ref_buf = _parent._ref_buf;\r
-                       int bp;\r
-                       for (int i = i_num - 1; i >= 0; i--) {\r
-                               bp = (i_x[i] + i_y[i] * width) * 4;\r
-                               o_rgb[i * 3 + 0] = (ref_buf[bp + 2] & 0xff);// R\r
-                               o_rgb[i * 3 + 1] = (ref_buf[bp + 1] & 0xff);// G\r
-                               o_rgb[i * 3 + 2] = (ref_buf[bp + 0] & 0xff);// B\r
-                       }\r
-               }\r
-       }\r
-\r
-       private INyARRgbPixelReader _rgb_reader;\r
-       private INyARBufferReader _buffer_reader;\r
-       private byte[] _ref_buf;\r
-\r
-       public static NyARRgbRaster_BGRA wrap(byte[] i_buffer, int i_width, int i_height)\r
-       {\r
-               return new NyARRgbRaster_BGRA(i_buffer, i_width, i_height);\r
-       }\r
-\r
-       private NyARRgbRaster_BGRA(byte[] i_buffer, int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = i_buffer;\r
-               this._rgb_reader = new PixelReader(this);\r
-               this._buffer_reader=new NyARBufferReader(i_buffer,INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32);\r
-               return;\r
-       }\r
-       public INyARRgbPixelReader getRgbPixelReader()\r
-       {\r
-               return this._rgb_reader;\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_BasicClass.java
deleted file mode 100644 (file)
index 5ef9a16..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster.rgb;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.NyARRaster_BasicClass;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARRgbPixelReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-/**\r
- * NyARRasterインタフェイスの基本関数/メンバを実装したクラス\r
- * \r
- * \r
- */\r
-public abstract class NyARRgbRaster_BasicClass extends NyARRaster_BasicClass implements INyARRgbRaster\r
-{\r
-       protected NyARRgbRaster_BasicClass(final NyARIntSize i_size)\r
-       {\r
-               super(i_size);\r
-       }\r
-       public INyARRgbPixelReader getRgbPixcelReader() throws NyARException\r
-       {\r
-               NyARException.notImplement();\r
-               return null;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_Blank.java
deleted file mode 100644 (file)
index d7780c4..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster.rgb;\r
-\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARRgbPixelReader;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.NyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-/*\r
- * 真っ黒の矩形を定義する。\r
- * \r
- */\r
-public class NyARRgbRaster_Blank extends NyARRgbRaster_BasicClass\r
-{\r
-       private class PixelReader implements INyARRgbPixelReader\r
-       {\r
-               public void getPixel(int i_x, int i_y, int[] o_rgb)\r
-               {\r
-                       o_rgb[0] = 0;// R\r
-                       o_rgb[1] = 0;// G\r
-                       o_rgb[2] = 0;// B\r
-                       return;\r
-               }\r
-\r
-               public void getPixelSet(int[] i_x, int[] i_y, int i_num, int[] o_rgb)\r
-               {\r
-                       for (int i = i_num - 1; i >= 0; i--) {\r
-                               o_rgb[i * 3 + 0] = 0;// R\r
-                               o_rgb[i * 3 + 1] = 0;// G\r
-                               o_rgb[i * 3 + 2] = 0;// B\r
-                       }\r
-               }\r
-       }\r
-\r
-       private INyARRgbPixelReader _reader;\r
-       private INyARBufferReader _buffer_reader;\r
-       \r
-       public NyARRgbRaster_Blank(int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._reader = new PixelReader();\r
-               this._buffer_reader=new NyARBufferReader(null,INyARBufferReader.BUFFERFORMAT_NULL_ALLZERO);\r
-               return;\r
-       }\r
-       public INyARRgbPixelReader getRgbPixelReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/raster/rgb/NyARRgbRaster_RGB.java
deleted file mode 100644 (file)
index 33d6918..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.raster.rgb;\r
-\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-public class NyARRgbRaster_RGB extends NyARRgbRaster_BasicClass\r
-{\r
-       protected byte[] _ref_buf;\r
-\r
-       private NyARRgbPixelReader_RGB24 _reader;\r
-       private INyARBufferReader _buffer_reader;\r
-       \r
-       public static NyARRgbRaster_RGB wrap(byte[] i_buffer, int i_width, int i_height)\r
-       {\r
-               return new NyARRgbRaster_RGB(i_buffer, i_width, i_height);\r
-       }\r
-\r
-       private NyARRgbRaster_RGB(byte[] i_buffer, int i_width, int i_height)\r
-       {\r
-               super(new NyARIntSize(i_width,i_height));\r
-               this._ref_buf = i_buffer;\r
-               this._reader = new NyARRgbPixelReader_RGB24(i_buffer, this._size);\r
-               this._buffer_reader=new NyARBufferReader(i_buffer,INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24);\r
-               return;\r
-       }\r
-       public INyARRgbPixelReader getRgbPixelReader()\r
-       {\r
-               return this._reader;\r
-       }\r
-       public INyARBufferReader getBufferReader()\r
-       {\r
-               return this._buffer_reader;\r
-       }       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter.java
deleted file mode 100644 (file)
index fad5fb0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterfilter;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-\r
-public interface INyARRasterFilter\r
-{\r
-       public void doFilter(INyARRaster i_input, INyARRaster i_output) throws NyARException;\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_GsToBin.java
deleted file mode 100644 (file)
index 29f4920..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterfilter;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-\r
-public interface INyARRasterFilter_GsToBin\r
-{\r
-       public void doFilter(NyARGlayscaleRaster i_input, NyARBinRaster i_output) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/INyARRasterFilter_RgbToGs.java
deleted file mode 100644 (file)
index 0fdf48c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterfilter;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-\r
-/**\r
- * このインタフェイスは、RGBラスタをグレースケールラスタに変換します。\r
- *\r
- */\r
-public interface INyARRasterFilter_RgbToGs\r
-{\r
-       public void doFilter(INyARRgbRaster i_input, NyARGlayscaleRaster i_output) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/INyARRasterFilter_RgbToBin.java
deleted file mode 100644 (file)
index f1973bb..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-\r
-public interface INyARRasterFilter_RgbToBin\r
-{\r
-       public void doFilter(INyARRgbRaster i_input, NyARBinRaster i_output) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2bin/NyARRasterFilter_ARToolkitThreshold.java
deleted file mode 100644 (file)
index 1826a55..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * 定数閾値による2値化をする。\r
- * \r
- */\r
-public class NyARRasterFilter_ARToolkitThreshold implements INyARRasterFilter_RgbToBin\r
-{\r
-       private int _threshold;\r
-\r
-       public NyARRasterFilter_ARToolkitThreshold(int i_threshold)\r
-       {\r
-               this._threshold = i_threshold;\r
-       }\r
-       public void setThreshold(int i_threshold)\r
-       {\r
-               this._threshold = i_threshold;\r
-       }\r
-\r
-       public void doFilter(INyARRgbRaster i_input, NyARBinRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader();\r
-               int in_buf_type=in_buffer_reader.getBufferType();\r
-\r
-               assert (out_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_BIN_8));\r
-               assert (checkInputType(in_buf_type)==true);     \r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               byte[] in_buf = (byte[]) in_buffer_reader.getBuffer();\r
-\r
-               NyARIntSize size = i_output.getSize();\r
-               switch (in_buffer_reader.getBufferType()) {\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                       convert24BitRgb(in_buf, out_buf, size);\r
-                       break;\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32:\r
-                       convert32BitRgbx(in_buf, out_buf, size);\r
-                       break;\r
-               default:\r
-                       throw new NyARException();\r
-               }\r
-               return;\r
-       }\r
-\r
-       private void convert24BitRgb(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               final int size_w=i_size.w;\r
-               final int x_mod_end= size_w-(size_w%8);\r
-               final int th=this._threshold*3;\r
-               int bp =(size_w*i_size.h-1)*3;  \r
-               int w;\r
-               int x;          \r
-               for (int y =i_size.h-1; y>=0 ; y--){\r
-                       //端数分\r
-                       for (x = size_w-1;x>=x_mod_end;x--) {\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x]=w<=th?0:1;\r
-                               bp -= 3;\r
-                       }\r
-                       //タイリング               \r
-                       for (;x>=0;x-=8) {\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-1]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-2]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-3]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-4]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-5]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-6]=w<=th?0:1;\r
-                               bp -= 3;\r
-                               w=((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-7]=w<=th?0:1;\r
-                               bp -= 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-       private void convert32BitRgbx(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               final int size_w=i_size.w;\r
-               final int x_mod_end= size_w-(size_w%8);\r
-               final int th=this._threshold*3;\r
-               int bp =(size_w*i_size.h-1)*4;\r
-               int w;\r
-               int x;\r
-               for (int y =i_size.h-1; y>=0 ; y--){\r
-                       //端数分\r
-                       for (x = size_w-1;x>=x_mod_end;x--) {\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x]=w<=th?0:1;\r
-                               bp -= 4;\r
-                       }\r
-                       //タイリング\r
-                       for (;x>=0;x-=8) {\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-1]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-2]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-3]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-4]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-5]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-6]=w<=th?0:1;\r
-                               bp -= 4;\r
-                               w= ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff));\r
-                               i_out[y][x-7]=w<=th?0:1;\r
-                               bp -= 4;\r
-                       }       \r
-               }\r
-               return;\r
-       }\r
-       \r
-       private boolean checkInputType(int i_input_type) throws NyARException\r
-       {\r
-               switch(i_input_type){\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32:\r
-                       return true;\r
-               default:\r
-                       return false;\r
-               }\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARBufferReader.java
deleted file mode 100644 (file)
index 24f1815..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterreader;\r
-\r
-public interface INyARBufferReader\r
-{\r
-       /**\r
-        * RGB24フォーマットで、全ての画素が0\r
-        */\r
-       public static final int BUFFERFORMAT_NULL_ALLZERO = 0x00000001;\r
-\r
-       /**\r
-        * byte[]で、R8G8B8の24ビットで画素が格納されている。\r
-        */\r
-       public static final int BUFFERFORMAT_BYTE1D_R8G8B8_24 = 0x00010001;\r
-\r
-       /**\r
-        * byte[]で、B8G8R8の24ビットで画素が格納されている。\r
-        */\r
-       public static final int BUFFERFORMAT_BYTE1D_B8G8R8_24 = 0x00010002;\r
-\r
-       /**\r
-        * byte[]で、R8G8B8X8の32ビットで画素が格納されている。\r
-        */\r
-       public static final int BUFFERFORMAT_BYTE1D_B8G8R8X8_32 = 0x00010101;\r
-\r
-       /**\r
-        * int[][]で特に値範囲を定めない\r
-        */\r
-       public static final int BUFFERFORMAT_INT2D = 0x00020000;\r
-\r
-       /**\r
-        * int[][]で0-255のグレイスケール画像\r
-        */\r
-       public static final int BUFFERFORMAT_INT2D_GLAY_8 = 0x00020001;\r
-\r
-       /**\r
-        * int[][]で0/1の2値画像\r
-        */\r
-       public static final int BUFFERFORMAT_INT2D_BIN_8 = 0x00020002;\r
-\r
-       public Object getBuffer();\r
-       public int getBufferType();\r
-       public boolean isEqualBufferType(int i_type_value);\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/INyARRgbPixelReader.java
deleted file mode 100644 (file)
index 71b8c9c..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterreader;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-/**\r
- * R8G8B8でピクセルを読み出すインタフェイス\r
- * \r
- */\r
-public interface INyARRgbPixelReader\r
-{\r
-       /**\r
-        * 1ピクセルをint配列にして返します。\r
-        * \r
-        * @param i_x\r
-        * @param i_y\r
-        * @param i_rgb\r
-        */\r
-       public void getPixel(int i_x, int i_y, int[] i_rgb) throws NyARException;\r
-\r
-       /**\r
-        * 複数のピクセル値をi_rgbへ返します。\r
-        * \r
-        * @param i_x\r
-        * xのインデックス配列\r
-        * @param i_y\r
-        * yのインデックス配列\r
-        * @param i_num\r
-        * 返すピクセル値の数\r
-        * @param i_rgb\r
-        * ピクセル値を返すバッファ\r
-        */\r
-       public void getPixelSet(int[] i_x, int[] i_y, int i_num, int[] i_rgb) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARBufferReader.java
deleted file mode 100644 (file)
index dbbc5d1..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterreader;\r
-\r
-public class NyARBufferReader implements INyARBufferReader\r
-{\r
-       protected Object _buffer;\r
-       protected int _buffer_type;\r
-       public NyARBufferReader(Object i_buffer,int i_buffer_type)\r
-       {\r
-               this._buffer=i_buffer;\r
-               this._buffer_type=i_buffer_type;\r
-       }\r
-       public Object getBuffer()\r
-       {\r
-               return this._buffer;\r
-       }\r
-       public int getBufferType()\r
-       {\r
-               return _buffer_type;\r
-       }\r
-       public boolean isEqualBufferType(int i_type_value)\r
-       {\r
-               return this._buffer_type==i_type_value;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/rasterreader/NyARRgbPixelReader_RGB24.java
deleted file mode 100644 (file)
index 86d3dba..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.rasterreader;\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-/**\r
- * byte[]配列に、パディング無しの8bit画素値が、RGBRGBの順で並んでいる\r
- * バッファに使用できるピクセルリーダー\r
- *\r
- */\r
-public class NyARRgbPixelReader_RGB24 implements INyARRgbPixelReader\r
-{\r
-       protected byte[] _ref_buf;\r
-\r
-       private NyARIntSize _size;\r
-\r
-       public NyARRgbPixelReader_RGB24(byte[] i_buf, NyARIntSize i_size)\r
-       {\r
-               this._ref_buf = i_buf;\r
-               this._size = i_size;\r
-       }\r
-\r
-       public void getPixel(int i_x, int i_y, int[] o_rgb)\r
-       {\r
-               byte[] ref_buf = this._ref_buf;\r
-               int bp = (i_x + i_y * this._size.w) * 3;\r
-               o_rgb[0] = (ref_buf[bp + 0] & 0xff);// R\r
-               o_rgb[1] = (ref_buf[bp + 1] & 0xff);// G\r
-               o_rgb[2] = (ref_buf[bp + 2] & 0xff);// B\r
-               return;\r
-       }\r
-\r
-       public void getPixelSet(int[] i_x, int[] i_y, int i_num, int[] o_rgb)\r
-       {\r
-               int width = this._size.w;\r
-               byte[] ref_buf = this._ref_buf;\r
-               int bp;\r
-               for (int i = i_num - 1; i >= 0; i--) {\r
-                       bp = (i_x[i] + i_y[i] * width) * 3;\r
-                       o_rgb[i * 3 + 0] = (ref_buf[bp + 0] & 0xff);// R\r
-                       o_rgb[i * 3 + 1] = (ref_buf[bp + 1] & 0xff);// G\r
-                       o_rgb[i * 3 + 2] = (ref_buf[bp + 2] & 0xff);// B\r
-               }\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/INyARTransMat.java
deleted file mode 100644 (file)
index f90ba47..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARSquare;\r
-\r
-\r
-/**\r
- * This class calculates ARMatrix from square information. -- 変換行列を計算するクラス。\r
- * \r
- */\r
-public interface INyARTransMat\r
-{\r
-       public void setCenter(double i_x, double i_y);\r
-       public void transMat(NyARSquare i_square, int i_direction, double i_width, NyARTransMatResult o_result) throws NyARException;\r
-       public void transMatContinue(NyARSquare i_square, int i_direction, double i_width, NyARTransMatResult io_result_conv) throws NyARException;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMat.java
deleted file mode 100644 (file)
index 067818f..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-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.types.*;\r
-\r
-\r
-/**\r
- * This class calculates ARMatrix from square information and holds it. --\r
- * 変換行列を計算して、結果を保持するクラス。\r
- * \r
- */\r
-public class NyARTransMat implements INyARTransMat\r
-{\r
-       private final static double AR_GET_TRANS_CONT_MAT_MAX_FIT_ERROR = 1.0;\r
-\r
-       private final NyARRotMatrix _rotmatrix;\r
-       private final NyARDoublePoint2d _center=new NyARDoublePoint2d(0,0);\r
-       private final NyARFitVecCalculator _calculator;\r
-       private final NyARTransOffset _offset=new NyARTransOffset();\r
-       private final NyARRotTransOptimize _mat_optimize;\r
-\r
-\r
-       public NyARTransMat(NyARParam i_param) throws NyARException\r
-       {\r
-               final NyARCameraDistortionFactor dist=i_param.getDistortionFactor();\r
-               final NyARPerspectiveProjectionMatrix pmat=i_param.getPerspectiveProjectionMatrix();\r
-               this._calculator=new NyARFitVecCalculator(pmat,dist);\r
-               this._rotmatrix = new NyARRotMatrix(pmat);\r
-               this._mat_optimize=new NyARRotTransOptimize(pmat);\r
-       }\r
-\r
-       public void setCenter(double i_x, double i_y)\r
-       {\r
-               this._center.x= i_x;\r
-               this._center.y= i_y;\r
-       }\r
-\r
-\r
-\r
-\r
-       /**\r
-        * 頂点順序をi_directionに対応して並べ替えます。\r
-        * @param i_square\r
-        * @param i_direction\r
-        * @param o_sqvertex_ref\r
-        * @param o_liner_ref\r
-        */\r
-       private final void initVertexOrder(NyARSquare i_square, int i_direction, NyARDoublePoint2d[] o_sqvertex_ref, NyARLinear[] o_liner_ref)\r
-       {\r
-               //頂点順序を考慮した矩形の頂点情報\r
-               o_sqvertex_ref[0]= i_square.sqvertex[(4 - i_direction) % 4];\r
-               o_sqvertex_ref[1]= i_square.sqvertex[(5 - i_direction) % 4];\r
-               o_sqvertex_ref[2]= i_square.sqvertex[(6 - i_direction) % 4];\r
-               o_sqvertex_ref[3]= i_square.sqvertex[(7 - i_direction) % 4];    \r
-               o_liner_ref[0]=i_square.line[(4 - i_direction) % 4];\r
-               o_liner_ref[1]=i_square.line[(5 - i_direction) % 4];\r
-               o_liner_ref[2]=i_square.line[(6 - i_direction) % 4];\r
-               o_liner_ref[3]=i_square.line[(7 - i_direction) % 4];\r
-               return;\r
-       }\r
-\r
-\r
-       private final NyARDoublePoint2d[] __transMat_sqvertex_ref = new NyARDoublePoint2d[4];\r
-       private final NyARLinear[] __transMat_linear_ref=new NyARLinear[4];\r
-       private final NyARDoublePoint3d __transMat_trans=new NyARDoublePoint3d();\r
-       /**\r
-        * double arGetTransMat( ARMarkerInfo *marker_info,double center[2], double width, double conv[3][4] )\r
-        * \r
-        * @param i_square\r
-        * 計算対象のNyARSquareオブジェクト\r
-        * @param i_direction\r
-        * @param i_width\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public void transMat(final NyARSquare i_square, int i_direction, double i_width, NyARTransMatResult o_result_conv) throws NyARException\r
-       {\r
-               final NyARDoublePoint2d[] sqvertex_ref = __transMat_sqvertex_ref;\r
-               final NyARLinear[] linear_ref=__transMat_linear_ref;\r
-               final NyARDoublePoint3d trans=this.__transMat_trans;\r
-               \r
-               //計算用に頂点情報を初期化(順番調整)\r
-               initVertexOrder(i_square, i_direction, sqvertex_ref,linear_ref);\r
-               \r
-               //基準矩形を設定\r
-               this._offset.setSquare(i_width,this._center);\r
-\r
-               // rotationを矩形情報から計算\r
-               this._rotmatrix.initRotBySquare(linear_ref,sqvertex_ref);\r
-\r
-               //平行移動量計算機にオフセット頂点をセット\r
-               this._calculator.setOffsetSquare(this._offset);\r
-               \r
-               //平行移動量計算機に適応先矩形の情報をセット\r
-               this._calculator.setFittedSquare(sqvertex_ref); \r
-\r
-               //回転行列の平行移動量の計算\r
-               this._calculator.calculateTransfer(this._rotmatrix,trans);\r
-               \r
-               //計算結果の最適化(this._rotmatrix,trans)\r
-               this._mat_optimize.optimize(this._rotmatrix,trans,this._calculator);\r
-               \r
-               // マトリクスの保存\r
-               o_result_conv.updateMatrixValue(this._rotmatrix, this._offset.point, trans);\r
-               return;\r
-       }\r
-       /**\r
-        * double arGetTransMatCont( ARMarkerInfo *marker_info, double prev_conv[3][4],double center[2], double width, double conv[3][4] )\r
-        * \r
-        * @param i_square\r
-        * @param i_direction\r
-        * マーカーの方位を指定する。\r
-        * @param i_width\r
-        * @param io_result_conv\r
-        * 計算履歴を持つNyARTransMatResultオブジェクトを指定する。 履歴を持たない場合は、transMatと同じ処理を行う。\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public void transMatContinue(NyARSquare i_square, int i_direction, double i_width, NyARTransMatResult io_result_conv) throws NyARException\r
-       {\r
-               final NyARDoublePoint2d[] sqvertex_ref = __transMat_sqvertex_ref;\r
-               final NyARLinear[] linear_ref=__transMat_linear_ref;\r
-               final NyARDoublePoint3d trans=this.__transMat_trans;\r
-\r
-               // io_result_convが初期値なら、transMatで計算する。\r
-               if (!io_result_conv.hasValue()) {\r
-                       this.transMat(i_square, i_direction, i_width, io_result_conv);\r
-                       return;\r
-               }\r
-               \r
-               //基準矩形を設定\r
-               this._offset.setSquare(i_width,this._center);\r
-\r
-               // rotationを矩形情報を一つ前の変換行列で初期化\r
-               this._rotmatrix.initRotByPrevResult(io_result_conv);\r
-\r
-               //平行移動量計算機に、オフセット頂点をセット\r
-               this._calculator.setOffsetSquare(this._offset);\r
-               \r
-               //平行移動量計算機に、適応先矩形の情報をセット\r
-               this._calculator.setFittedSquare(sqvertex_ref); \r
-                               \r
-               //回転行列の平行移動量の計算\r
-               this._calculator.calculateTransfer(this._rotmatrix,trans);\r
-               \r
-               //計算結果の最適化(this._rotmatrix,trans)\r
-               final double err=this._mat_optimize.optimize(this._rotmatrix,trans,this._calculator);\r
-               \r
-               //計算結果を保存\r
-               io_result_conv.updateMatrixValue(this._rotmatrix, this._offset.point, trans);\r
-\r
-               // エラー値が許容範囲でなければTransMatをやり直し\r
-               if (err > AR_GET_TRANS_CONT_MAT_MAX_FIT_ERROR) {\r
-                       // rotationを矩形情報で初期化\r
-                       this._rotmatrix.initRotBySquare(linear_ref,sqvertex_ref);\r
-                       //回転行列の平行移動量の計算\r
-                       this._calculator.calculateTransfer(this._rotmatrix,trans);\r
-                       //計算結果の最適化(this._rotmatrix,trans)\r
-                       final double err2=this._mat_optimize.optimize(this._rotmatrix,trans,this._calculator);\r
-                       //エラー値が低かったら値を差換え\r
-                       if (err2 < err) {\r
-                               // 良い値が取れたら、差換え\r
-                               io_result_conv.updateMatrixValue(this._rotmatrix, this._offset.point, trans);\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransMatResult.java
deleted file mode 100644 (file)
index 1c962c3..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.types.matrix.*;\r
-\r
-/**\r
- * NyARTransMat戻り値専用のNyARMat\r
- * \r
- */\r
-public class NyARTransMatResult extends NyARDoubleMatrix34\r
-{\r
-       private boolean has_value = false;\r
-\r
-\r
-       /**\r
-        * パラメータで変換行列を更新します。\r
-        * \r
-        * @param i_rot\r
-        * @param i_off\r
-        * @param i_trans\r
-        */\r
-       public void updateMatrixValue(NyARRotMatrix i_rot, NyARDoublePoint3d i_off, NyARDoublePoint3d i_trans)\r
-       {\r
-               this.m00=i_rot.m00;\r
-               this.m01=i_rot.m01;\r
-               this.m02=i_rot.m02;\r
-               this.m03=i_rot.m00 * i_off.x + i_rot.m01 * i_off.y + i_rot.m02 * i_off.z + i_trans.x;\r
-\r
-               this.m10 = i_rot.m10;\r
-               this.m11 = i_rot.m11;\r
-               this.m12 = i_rot.m12;\r
-               this.m13 = i_rot.m10 * i_off.x + i_rot.m11 * i_off.y + i_rot.m12 * i_off.z + i_trans.y;\r
-\r
-               this.m20 = i_rot.m20;\r
-               this.m21 = i_rot.m21;\r
-               this.m22 = i_rot.m22;\r
-               this.m23 = i_rot.m20 * i_off.x + i_rot.m21 * i_off.y + i_rot.m22 * i_off.z + i_trans.z;\r
-\r
-               this.has_value = true;\r
-               return;\r
-       }\r
-\r
-       public boolean hasValue()\r
-       {\r
-               return this.has_value;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/NyARTransOffset.java
deleted file mode 100644 (file)
index bc776fb..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat;\r
-\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-\r
-final public class NyARTransOffset\r
-{\r
-       public NyARDoublePoint3d[] vertex=NyARDoublePoint3d.createArray(4);\r
-       public NyARDoublePoint3d point=new NyARDoublePoint3d(); \r
-       /**\r
-        * 中心位置と辺長から、オフセット情報を作成して設定する。\r
-        * @param i_width\r
-        * @param i_center\r
-        */\r
-       public void setSquare(double i_width,NyARDoublePoint2d i_center)\r
-       {\r
-               final double w_2 = i_width / 2.0;\r
-               \r
-               NyARDoublePoint3d vertex3d_ptr;\r
-               vertex3d_ptr= this.vertex[0];\r
-               vertex3d_ptr.x = -w_2;\r
-               vertex3d_ptr.y =  w_2;\r
-               vertex3d_ptr.z = 0.0;\r
-               vertex3d_ptr= this.vertex[1];\r
-               vertex3d_ptr.x = w_2;\r
-               vertex3d_ptr.y = w_2;\r
-               vertex3d_ptr.z = 0.0;\r
-               vertex3d_ptr= this.vertex[2];\r
-               vertex3d_ptr.x =  w_2;\r
-               vertex3d_ptr.y = -w_2;\r
-               vertex3d_ptr.z = 0.0;\r
-               vertex3d_ptr= this.vertex[3];\r
-               vertex3d_ptr.x = -w_2;\r
-               vertex3d_ptr.y = -w_2;\r
-               vertex3d_ptr.z = 0.0;\r
-               \r
-               this.point.x=-i_center.x;\r
-               this.point.y=-i_center.y;\r
-               this.point.z=0;\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/fitveccalc/NyARFitVecCalculator.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/fitveccalc/NyARFitVecCalculator.java
deleted file mode 100644 (file)
index 5830d02..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat.fitveccalc;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransOffset;\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.*;\r
-import jp.nyatla.nyartoolkit.core.param.*;\r
-/**\r
- * 平行移動量を計算するクラス\r
- * \r
- * NyARPerspectiveProjectionMatrixに直接アクセスしてる場所があるけど、\r
- * この辺の計算はNyARPerspectiveProjectionMatrixクラスの関数にして押し込む予定。\r
- *\r
- */\r
-public class NyARFitVecCalculator\r
-{\r
-       private final NyARMat _mat_b = new NyARMat(3,8);//3,NUMBER_OF_VERTEX*2\r
-       private final NyARMat _mat_a = new NyARMat(8,3);/*NUMBER_OF_VERTEX,3*/\r
-       private final NyARMat _mat_d = new NyARMat(3,3);\r
-       private final NyARPerspectiveProjectionMatrix _projection_mat;\r
-       private final NyARCameraDistortionFactor _distortionfactor;\r
-\r
-\r
-//     private NyARDoublePoint2d[] _vertex_2d_ref;\r
-       public NyARFitVecCalculator(final NyARPerspectiveProjectionMatrix i_projection_mat_ref,final NyARCameraDistortionFactor i_distortion_ref)\r
-       {\r
-               // 変換マトリクスdとbの準備(arGetTransMatSubの一部)\r
-               final double[][] a_array = this._mat_a.getArray();\r
-               final double[][] b_array = this._mat_b.getArray();\r
-\r
-               //変換用行列のcpara固定値の部分を先に初期化してしまう。\r
-               for (int i = 0; i < 4; i++) {\r
-                       final int x2 = i * 2;\r
-                       a_array[x2][0] = b_array[0][x2] = i_projection_mat_ref.m00;// mat_a->m[j*6+0]=mat_b->m[num*0+j*2] =cpara[0][0];\r
-                       a_array[x2][1] = b_array[1][x2] = i_projection_mat_ref.m01;// mat_a->m[j*6+1]=mat_b->m[num*2+j*2]=cpara[0][1];\r
-                       //a_array[x2][2] = b_array[2][x2] = cpara[0 * 4 + 2] - o_marker_vertex_2d[i].x;// mat_a->m[j*6+2]=mat_b->m[num*4+j*2]=cpara[0][2]-pos2d[j][0];\r
-                       a_array[x2 + 1][0] = b_array[0][x2 + 1] = 0.0;// mat_a->m[j*6+3] =mat_b->m[num*0+j*2+1]= 0.0;\r
-                       a_array[x2 + 1][1] = b_array[1][x2 + 1] = i_projection_mat_ref.m11;// mat_a->m[j*6+4] =mat_b->m[num*2+j*2+1]= cpara[1][1];\r
-                       //a_array[x2 + 1][2] = b_array[2][x2 + 1] = cpara[1 * 4 + 2] - o_marker_vertex_2d[i].y;// mat_a->m[j*6+5]=mat_b->m[num*4+j*2+1]=cpara[1][2]-pos2d[j][1];\r
-               }\r
-               this._projection_mat=i_projection_mat_ref;\r
-               this._distortionfactor=i_distortion_ref;\r
-               return;\r
-       }\r
-       private final NyARDoublePoint2d[] _fitsquare_vertex=NyARDoublePoint2d.createArray(4);;\r
-       private NyARTransOffset _offset_square;\r
-       public void setOffsetSquare(NyARTransOffset i_offset)\r
-       {\r
-               this._offset_square=i_offset;\r
-               return;\r
-       }\r
-       public NyARDoublePoint2d[] getFitSquare()\r
-       {\r
-               return this._fitsquare_vertex;\r
-       }\r
-       public NyARTransOffset getOffsetVertex()\r
-       {\r
-               return this._offset_square;\r
-       }\r
-\r
-       /**\r
-        * 適合させる矩形座標を指定します。\r
-        * @param i_square_vertex\r
-        * @throws NyARException\r
-        */\r
-       public void setFittedSquare(NyARDoublePoint2d[] i_square_vertex) throws NyARException\r
-       {\r
-               final NyARDoublePoint2d[] vertex=_fitsquare_vertex;\r
-//             int i;\r
-//             if (arFittingMode == AR_FITTING_TO_INPUT) {\r
-//                     // arParamIdeal2Observをバッチ処理\r
-               this._distortionfactor.ideal2ObservBatch(i_square_vertex, vertex,4);\r
-//             } else {\r
-//                     for (i = 0; i < NUMBER_OF_VERTEX; i++) {\r
-//                             o_marker_vertex_2d[i].x = i_square_vertex[i].x;\r
-//                             o_marker_vertex_2d[i].y = i_square_vertex[i].y;\r
-//                     }\r
-//             }               \r
-               \r
-               \r
-               final double cpara02=this._projection_mat.m02;\r
-               final double cpara12=this._projection_mat.m12;          \r
-               final NyARMat mat_d=_mat_d;\r
-               final NyARMat mat_a=this._mat_a;\r
-               final NyARMat mat_b=this._mat_b;\r
-               final double[][] a_array = mat_a.getArray();\r
-               final double[][] b_array = mat_b.getArray();\r
-               for (int i = 0; i < 4; i++) {\r
-                       final int x2 = i * 2;   \r
-                       a_array[x2][2] = b_array[2][x2] = cpara02 - vertex[i].x;// mat_a->m[j*6+2]=mat_b->m[num*4+j*2]=cpara[0][2]-pos2d[j][0];\r
-                       a_array[x2 + 1][2] = b_array[2][x2 + 1] = cpara12 - vertex[i].y;// mat_a->m[j*6+5]=mat_b->m[num*4+j*2+1]=cpara[1][2]-pos2d[j][1];\r
-               }\r
-               // mat_d\r
-               mat_d.matrixMul(mat_b, mat_a);\r
-               mat_d.matrixSelfInv();          \r
-               return;\r
-       }\r
-       private final NyARMat _mat_e = new NyARMat(3, 1);\r
-       private final NyARMat _mat_f = new NyARMat(3, 1);\r
-       private final NyARMat __calculateTransferVec_mat_c = new NyARMat(8, 1);//NUMBER_OF_VERTEX * 2, 1\r
-       private final NyARDoublePoint3d[] __calculateTransfer_point3d=NyARDoublePoint3d.createArray(4); \r
-       \r
-       /**\r
-        * 現在のオフセット矩形、適合先矩形と、回転行列から、平行移動量を計算します。\r
-        * @param i_rotation\r
-        * @param o_transfer\r
-        * @throws NyARException\r
-        */\r
-       final public void calculateTransfer(NyARRotMatrix i_rotation,NyARDoublePoint3d o_transfer) throws NyARException\r
-       {\r
-               assert(this._offset_square!=null);\r
-               final double cpara00=this._projection_mat.m00;\r
-               final double cpara01=this._projection_mat.m01;\r
-               final double cpara02=this._projection_mat.m02;\r
-               final double cpara11=this._projection_mat.m11;\r
-               final double cpara12=this._projection_mat.m12;\r
-               \r
-               final NyARDoublePoint3d[] point3d=this.__calculateTransfer_point3d;\r
-               final NyARDoublePoint3d[] vertex3d=this._offset_square.vertex;          \r
-               final NyARDoublePoint2d[] vertex2d=this._fitsquare_vertex;\r
-               final NyARMat mat_c = this.__calculateTransferVec_mat_c;// 次処理で値をもらうので、初期化の必要は無い。\r
-       \r
-               final double[][] f_array = this._mat_f.getArray();\r
-               final double[][] c_array = mat_c.getArray();\r
-               \r
-               \r
-               //(3D座標?)を一括請求\r
-               i_rotation.getPoint3dBatch(vertex3d,point3d,4);\r
-               for (int i = 0; i < 4; i++) {\r
-                       final int x2 = i+i;\r
-                       final NyARDoublePoint3d point3d_ptr=point3d[i];\r
-//                     i_rotation.getPoint3d(vertex3d[i],point3d);\r
-                       //透視変換?\r
-                       c_array[x2][0] = point3d_ptr.z * vertex2d[i].x - cpara00 * point3d_ptr.x - cpara01 * point3d_ptr.y - cpara02 * point3d_ptr.z;// mat_c->m[j*2+0] = wz*pos2d[j][0]-cpara[0][0]*wx-cpara[0][1]*wy-cpara[0][2]*wz;\r
-                       c_array[x2 + 1][0] = point3d_ptr.z * vertex2d[i].y - cpara11 * point3d_ptr.y - cpara12 * point3d_ptr.z;// mat_c->m[j*2+1]= wz*pos2d[j][1]-cpara[1][1]*wy-cpara[1][2]*wz;\r
-               }\r
-               this._mat_e.matrixMul(this._mat_b, mat_c);\r
-               this._mat_f.matrixMul(this._mat_d, this._mat_e);\r
-\r
-               // double[] trans=wk_arGetTransMatSub_trans;//double trans[3];\r
-               o_transfer.x= f_array[0][0];// trans[0] = mat_f->m[0];\r
-               o_transfer.y= f_array[1][0];\r
-               o_transfer.z= f_array[2][0];// trans[2] = mat_f->m[2];\r
-               return;\r
-       }\r
-       \r
-       \r
-       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/INyARRotTransOptimize.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/INyARRotTransOptimize.java
deleted file mode 100644 (file)
index 879b9a7..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat.optimize;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.NyARFitVecCalculator;\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
-\r
-public interface INyARRotTransOptimize\r
-{\r
-       public double optimize(NyARRotMatrix io_rotmat,NyARDoublePoint3d io_transvec,NyARFitVecCalculator i_calculator) throws NyARException;\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/optimize/NyARRotTransOptimize.java
deleted file mode 100644 (file)
index 27aff2f..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat.optimize;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.param.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.fitveccalc.NyARFitVecCalculator;\r
-import jp.nyatla.nyartoolkit.core.transmat.rotmatrix.NyARRotMatrix;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint3d;\r
-/**\r
- * 基本姿勢と実画像を一致するように、角度を微調整→平行移動量を再計算\r
- * を繰り返して、変換行列を最適化する。\r
- *\r
- */\r
-public class NyARRotTransOptimize implements INyARRotTransOptimize\r
-{\r
-       private final static int AR_GET_TRANS_MAT_MAX_LOOP_COUNT = 5;// #define AR_GET_TRANS_MAT_MAX_LOOP_COUNT 5\r
-       private final static double AR_GET_TRANS_MAT_MAX_FIT_ERROR = 1.0;// #define AR_GET_TRANS_MAT_MAX_FIT_ERROR 1.0\r
-       private final NyARPerspectiveProjectionMatrix _projection_mat_ref;\r
-       public NyARRotTransOptimize(NyARPerspectiveProjectionMatrix i_projection_mat_ref)\r
-       {\r
-               this._projection_mat_ref=i_projection_mat_ref;\r
-               return;\r
-       }\r
-       \r
-       final public double optimize(NyARRotMatrix io_rotmat,NyARDoublePoint3d io_transvec,NyARFitVecCalculator i_calculator) throws NyARException\r
-       {\r
-               final NyARDoublePoint2d[] fit_vertex=i_calculator.getFitSquare();\r
-               final NyARDoublePoint3d[] offset_square=i_calculator.getOffsetVertex().vertex;\r
-               \r
-               double err = -1;\r
-               /*ループを抜けるタイミングをARToolKitと合わせるために変なことしてます。*/\r
-               for (int i = 0;; i++) {\r
-                       // <arGetTransMat3>\r
-                       err = modifyMatrix(io_rotmat,io_transvec,offset_square,fit_vertex);\r
-                       i_calculator.calculateTransfer(io_rotmat, io_transvec);\r
-                       err = modifyMatrix(io_rotmat,io_transvec,offset_square,fit_vertex);                     \r
-                       // //</arGetTransMat3>\r
-                       if (err < AR_GET_TRANS_MAT_MAX_FIT_ERROR || i == AR_GET_TRANS_MAT_MAX_LOOP_COUNT-1) {\r
-                               break;\r
-                       }\r
-                       i_calculator.calculateTransfer(io_rotmat, io_transvec);\r
-               }               \r
-               return err;\r
-       }\r
-       \r
-       private final double[][] __modifyMatrix_double1D = new double[8][3];\r
-       private final NyARDoublePoint3d __modifyMatrix_angle = new NyARDoublePoint3d(); \r
-       /**\r
-        * arGetRot計算を階層化したModifyMatrix 896\r
-        * \r
-        * @param nyrot\r
-        * @param trans\r
-        * @param i_vertex3d\r
-        * [m][3]\r
-        * @param i_vertex2d\r
-        * [n][2]\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       private double modifyMatrix(NyARRotMatrix io_rot,NyARDoublePoint3d trans, NyARDoublePoint3d[] i_vertex3d, NyARDoublePoint2d[] i_vertex2d) throws NyARException\r
-       {\r
-               double factor;\r
-               double a2, b2, c2;\r
-               double ma = 0.0, mb = 0.0, mc = 0.0;\r
-               double h, x, y;\r
-               double err, minerr = 0;\r
-               int t1, t2, t3;\r
-               int s1 = 0, s2 = 0, s3 = 0;\r
-\r
-               factor = 10.0 * Math.PI / 180.0;\r
-               double rot0, rot1, rot3, rot4, rot6, rot7;\r
-               double combo00, combo01, combo02, combo03, combo10, combo11, combo12, combo13, combo20, combo21, combo22, combo23;\r
-               double combo02_2, combo02_5, combo02_8, combo02_11;\r
-               double combo22_2, combo22_5, combo22_8, combo22_11;\r
-               double combo12_2, combo12_5, combo12_8, combo12_11;\r
-               // vertex展開\r
-               final double VX00, VX01, VX02, VX10, VX11, VX12, VX20, VX21, VX22, VX30, VX31, VX32;\r
-               NyARDoublePoint3d d_pt;\r
-               d_pt = i_vertex3d[0];\r
-               VX00 = d_pt.x;\r
-               VX01 = d_pt.y;\r
-               VX02 = d_pt.z;\r
-               d_pt = i_vertex3d[1];\r
-               VX10 = d_pt.x;\r
-               VX11 = d_pt.y;\r
-               VX12 = d_pt.z;\r
-               d_pt = i_vertex3d[2];\r
-               VX20 = d_pt.x;\r
-               VX21 = d_pt.y;\r
-               VX22 = d_pt.z;\r
-               d_pt = i_vertex3d[3];\r
-               VX30 = d_pt.x;\r
-               VX31 = d_pt.y;\r
-               VX32 = d_pt.z;\r
-               final double P2D00, P2D01, P2D10, P2D11, P2D20, P2D21, P2D30, P2D31;\r
-               NyARDoublePoint2d d_pt2;\r
-               d_pt2 = i_vertex2d[0];\r
-               P2D00 = d_pt2.x;\r
-               P2D01 = d_pt2.y;\r
-               d_pt2 = i_vertex2d[1];\r
-               P2D10 = d_pt2.x;\r
-               P2D11 = d_pt2.y;\r
-               d_pt2 = i_vertex2d[2];\r
-               P2D20 = d_pt2.x;\r
-               P2D21 = d_pt2.y;\r
-               d_pt2 = i_vertex2d[3];\r
-               P2D30 = d_pt2.x;\r
-               P2D31 = d_pt2.y;\r
-               final NyARPerspectiveProjectionMatrix prjmat = this._projection_mat_ref;\r
-               final double CP0, CP1, CP2, CP4, CP5, CP6, CP8, CP9, CP10;\r
-               CP0 = prjmat.m00;\r
-               CP1 = prjmat.m01;\r
-               CP2 = prjmat.m02;\r
-               CP4 = prjmat.m10;\r
-               CP5 = prjmat.m11;\r
-               CP6 = prjmat.m12;\r
-               CP8 = prjmat.m20;\r
-               CP9 = prjmat.m21;\r
-               CP10 = prjmat.m22;\r
-               combo03 = CP0 * trans.x + CP1 * trans.y + CP2 * trans.z + prjmat.m03;\r
-               combo13 = CP4 * trans.x + CP5 * trans.y + CP6 * trans.z + prjmat.m13;\r
-               combo23 = CP8 * trans.x + CP9 * trans.y + CP10 * trans.z + prjmat.m23;\r
-               double CACA, SASA, SACA, CA, SA;\r
-               double CACACB, SACACB, SASACB, CASB, SASB;\r
-               double SACASC, SACACBSC, SACACBCC, SACACC;\r
-               final double[][] double1D = this.__modifyMatrix_double1D;\r
-\r
-               final NyARDoublePoint3d angle = this.__modifyMatrix_angle;\r
-\r
-               final double[] a_factor = double1D[1];\r
-               final double[] sinb = double1D[2];\r
-               final double[] cosb = double1D[3];\r
-               final double[] b_factor = double1D[4];\r
-               final double[] sinc = double1D[5];\r
-               final double[] cosc = double1D[6];\r
-               final double[] c_factor = double1D[7];\r
-               double w, w2;\r
-               double wsin, wcos;\r
-               \r
-               io_rot.getAngle(angle);// arGetAngle( rot, &a, &b, &c );\r
-               a2 = angle.x;\r
-               b2 = angle.y;\r
-               c2 = angle.z;\r
-\r
-               // comboの3行目を先に計算\r
-               for (int i = 0; i < 10; i++) {\r
-                       minerr = 1000000000.0;\r
-                       // sin-cosテーブルを計算(これが外に出せるとは…。)\r
-                       for (int j = 0; j < 3; j++) {\r
-                               w2 = factor * (j - 1);\r
-                               w = a2 + w2;\r
-                               a_factor[j] = w;\r
-                               w = b2 + w2;\r
-                               b_factor[j] = w;\r
-                               sinb[j] = Math.sin(w);\r
-                               cosb[j] = Math.cos(w);\r
-                               w = c2 + w2;\r
-                               c_factor[j] = w;\r
-                               sinc[j] = Math.sin(w);\r
-                               cosc[j] = Math.cos(w);\r
-                       }\r
-                       //\r
-                       for (t1 = 0; t1 < 3; t1++) {\r
-                               SA = Math.sin(a_factor[t1]);\r
-                               CA = Math.cos(a_factor[t1]);\r
-                               // Optimize\r
-                               CACA = CA * CA;\r
-                               SASA = SA * SA;\r
-                               SACA = SA * CA;\r
-                               for (t2 = 0; t2 < 3; t2++) {\r
-                                       wsin = sinb[t2];\r
-                                       wcos = cosb[t2];\r
-                                       CACACB = CACA * wcos;\r
-                                       SACACB = SACA * wcos;\r
-                                       SASACB = SASA * wcos;\r
-                                       CASB = CA * wsin;\r
-                                       SASB = SA * wsin;\r
-                                       // comboの計算1\r
-                                       combo02 = CP0 * CASB + CP1 * SASB + CP2 * wcos;\r
-                                       combo12 = CP4 * CASB + CP5 * SASB + CP6 * wcos;\r
-                                       combo22 = CP8 * CASB + CP9 * SASB + CP10 * wcos;\r
-\r
-                                       combo02_2 = combo02 * VX02 + combo03;\r
-                                       combo02_5 = combo02 * VX12 + combo03;\r
-                                       combo02_8 = combo02 * VX22 + combo03;\r
-                                       combo02_11 = combo02 * VX32 + combo03;\r
-                                       combo12_2 = combo12 * VX02 + combo13;\r
-                                       combo12_5 = combo12 * VX12 + combo13;\r
-                                       combo12_8 = combo12 * VX22 + combo13;\r
-                                       combo12_11 = combo12 * VX32 + combo13;\r
-                                       combo22_2 = combo22 * VX02 + combo23;\r
-                                       combo22_5 = combo22 * VX12 + combo23;\r
-                                       combo22_8 = combo22 * VX22 + combo23;\r
-                                       combo22_11 = combo22 * VX32 + combo23;\r
-                                       for (t3 = 0; t3 < 3; t3++) {\r
-                                               wsin = sinc[t3];\r
-                                               wcos = cosc[t3];\r
-                                               SACASC = SACA * wsin;\r
-                                               SACACC = SACA * wcos;\r
-                                               SACACBSC = SACACB * wsin;\r
-                                               SACACBCC = SACACB * wcos;\r
-\r
-                                               rot0 = CACACB * wcos + SASA * wcos + SACACBSC - SACASC;\r
-                                               rot3 = SACACBCC - SACACC + SASACB * wsin + CACA * wsin;\r
-                                               rot6 = -CASB * wcos - SASB * wsin;\r
-\r
-                                               combo00 = CP0 * rot0 + CP1 * rot3 + CP2 * rot6;\r
-                                               combo10 = CP4 * rot0 + CP5 * rot3 + CP6 * rot6;\r
-                                               combo20 = CP8 * rot0 + CP9 * rot3 + CP10 * rot6;\r
-\r
-                                               rot1 = -CACACB * wsin - SASA * wsin + SACACBCC - SACACC;\r
-                                               rot4 = -SACACBSC + SACASC + SASACB * wcos + CACA * wcos;\r
-                                               rot7 = CASB * wsin - SASB * wcos;\r
-                                               combo01 = CP0 * rot1 + CP1 * rot4 + CP2 * rot7;\r
-                                               combo11 = CP4 * rot1 + CP5 * rot4 + CP6 * rot7;\r
-                                               combo21 = CP8 * rot1 + CP9 * rot4 + CP10 * rot7;\r
-                                               //\r
-                                               err = 0.0;\r
-                                               h = combo20 * VX00 + combo21 * VX01 + combo22_2;\r
-                                               x = P2D00 - (combo00 * VX00 + combo01 * VX01 + combo02_2) / h;\r
-                                               y = P2D01 - (combo10 * VX00 + combo11 * VX01 + combo12_2) / h;\r
-                                               err += x * x + y * y;\r
-                                               h = combo20 * VX10 + combo21 * VX11 + combo22_5;\r
-                                               x = P2D10 - (combo00 * VX10 + combo01 * VX11 + combo02_5) / h;\r
-                                               y = P2D11 - (combo10 * VX10 + combo11 * VX11 + combo12_5) / h;\r
-                                               err += x * x + y * y;\r
-                                               h = combo20 * VX20 + combo21 * VX21 + combo22_8;\r
-                                               x = P2D20 - (combo00 * VX20 + combo01 * VX21 + combo02_8) / h;\r
-                                               y = P2D21 - (combo10 * VX20 + combo11 * VX21 + combo12_8) / h;\r
-                                               err += x * x + y * y;\r
-                                               h = combo20 * VX30 + combo21 * VX31 + combo22_11;\r
-                                               x = P2D30 - (combo00 * VX30 + combo01 * VX31 + combo02_11) / h;\r
-                                               y = P2D31 - (combo10 * VX30 + combo11 * VX31 + combo12_11) / h;\r
-                                               err += x * x + y * y;\r
-                                               if (err < minerr) {\r
-                                                       minerr = err;\r
-                                                       ma = a_factor[t1];\r
-                                                       mb = b_factor[t2];\r
-                                                       mc = c_factor[t3];\r
-                                                       s1 = t1 - 1;\r
-                                                       s2 = t2 - 1;\r
-                                                       s3 = t3 - 1;\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-                       if (s1 == 0 && s2 == 0 && s3 == 0) {\r
-                               factor *= 0.5;\r
-                       }\r
-                       a2 = ma;\r
-                       b2 = mb;\r
-                       c2 = mc;\r
-               }\r
-               io_rot.setAngle(ma, mb, mc);\r
-               /* printf("factor = %10.5f\n", factor*180.0/MD_PI); */\r
-               return minerr / 4;\r
-       }       \r
-       \r
-       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotMatrix.java
deleted file mode 100644 (file)
index a105225..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat.rotmatrix;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.transmat.NyARTransMatResult;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.types.matrix.NyARDoubleMatrix33;\r
-import jp.nyatla.nyartoolkit.core.param.*;\r
-/**\r
- * 回転行列計算用の、3x3行列\r
- *\r
- */\r
-public class NyARRotMatrix extends NyARDoubleMatrix33\r
-{      \r
-       /**\r
-        * インスタンスを準備します。\r
-        * \r
-        * @param i_param\r
-        */\r
-       public NyARRotMatrix(NyARPerspectiveProjectionMatrix i_matrix) throws NyARException\r
-       {\r
-               this.__initRot_vec1=new NyARRotVector(i_matrix);\r
-               this.__initRot_vec2=new NyARRotVector(i_matrix);\r
-               return;\r
-       }\r
-       final private NyARRotVector __initRot_vec1;\r
-       final private NyARRotVector __initRot_vec2;\r
-\r
-       \r
-\r
-       public final void initRotByPrevResult(NyARTransMatResult i_prev_result)\r
-       {\r
-\r
-               this.m00=i_prev_result.m00;\r
-               this.m01=i_prev_result.m01;\r
-               this.m02=i_prev_result.m02;\r
-\r
-               this.m10=i_prev_result.m10;\r
-               this.m11=i_prev_result.m11;\r
-               this.m12=i_prev_result.m12;\r
-\r
-               this.m20=i_prev_result.m20;\r
-               this.m21=i_prev_result.m21;\r
-               this.m22=i_prev_result.m22;\r
-               return;\r
-       }       \r
-       \r
-       \r
-       public final void initRotBySquare(final NyARLinear[] i_linear,final NyARDoublePoint2d[] i_sqvertex) throws NyARException\r
-       {\r
-               final NyARRotVector vec1=this.__initRot_vec1;\r
-               final NyARRotVector vec2=this.__initRot_vec2;\r
-\r
-               //向かい合った辺から、2本のベクトルを計算\r
-               \r
-               //軸1\r
-               vec1.exteriorProductFromLinear(i_linear[0], i_linear[2]);\r
-               vec1.checkVectorByVertex(i_sqvertex[0], i_sqvertex[1]);\r
-\r
-               //軸2\r
-               vec2.exteriorProductFromLinear(i_linear[1], i_linear[3]);\r
-               vec2.checkVectorByVertex(i_sqvertex[3], i_sqvertex[0]);\r
-\r
-               //回転の最適化?\r
-               NyARRotVector.checkRotation(vec1,vec2);\r
-\r
-               this.m00 =vec1.v1;\r
-               this.m10 =vec1.v2;\r
-               this.m20 =vec1.v3;\r
-               this.m01 =vec2.v1;\r
-               this.m11 =vec2.v2;\r
-               this.m21 =vec2.v3;\r
-               \r
-               //最後の軸を計算\r
-               final double w02 = vec1.v2 * vec2.v3 - vec1.v3 * vec2.v2;\r
-               final double w12 = vec1.v3 * vec2.v1 - vec1.v1 * vec2.v3;\r
-               final double w22 = vec1.v1 * vec2.v2 - vec1.v2 * vec2.v1;\r
-               final double w = Math.sqrt(w02 * w02 + w12 * w12 + w22 * w22);\r
-               this.m02 = w02/w;\r
-               this.m12 = w12/w;\r
-               this.m22 = w22/w;\r
-               return;\r
-       }\r
-\r
-       \r
-\r
-       /**\r
-        * int arGetAngle( double rot[3][3], double *wa, double *wb, double *wc )\r
-        * Optimize:2008.04.20:STEP[481→433]\r
-        * 3x3変換行列から、回転角を復元して返します。\r
-        * @param o_angle\r
-        * @return\r
-        */\r
-       public final void getAngle(final NyARDoublePoint3d o_angle)\r
-       {\r
-               double a,b,c;\r
-               double sina, cosa, sinb,cosb,sinc, cosc;\r
-               \r
-               if (this.m22 > 1.0) {// <Optimize/>if( rot[2][2] > 1.0 ) {\r
-                       this.m22 = 1.0;// <Optimize/>rot[2][2] = 1.0;\r
-               } else if (this.m22 < -1.0) {// <Optimize/>}else if( rot[2][2] < -1.0 ) {\r
-                       this.m22 = -1.0;// <Optimize/>rot[2][2] = -1.0;\r
-               }\r
-               cosb =this.m22;// <Optimize/>cosb = rot[2][2];\r
-               b = Math.acos(cosb);\r
-               sinb =Math.sin(b);\r
-               final double rot02=this.m02;\r
-               final double rot12=this.m12;\r
-               if (b >= 0.000001 || b <= -0.000001) {\r
-                       cosa = rot02 / sinb;// <Optimize/>cosa = rot[0][2] / sinb;\r
-                       sina = rot12 / sinb;// <Optimize/>sina = rot[1][2] / sinb;\r
-                       if (cosa > 1.0) {\r
-                               /* printf("cos(alph) = %f\n", cosa); */\r
-                               cosa = 1.0;\r
-                               sina = 0.0;\r
-                       }\r
-                       if (cosa < -1.0) {\r
-                               /* printf("cos(alph) = %f\n", cosa); */\r
-                               cosa = -1.0;\r
-                               sina = 0.0;\r
-                       }\r
-                       if (sina > 1.0) {\r
-                               /* printf("sin(alph) = %f\n", sina); */\r
-                               sina = 1.0;\r
-                               cosa = 0.0;\r
-                       }\r
-                       if (sina < -1.0) {\r
-                               /* printf("sin(alph) = %f\n", sina); */\r
-                               sina = -1.0;\r
-                               cosa = 0.0;\r
-                       }\r
-                       a = Math.acos(cosa);\r
-                       if (sina < 0) {\r
-                               a = -a;\r
-                       }\r
-                       // <Optimize>\r
-                       // sinc = (rot[2][1]*rot[0][2]-rot[2][0]*rot[1][2])/(rot[0][2]*rot[0][2]+rot[1][2]*rot[1][2]);\r
-                       // cosc = -(rot[0][2]*rot[2][0]+rot[1][2]*rot[2][1])/(rot[0][2]*rot[0][2]+rot[1][2]*rot[1][2]);\r
-                       final double tmp = (rot02 * rot02 + rot12 * rot12);\r
-                       sinc = (this.m21 * rot02 - this.m20 * rot12) / tmp;\r
-                       cosc = -(rot02 * this.m20 + rot12 * this.m21) / tmp;\r
-                       // </Optimize>\r
-\r
-                       if (cosc > 1.0) {\r
-                               /* printf("cos(r) = %f\n", cosc); */\r
-                               cosc = 1.0;\r
-                               sinc = 0.0;\r
-                       }\r
-                       if (cosc < -1.0) {\r
-                               /* printf("cos(r) = %f\n", cosc); */\r
-                               cosc = -1.0;\r
-                               sinc = 0.0;\r
-                       }\r
-                       if (sinc > 1.0) {\r
-                               /* printf("sin(r) = %f\n", sinc); */\r
-                               sinc = 1.0;\r
-                               cosc = 0.0;\r
-                       }\r
-                       if (sinc < -1.0) {\r
-                               /* printf("sin(r) = %f\n", sinc); */\r
-                               sinc = -1.0;\r
-                               cosc = 0.0;\r
-                       }\r
-                       c = Math.acos(cosc);\r
-                       if (sinc < 0) {\r
-                               c = -c;\r
-                       }\r
-               } else {\r
-                       a = b = 0.0;\r
-                       cosa = cosb = 1.0;\r
-                       sina = sinb = 0.0;\r
-                       cosc=this.m00;//cosc = rot[0];// <Optimize/>cosc = rot[0][0];\r
-                       sinc=this.m01;//sinc = rot[1];// <Optimize/>sinc = rot[1][0];\r
-                       if (cosc > 1.0) {\r
-                               /* printf("cos(r) = %f\n", cosc); */\r
-                               cosc = 1.0;\r
-                               sinc = 0.0;\r
-                       }\r
-                       if (cosc < -1.0) {\r
-                               /* printf("cos(r) = %f\n", cosc); */\r
-                               cosc = -1.0;\r
-                               sinc = 0.0;\r
-                       }\r
-                       if (sinc > 1.0) {\r
-                               /* printf("sin(r) = %f\n", sinc); */\r
-                               sinc = 1.0;\r
-                               cosc = 0.0;\r
-                       }\r
-                       if (sinc < -1.0) {\r
-                               /* printf("sin(r) = %f\n", sinc); */\r
-                               sinc = -1.0;\r
-                               cosc = 0.0;\r
-                       }\r
-                       c = Math.acos(cosc);\r
-                       if (sinc < 0) {\r
-                               c = -c;\r
-                       }\r
-               }\r
-               o_angle.x = a;// wa.value=a;//*wa = a;\r
-               o_angle.y = b;// wb.value=b;//*wb = b;\r
-               o_angle.z = c;// wc.value=c;//*wc = c;\r
-               return;\r
-       }\r
-       /**\r
-        * 回転角から回転行列を計算してセットします。\r
-        * @param i_x\r
-        * @param i_y\r
-        * @param i_z\r
-        */\r
-       public final void setAngle(final double i_x, final double i_y, final double i_z)\r
-       {\r
-               final double sina = Math.sin(i_x);\r
-               final double cosa = Math.cos(i_x);\r
-               final double sinb = Math.sin(i_y);\r
-               final double cosb = Math.cos(i_y);\r
-               final double sinc = Math.sin(i_z);\r
-               final double cosc = Math.cos(i_z);\r
-               // Optimize\r
-               final double CACA = cosa * cosa;\r
-               final double SASA = sina * sina;\r
-               final double SACA = sina * cosa;\r
-               final double SASB = sina * sinb;\r
-               final double CASB = cosa * sinb;\r
-               final double SACACB = SACA * cosb;\r
-\r
-               this.m00 = CACA * cosb * cosc + SASA * cosc + SACACB * sinc - SACA * sinc;\r
-               this.m01 = -CACA * cosb * sinc - SASA * sinc + SACACB * cosc - SACA * cosc;\r
-               this.m02 = CASB;\r
-               this.m10 = SACACB * cosc - SACA * cosc + SASA * cosb * sinc + CACA * sinc;\r
-               this.m11 = -SACACB * sinc + SACA * sinc + SASA * cosb * cosc + CACA * cosc;\r
-               this.m12 = SASB;\r
-               this.m20 = -CASB * cosc - SASB * sinc;\r
-               this.m21 = CASB * sinc - SASB * cosc;\r
-               this.m22 = cosb;\r
-               return;\r
-       }\r
-       /**\r
-        * i_in_pointを変換行列で座標変換する。\r
-        * @param i_in_point\r
-        * @param i_out_point\r
-        */\r
-       public final void getPoint3d(final NyARDoublePoint3d i_in_point,final NyARDoublePoint3d i_out_point)\r
-       {\r
-               final double x=i_in_point.x;\r
-               final double y=i_in_point.y;\r
-               final double z=i_in_point.z;\r
-               i_out_point.x=this.m00 * x + this.m01 * y + this.m02 * z;\r
-               i_out_point.y=this.m10 * x + this.m11 * y + this.m12 * z;\r
-               i_out_point.z=this.m20 * x + this.m21 * y + this.m22 * z;\r
-               return;\r
-       }\r
-       /**\r
-        * 複数の頂点を一括して変換する\r
-        * @param i_in_point\r
-        * @param i_out_point\r
-        * @param i_number_of_vertex\r
-        */\r
-       public final void getPoint3dBatch(final NyARDoublePoint3d[] i_in_point,NyARDoublePoint3d[] i_out_point,int i_number_of_vertex)\r
-       {\r
-               for(int i=i_number_of_vertex-1;i>=0;i--){\r
-                       final NyARDoublePoint3d out_ptr=i_out_point[i];\r
-                       final NyARDoublePoint3d in_ptr=i_in_point[i];\r
-                       final double x=in_ptr.x;\r
-                       final double y=in_ptr.y;\r
-                       final double z=in_ptr.z;\r
-                       out_ptr.x=this.m00 * x + this.m01 * y + this.m02 * z;\r
-                       out_ptr.y=this.m10 * x + this.m11 * y + this.m12 * z;\r
-                       out_ptr.z=this.m20 * x + this.m21 * y + this.m22 * z;\r
-               }\r
-               return;\r
-       }       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/transmat/rotmatrix/NyARRotVector.java
deleted file mode 100644 (file)
index f99fb71..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.transmat.rotmatrix;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.NyARMat;\r
-import jp.nyatla.nyartoolkit.core.types.NyARDoublePoint2d;\r
-import jp.nyatla.nyartoolkit.core.types.NyARLinear;\r
-import jp.nyatla.nyartoolkit.core.param.*;\r
-\r
-public class NyARRotVector\r
-{\r
-\r
-       //publicメンバ達\r
-       public double v1;\r
-\r
-       public double v2;\r
-\r
-       public double v3;\r
-\r
-       //privateメンバ達\r
-       \r
-       private NyARPerspectiveProjectionMatrix _projection_mat_ref;\r
-\r
-       private double[][] _inv_cpara_array_ref;\r
-\r
-       public NyARRotVector(NyARPerspectiveProjectionMatrix i_cmat) throws NyARException\r
-       {\r
-               NyARMat mat_a = new NyARMat(3, 3);\r
-               double[][] a_array = mat_a.getArray();\r
-               \r
-               a_array[0][0] =i_cmat.m00;\r
-               a_array[0][1] =i_cmat.m01;\r
-               a_array[0][2] =i_cmat.m02;\r
-               a_array[1][0] =i_cmat.m10;\r
-               a_array[1][1] =i_cmat.m11;\r
-               a_array[1][2] =i_cmat.m12;\r
-               a_array[2][0] =i_cmat.m20;\r
-               a_array[2][1] =i_cmat.m21;\r
-               a_array[2][2] =i_cmat.m22;\r
-               \r
-               mat_a.matrixSelfInv();\r
-               this._projection_mat_ref = i_cmat;\r
-               this._inv_cpara_array_ref = mat_a.getArray();\r
-               //GCない言語のときは、ここで配列の所有権委譲してね!\r
-       }\r
-\r
-       /**\r
-        * 2直線に直交するベクトルを計算する・・・だと思う。\r
-        * @param i_linear1\r
-        * @param i_linear2\r
-        */\r
-       public void exteriorProductFromLinear(NyARLinear i_linear1, NyARLinear i_linear2)\r
-       {\r
-               //1行目\r
-               final NyARPerspectiveProjectionMatrix cmat= this._projection_mat_ref;\r
-               final double w1 = i_linear1.run * i_linear2.rise - i_linear2.run * i_linear1.rise;\r
-               final double w2 = i_linear1.rise * i_linear2.intercept - i_linear2.rise * i_linear1.intercept;\r
-               final double w3 = i_linear1.intercept * i_linear2.run - i_linear2.intercept * i_linear1.run;\r
-\r
-               final double m0 = w1 * (cmat.m01 * cmat.m12 - cmat.m02 * cmat.m11) + w2 * cmat.m11 - w3 * cmat.m01;//w1 * (cpara[0 * 4 + 1] * cpara[1 * 4 + 2] - cpara[0 * 4 + 2] * cpara[1 * 4 + 1]) + w2 * cpara[1 * 4 + 1] - w3 * cpara[0 * 4 + 1];\r
-               final double m1 = -w1 * cmat.m00 * cmat.m12 + w3 * cmat.m00;//-w1 * cpara[0 * 4 + 0] * cpara[1 * 4 + 2] + w3 * cpara[0 * 4 + 0];\r
-               final double m2 = w1 * cmat.m00 * cmat.m11;//w1 * cpara[0 * 4 + 0] * cpara[1 * 4 + 1];\r
-               final double w = Math.sqrt(m0 * m0 + m1 * m1 + m2 * m2);\r
-               this.v1 = m0 / w;\r
-               this.v2 = m1 / w;\r
-               this.v3 = m2 / w;\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * static int check_dir( double dir[3], double st[2], double ed[2],double cpara[3][4] ) Optimize:STEP[526->468]\r
-        * ベクトルの開始/終了座標を指定して、ベクトルの方向を調整する。\r
-        * @param i_start_vertex\r
-        * @param i_end_vertex\r
-        * @param cpara\r
-        */\r
-       public void checkVectorByVertex(final NyARDoublePoint2d i_start_vertex, final NyARDoublePoint2d i_end_vertex) throws NyARException\r
-       {\r
-               double h;\r
-               final double[][] inv_cpara = this._inv_cpara_array_ref;\r
-               //final double[] world = __checkVectorByVertex_world;// [2][3];\r
-               final double world0 = inv_cpara[0][0] * i_start_vertex.x * 10.0 + inv_cpara[0][1] * i_start_vertex.y * 10.0 + inv_cpara[0][2] * 10.0;// mat_a->m[0]*st[0]*10.0+\r
-               final double world1 = inv_cpara[1][0] * i_start_vertex.x * 10.0 + inv_cpara[1][1] * i_start_vertex.y * 10.0 + inv_cpara[1][2] * 10.0;// mat_a->m[3]*st[0]*10.0+\r
-               final double world2 = inv_cpara[2][0] * i_start_vertex.x * 10.0 + inv_cpara[2][1] * i_start_vertex.y * 10.0 + inv_cpara[2][2] * 10.0;// mat_a->m[6]*st[0]*10.0+\r
-               final double world3 = world0 + this.v1;\r
-               final double world4 = world1 + this.v2;\r
-               final double world5 = world2 + this.v3;\r
-               // </Optimize>\r
-\r
-               //final double[] camera = __checkVectorByVertex_camera;// [2][2];\r
-               final NyARPerspectiveProjectionMatrix cmat= this._projection_mat_ref;\r
-               //h = cpara[2 * 4 + 0] * world0 + cpara[2 * 4 + 1] * world1 + cpara[2 * 4 + 2] * world2;\r
-               h = cmat.m20 * world0 + cmat.m21 * world1 + cmat.m22 * world2;\r
-               if (h == 0.0) {\r
-                       throw new NyARException();\r
-               }\r
-               //final double camera0 = (cpara[0 * 4 + 0] * world0 + cpara[0 * 4 + 1] * world1 + cpara[0 * 4 + 2] * world2) / h;\r
-               //final double camera1 = (cpara[1 * 4 + 0] * world0 + cpara[1 * 4 + 1] * world1 + cpara[1 * 4 + 2] * world2) / h;\r
-               final double camera0 = (cmat.m00 * world0 + cmat.m01 * world1 + cmat.m02 * world2) / h;\r
-               final double camera1 = (cmat.m10 * world0 + cmat.m11 * world1 + cmat.m12 * world2) / h;\r
-\r
-               //h = cpara[2 * 4 + 0] * world3 + cpara[2 * 4 + 1] * world4 + cpara[2 * 4 + 2] * world5;\r
-               h = cmat.m20 * world3 + cmat.m21 * world4 + cmat.m22 * world5;\r
-               if (h == 0.0) {\r
-                       throw new NyARException();\r
-               }\r
-               //final double camera2 = (cpara[0 * 4 + 0] * world3 + cpara[0 * 4 + 1] * world4 + cpara[0 * 4 + 2] * world5) / h;\r
-               //final double camera3 = (cpara[1 * 4 + 0] * world3 + cpara[1 * 4 + 1] * world4 + cpara[1 * 4 + 2] * world5) / h;\r
-               final double camera2 = (cmat.m00 * world3 + cmat.m01 * world4 + cmat.m02 * world5) / h;\r
-               final double camera3 = (cmat.m10 * world3 + cmat.m11 * world4 + cmat.m12 * world5) / h;\r
-\r
-               final double v = (i_end_vertex.x - i_start_vertex.x) * (camera2 - camera0) + (i_end_vertex.y - i_start_vertex.y) * (camera3 - camera1);\r
-               if (v < 0) {\r
-                       this.v1 = -this.v1;\r
-                       this.v2 = -this.v2;\r
-                       this.v3 = -this.v3;\r
-               }\r
-       }\r
-       /**\r
-        * int check_rotation( double rot[2][3] )\r
-        * 2つのベクトル引数の調整をする?\r
-        * @param i_r\r
-        * @throws NyARException\r
-        */\r
-\r
-       public final static void checkRotation(NyARRotVector io_vec1, NyARRotVector io_vec2) throws NyARException\r
-       {\r
-               double w;\r
-               int f;\r
-\r
-               double vec10 = io_vec1.v1;\r
-               double vec11 = io_vec1.v2;\r
-               double vec12 = io_vec1.v3;\r
-               double vec20 = io_vec2.v1;\r
-               double vec21 = io_vec2.v2;\r
-               double vec22 = io_vec2.v3;\r
-               \r
-               double vec30 = vec11 * vec22 - vec12 * vec21;\r
-               double vec31 = vec12 * vec20 - vec10 * vec22;\r
-               double vec32 = vec10 * vec21 - vec11 * vec20;\r
-               w = Math.sqrt(vec30 * vec30 + vec31 * vec31 + vec32 * vec32);\r
-               if (w == 0.0) {\r
-                       throw new NyARException();\r
-               }\r
-               vec30 /= w;\r
-               vec31 /= w;\r
-               vec32 /= w;\r
-\r
-               double cb = vec10 * vec20 + vec11 * vec21 + vec12 * vec22;\r
-               if (cb < 0){\r
-                       cb=-cb;//cb *= -1.0;                    \r
-               }\r
-               final double ca = (Math.sqrt(cb + 1.0) + Math.sqrt(1.0 - cb)) * 0.5;\r
-\r
-               if (vec31 * vec10 - vec11 * vec30 != 0.0) {\r
-                       f = 0;\r
-               } else {\r
-                       if (vec32 * vec10 - vec12 * vec30 != 0.0) {\r
-                               w = vec11;vec11 = vec12;vec12 = w;\r
-                               w = vec31;vec31 = vec32;vec32 = w;\r
-                               f = 1;\r
-                       } else {\r
-                               w = vec10;vec10 = vec12;vec12 = w;\r
-                               w = vec30;vec30 = vec32;vec32 = w;\r
-                               f = 2;\r
-                       }\r
-               }\r
-               if (vec31 * vec10 - vec11 * vec30 == 0.0) {\r
-                       throw new NyARException();\r
-               }\r
-               \r
-               double k1,k2,k3,k4;\r
-               double a, b, c, d;\r
-               double p1, q1, r1;\r
-               double p2, q2, r2;\r
-               double p3, q3, r3;\r
-               double p4, q4, r4;              \r
-               \r
-               \r
-               k1 = (vec11 * vec32 - vec31 * vec12) / (vec31 * vec10 - vec11 * vec30);\r
-               k2 = (vec31 * ca) / (vec31 * vec10 - vec11 * vec30);\r
-               k3 = (vec10 * vec32 - vec30 * vec12) / (vec30 * vec11 - vec10 * vec31);\r
-               k4 = (vec30 * ca) / (vec30 * vec11 - vec10 * vec31);\r
-\r
-               a = k1 * k1 + k3 * k3 + 1;\r
-               b = k1 * k2 + k3 * k4;\r
-               c = k2 * k2 + k4 * k4 - 1;\r
-\r
-               d = b * b - a * c;\r
-               if (d < 0) {\r
-                       throw new NyARException();\r
-               }\r
-               r1 = (-b + Math.sqrt(d)) / a;\r
-               p1 = k1 * r1 + k2;\r
-               q1 = k3 * r1 + k4;\r
-               r2 = (-b - Math.sqrt(d)) / a;\r
-               p2 = k1 * r2 + k2;\r
-               q2 = k3 * r2 + k4;\r
-               if (f == 1) {\r
-                       w = q1;q1 = r1;r1 = w;\r
-                       w = q2;q2 = r2;r2 = w;\r
-                       w = vec11;vec11 = vec12;vec12 = w;\r
-                       w = vec31;vec31 = vec32;vec32 = w;\r
-                       f = 0;\r
-               }\r
-               if (f == 2) {\r
-                       w = p1;p1 = r1;r1 = w;\r
-                       w = p2;p2 = r2;r2 = w;\r
-                       w = vec10;vec10 = vec12;vec12 = w;\r
-                       w = vec30;vec30 = vec32;vec32 = w;\r
-                       f = 0;\r
-               }\r
-\r
-               if (vec31 * vec20 - vec21 * vec30 != 0.0) {\r
-                       f = 0;\r
-               } else {\r
-                       if (vec32 * vec20 - vec22 * vec30 != 0.0) {\r
-                               w = vec21;vec21 = vec22;vec22 = w;\r
-                               w = vec31;vec31 = vec32;vec32 = w;\r
-                               f = 1;\r
-                       } else {\r
-                               w = vec20;vec20 = vec22;vec22 = w;\r
-                               w = vec30;vec30 = vec32;vec32 = w;\r
-                               f = 2;\r
-                       }\r
-               }\r
-               if (vec31 * vec20 - vec21 * vec30 == 0.0) {\r
-                       throw new NyARException();\r
-               }\r
-               k1 = (vec21 * vec32 - vec31 * vec22) / (vec31 * vec20 - vec21 * vec30);\r
-               k2 = (vec31 * ca) / (vec31 * vec20 - vec21 * vec30);\r
-               k3 = (vec20 * vec32 - vec30 * vec22) / (vec30 * vec21 - vec20 * vec31);\r
-               k4 = (vec30 * ca) / (vec30 * vec21 - vec20 * vec31);\r
-\r
-               a = k1 * k1 + k3 * k3 + 1;\r
-               b = k1 * k2 + k3 * k4;\r
-               c = k2 * k2 + k4 * k4 - 1;\r
-\r
-               d = b * b - a * c;\r
-               if (d < 0) {\r
-                       throw new NyARException();\r
-               }\r
-               r3 = (-b + Math.sqrt(d)) / a;\r
-               p3 = k1 * r3 + k2;\r
-               q3 = k3 * r3 + k4;\r
-               r4 = (-b - Math.sqrt(d)) / a;\r
-               p4 = k1 * r4 + k2;\r
-               q4 = k3 * r4 + k4;\r
-               if (f == 1) {\r
-                       w = q3;q3 = r3;r3 = w;\r
-                       w = q4;q4 = r4;r4 = w;\r
-                       w = vec21;vec21 = vec22;vec22 = w;\r
-                       w = vec31;vec31 = vec32;vec32 = w;\r
-                       f = 0;\r
-               }\r
-               if (f == 2) {\r
-                       w = p3;p3 = r3;r3 = w;\r
-                       w = p4;p4 = r4;r4 = w;\r
-                       w = vec20;vec20 = vec22;vec22 = w;\r
-                       w = vec30;vec30 = vec32;vec32 = w;\r
-                       f = 0;\r
-               }\r
-\r
-               double e1 = p1 * p3 + q1 * q3 + r1 * r3;\r
-               if (e1 < 0) {\r
-                       e1 = -e1;\r
-               }\r
-               double e2 = p1 * p4 + q1 * q4 + r1 * r4;\r
-               if (e2 < 0) {\r
-                       e2 = -e2;\r
-               }\r
-               double e3 = p2 * p3 + q2 * q3 + r2 * r3;\r
-               if (e3 < 0) {\r
-                       e3 = -e3;\r
-               }\r
-               double e4 = p2 * p4 + q2 * q4 + r2 * r4;\r
-               if (e4 < 0) {\r
-                       e4 = -e4;\r
-               }\r
-               if (e1 < e2) {\r
-                       if (e1 < e3) {\r
-                               if (e1 < e4) {\r
-                                       io_vec1.v1 = p1;\r
-                                       io_vec1.v2 = q1;\r
-                                       io_vec1.v3 = r1;\r
-                                       io_vec2.v1 = p3;\r
-                                       io_vec2.v2 = q3;\r
-                                       io_vec2.v3 = r3;\r
-                               } else {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p4;\r
-                                       io_vec2.v2 = q4;\r
-                                       io_vec2.v3 = r4;\r
-                               }\r
-                       } else {\r
-                               if (e3 < e4) {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p3;\r
-                                       io_vec2.v2 = q3;\r
-                                       io_vec2.v3 = r3;\r
-                               } else {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p4;\r
-                                       io_vec2.v2 = q4;\r
-                                       io_vec2.v3 = r4;\r
-                               }\r
-                       }\r
-               } else {\r
-                       if (e2 < e3) {\r
-                               if (e2 < e4) {\r
-                                       io_vec1.v1 = p1;\r
-                                       io_vec1.v2 = q1;\r
-                                       io_vec1.v3 = r1;\r
-                                       io_vec2.v1 = p4;\r
-                                       io_vec2.v2 = q4;\r
-                                       io_vec2.v3 = r4;\r
-                               } else {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p4;\r
-                                       io_vec2.v2 = q4;\r
-                                       io_vec2.v3 = r4;\r
-                               }\r
-                       } else {\r
-                               if (e3 < e4) {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p3;\r
-                                       io_vec2.v2 = q3;\r
-                                       io_vec2.v3 = r3;\r
-                               } else {\r
-                                       io_vec1.v1 = p2;\r
-                                       io_vec1.v2 = q2;\r
-                                       io_vec1.v3 = r2;\r
-                                       io_vec2.v1 = p4;\r
-                                       io_vec2.v2 = q4;\r
-                                       io_vec2.v3 = r4;\r
-                               }\r
-                       }\r
-               }\r
-               return;\r
-       }       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint2d.java
deleted file mode 100644 (file)
index 7cc4b44..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-public class NyARDoublePoint2d\r
-{\r
-       public double x;\r
-       public double y;\r
-       /**\r
-        * 配列ファクトリ\r
-        * @param i_number\r
-        * @return\r
-        */\r
-       public static NyARDoublePoint2d[] createArray(int i_number)\r
-       {\r
-               NyARDoublePoint2d[] ret=new NyARDoublePoint2d[i_number];\r
-               for(int i=0;i<i_number;i++)\r
-               {\r
-                       ret[i]=new NyARDoublePoint2d();\r
-               }\r
-               return ret;\r
-       }\r
-       public NyARDoublePoint2d()\r
-       {\r
-               this.x=0;\r
-               this.y=0;\r
-       }       \r
-       public NyARDoublePoint2d(double i_x,double i_y)\r
-       {\r
-               this.x=i_x;\r
-               this.y=i_y;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARDoublePoint3d.java
deleted file mode 100644 (file)
index 6d7cbb3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-public class NyARDoublePoint3d\r
-{\r
-       public double x;\r
-       public double y;\r
-       public double z;\r
-       /**\r
-        * 配列ファクトリ\r
-        * @param i_number\r
-        * @return\r
-        */\r
-       public static NyARDoublePoint3d[] createArray(int i_number)\r
-       {\r
-               NyARDoublePoint3d[] ret=new NyARDoublePoint3d[i_number];\r
-               for(int i=0;i<i_number;i++)\r
-               {\r
-                       ret[i]=new NyARDoublePoint3d();\r
-               }\r
-               return ret;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntPoint.java
deleted file mode 100644 (file)
index e5cc24c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-public class NyARIntPoint\r
-{\r
-       public int x;\r
-\r
-       public int y;\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntRect.java
deleted file mode 100644 (file)
index 25fc49b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-public class NyARIntRect\r
-{\r
-       public int x;\r
-\r
-       public int y;\r
-\r
-       public int w;\r
-\r
-       public int h;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARIntSize.java
deleted file mode 100644 (file)
index 0dcb9d2..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-public class NyARIntSize\r
-{\r
-       public int h;\r
-\r
-       public int w;\r
-       public NyARIntSize()\r
-       {\r
-               this.w=0;\r
-               this.h=0;\r
-               return;\r
-               \r
-       }\r
-       \r
-       public NyARIntSize(int i_width,int i_height)\r
-       {\r
-               this.w=i_width;\r
-               this.h=i_height;\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * サイズが同一であるかを確認する。\r
-        * \r
-        * @param i_width\r
-        * @param i_height\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public boolean isEqualSize(int i_width, int i_height)\r
-       {\r
-               if (i_width == this.w && i_height == this.h) {\r
-                       return true;\r
-               }\r
-               return false;\r
-       }\r
-\r
-       /**\r
-        * サイズが同一であるかを確認する。\r
-        * \r
-        * @param i_width\r
-        * @param i_height\r
-        * @return\r
-        * @throws NyARException\r
-        */\r
-       public boolean isEqualSize(NyARIntSize i_size)\r
-       {\r
-               if (i_size.w == this.w && i_size.h == this.h) {\r
-                       return true;\r
-               }\r
-               return false;\r
-\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/NyARLinear.java
deleted file mode 100644 (file)
index 5e51041..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types;\r
-\r
-public class NyARLinear\r
-{\r
-       public double rise;//y軸の増加量\r
-       public double run;//x軸の増加量\r
-       public double intercept;//切片\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/INyARDoubleMatrix.java
deleted file mode 100644 (file)
index be61134..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types.matrix;\r
-\r
-public interface INyARDoubleMatrix\r
-{\r
-       /**\r
-        * 配列の内容を行列に設定する。\r
-        * 遅いので余り使わないでね。\r
-        * @param o_value\r
-        */\r
-       public void setValue(double[] i_value);\r
-       /**\r
-        * 行列の内容を配列に返す。\r
-        * 遅いので余り使わないでね。\r
-        * @param o_value\r
-        */\r
-       public void getValue(double[] o_value);\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix33.java
deleted file mode 100644 (file)
index c4147a2..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types.matrix;\r
-\r
-public class NyARDoubleMatrix33 implements INyARDoubleMatrix\r
-{\r
-       public double m00;\r
-       public double m01;\r
-       public double m02;\r
-       public double m10;\r
-       public double m11;\r
-       public double m12;\r
-       public double m20;\r
-       public double m21;\r
-       public double m22;\r
-       /**\r
-        * 遅いからあんまり使わないでね。\r
-        */\r
-       public void setValue(double[] i_value)\r
-       {\r
-               this.m00=i_value[0];\r
-               this.m01=i_value[1];\r
-               this.m02=i_value[2];\r
-               this.m10=i_value[3];\r
-               this.m11=i_value[4];\r
-               this.m12=i_value[5];\r
-               this.m20=i_value[6];\r
-               this.m21=i_value[7];\r
-               this.m22=i_value[8];\r
-               return;\r
-       }\r
-       /**\r
-        * 遅いからあんまり使わないでね。\r
-        */\r
-       public void getValue(double[] o_value)\r
-       {\r
-               o_value[0]=this.m00;\r
-               o_value[1]=this.m01;\r
-               o_value[2]=this.m02;\r
-               o_value[3]=this.m10;\r
-               o_value[4]=this.m11;\r
-               o_value[5]=this.m12;\r
-               o_value[6]=this.m20;\r
-               o_value[7]=this.m21;\r
-               o_value[8]=this.m22;\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/matrix/NyARDoubleMatrix34.java
deleted file mode 100644 (file)
index f87ec7c..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types.matrix;\r
-\r
-public class NyARDoubleMatrix34 implements INyARDoubleMatrix\r
-{\r
-       public double m00;\r
-       public double m01;\r
-       public double m02;\r
-       public double m03;\r
-       public double m10;\r
-       public double m11;\r
-       public double m12;\r
-       public double m13;\r
-       public double m20;\r
-       public double m21;\r
-       public double m22;\r
-       public double m23;\r
-       public void setValue(double[] i_value)\r
-       {\r
-               this.m00=i_value[0];\r
-               this.m01=i_value[1];\r
-               this.m02=i_value[2];\r
-               this.m03=i_value[3];\r
-               this.m10=i_value[4];\r
-               this.m11=i_value[5];\r
-               this.m12=i_value[6];\r
-               this.m13=i_value[7];\r
-               this.m20=i_value[8];\r
-               this.m21=i_value[9];\r
-               this.m22=i_value[10];\r
-               this.m23=i_value[11];\r
-               return;\r
-       }\r
-       public void getValue(double[] o_value)\r
-       {\r
-               o_value[0]=this.m00;\r
-               o_value[1]=this.m01;\r
-               o_value[2]=this.m02;\r
-               o_value[3]=this.m03;\r
-               o_value[4]=this.m10;\r
-               o_value[5]=this.m11;\r
-               o_value[6]=this.m12;\r
-               o_value[7]=this.m13;\r
-               o_value[8]=this.m20;\r
-               o_value[9]=this.m21;\r
-               o_value[10]=this.m22;\r
-               o_value[11]=this.m23;\r
-               return;\r
-       }       \r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntPointStack.java
deleted file mode 100644 (file)
index e0c5b93..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types.stack;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.utils.NyObjectStack;\r
-\r
-public class NyARIntPointStack extends NyObjectStack\r
-{\r
-       public NyARIntPointStack(int i_length)\r
-       {\r
-               super(new NyARIntPoint[i_length]);\r
-\r
-       }\r
-\r
-       protected void onReservRequest(int i_start, int i_end, Object[] i_buffer)\r
-       {\r
-               for (int i = i_start; i < i_end; i++) {\r
-                       i_buffer[i] = new NyARIntPoint();\r
-               }\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core/types/stack/NyARIntRectStack.java
deleted file mode 100644 (file)
index ae8ce84..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core.types.stack;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntRect;\r
-import jp.nyatla.utils.NyObjectStack;\r
-\r
-public class NyARIntRectStack extends NyObjectStack\r
-{\r
-       public NyARIntRectStack(int i_length)\r
-       {\r
-               super(new NyARIntRect[i_length]);\r
-\r
-       }\r
-\r
-       protected void onReservRequest(int i_start, int i_end, Object[] i_buffer)\r
-       {\r
-               for (int i = i_start; i < i_end; i++) {\r
-                       i_buffer[i] = new NyARIntRect();\r
-               }\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
deleted file mode 100644 (file)
index 53cf6f7..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasteranalyzer;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.types.stack.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-\r
-/**\r
- * QRコードの4頂点候補を探そうとするクラス。\r
- * 未完成\r
- *\r
- */\r
-public class NyARRasterDetector_QrCodeEdge\r
-{\r
-       private NyARIntRectStack _result;\r
-\r
-       public NyARRasterDetector_QrCodeEdge(int i_result_max)\r
-       {\r
-               this._result = new NyARIntRectStack(i_result_max);\r
-               return;\r
-       }\r
-\r
-       public NyARIntRectStack geResult()\r
-       {\r
-               return this._result;\r
-       }\r
-\r
-       private boolean check_w1(int i_w1)\r
-       {\r
-               return i_w1>=1;         \r
-       }\r
-       private boolean check_b1(int i_b1)\r
-       {\r
-               return i_b1 >= 2;               \r
-       }\r
-       private boolean check_w2(int i_b1,int i_w2)\r
-       {\r
-               int v=i_w2*100/i_b1;\r
-               return (30<=v && v<=170);\r
-       }\r
-       private boolean check_b2(int i_b1,int i_b2)\r
-       {\r
-               int v=i_b2*100/i_b1;\r
-               //条件:(b1)/2の2~4倍\r
-               return (200<=v && v<=400);\r
-       }\r
-       private boolean check_w3(int i_w2,int i_w3)\r
-       {\r
-               int v=i_w3*100/i_w2;\r
-               return (50<=v && v<=150);\r
-       }\r
-       private boolean check_b3(int i_b3,int i_b1)\r
-       {\r
-               int v=i_b3*100/i_b1;\r
-               return (50<=v && v<=150);\r
-       }       \r
-       public void analyzeRaster(INyARRaster i_input) throws NyARException\r
-       {\r
-               INyARBufferReader buffer_reader=i_input.getBufferReader();\r
-               assert (buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_BIN_8));\r
-\r
-               // 結果をクリア\r
-               this._result.clear();\r
-\r
-               NyARIntSize size = i_input.getSize();\r
-               int x = 0;\r
-               int w1, b1, w2, b2, w3, b3;\r
-               w1 = b1 = w2 = b2 = w3 = b3 = 0;\r
-\r
-               NyARIntRect item;\r
-               int[] line;\r
-               int s_pos, b2_spos,b3_spos;\r
-               b2_spos=0;\r
-               for (int y = size.h - 1-8; y >= 8; y--) {\r
-                       line = ((int[][]) buffer_reader.getBuffer())[y];\r
-                       x = size.w - 1;\r
-                       s_pos=0;\r
-                       int token_id=0;\r
-                       while(x>=0){\r
-                               switch(token_id){\r
-                               case 0:\r
-                                       // w1の特定\r
-                                       w1 = 0;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] == 0) {\r
-                                                       // 検出条件確認:w1は2以上欲しいな。\r
-                                                       if (!check_w1(w1)) {\r
-                                                               // 条件不十分\r
-                                                               continue;\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-                                                               token_id=1;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               w1++;\r
-                                       }\r
-                                       break;\r
-                               case 1:\r
-                                       // b1の特定\r
-                                       b1 = 0;\r
-                                       s_pos = x;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] > 0) {\r
-                                                       // 検出条件確認:b1は1以上欲しいな。\r
-                                                       if (!check_b1(b1)){\r
-                                                               //条件不十分→白検出からやり直し\r
-                                                               token_id=0;\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-                                                               token_id=2;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               b1++;\r
-                                       }\r
-                                       break;\r
-                               case 2:\r
-                                       // w2の特定\r
-                                       w2 = 0;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] == 0) {\r
-                                                       // 検出条件確認:w2*10/b1は80-120以上欲しいな。\r
-                                                       if (!check_w2(b1,w2)) {\r
-                                                               //条件不十分→w2→w1として、b1を解析\r
-                                                               w1=w2;\r
-                                                               token_id=1;\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-//                                                             w1=w2;\r
-//                                                             token_id=11;\r
-                                                               token_id=3;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               w2++;\r
-                                       }\r
-                                       break;\r
-                               case 3:\r
-                                       // b2の特定\r
-                                       b2 = 0;\r
-                                       b2_spos=x;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] > 0){\r
-                                                       //条件:(w1+b1)/2の2~4倍\r
-\r
-                                                       if (!check_b2(b1,b2)) {\r
-                                                               // b2->b1と仮定して解析しなおす。\r
-                                                               if(check_w1(w2) && check_b1(b2)){\r
-                                                                       w1 = w2;\r
-                                                                       b1 = b2;\r
-                                                                       s_pos=b2_spos;\r
-                                                                       token_id=2;\r
-                                                               }else{\r
-                                                                       \r
-                                                                       token_id=0;\r
-                                                               }\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-//                                                             token_id=10;\r
-                                                               token_id=4;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               b2++;\r
-                                       }\r
-                                       break;\r
-                               case 4:\r
-                                       // w3の特定\r
-                                       w3 = 0;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] == 0){\r
-                                                       if (!check_w3(w2,w3)) {\r
-                                                               //w2→w1,b2->b1として解析しなおす。\r
-                                                               if(check_w1(w2) && check_b1(b2)){\r
-                                                                       w1 = w2;\r
-                                                                       b1 = b2;\r
-                                                                       s_pos=b2_spos;\r
-                                                                       token_id=2;\r
-                                                               }else{\r
-                                                                       token_id=0;\r
-                                                               }\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-//                                                             w1=w3;\r
-//                                                             token_id=10;\r
-                                                               token_id=5;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               w3++;\r
-                                       }\r
-                                       break;\r
-                               case 5:\r
-                                       // b3の特定\r
-                                       b3 = 0;\r
-                                       b3_spos=x;\r
-                                       for (; x >= 0; x--) {\r
-                                               if (line[x] > 0) {\r
-                                                       // 検出条件確認\r
-                                                       if (!check_b3(b3,b1)) {\r
-                                                               if(check_w1(w2) && check_b1(b2)){\r
-                                                               //条件不十分→b3->b1,w3->w1として再解析\r
-                                                                       w1=w3;\r
-                                                                       b1=b3;\r
-                                                                       s_pos=b3_spos;\r
-                                                                       token_id=2;\r
-                                                               }else{\r
-                                                                       token_id=0;\r
-                                                               }\r
-                                                       }else{\r
-                                                               // 検出→次段処理へ\r
-                                                               token_id=10;\r
-                                                       }\r
-                                                       break;\r
-                                               }\r
-                                               b3++;\r
-                                       }\r
-                                       break;\r
-                               case 10:\r
-                                       /* コード特定→保管 */\r
-                                       item = (NyARIntRect)this._result.prePush();\r
-                                       item.x = x;\r
-                                       item.y = y;\r
-                                       item.w =s_pos-x;\r
-                                       item.h=0;\r
-                                       /* 最大個数? */\r
-                                       /* 次のコードを探す */\r
-                                       token_id=0;\r
-                                       break;\r
-                               default:\r
-                                       throw new NyARException();\r
-                               }\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/INyARRasterThresholdAnalyzer.java
deleted file mode 100644 (file)
index 13b2ff4..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-\r
-public interface INyARRasterThresholdAnalyzer\r
-{\r
-       public void analyzeRaster(INyARRaster i_input) throws NyARException;\r
-\r
-       public int getThreshold();\r
-\r
-       public int getThreshold(int i_x, int i_y);\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_PTile.java
deleted file mode 100644 (file)
index 5808614..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * Pタイル法による閾値検出\r
- * \r
- */\r
-public class NyARRasterThresholdAnalyzer_PTile implements INyARRasterThresholdAnalyzer\r
-{\r
-       private int _persentage;\r
-\r
-       private int _threshold;\r
-\r
-       /**\r
-        * @param i_persentage\r
-        * -100<=0<=100であること。 正の場合、黒点を基準にします。 負の場合、白点を基準にします。\r
-        * (CMOSカメラの場合、基準点は白点の方が良い)\r
-        */\r
-       public NyARRasterThresholdAnalyzer_PTile(int i_persentage)\r
-       {\r
-               assert (-100 <= i_persentage && i_persentage <= 100);\r
-               this._persentage = i_persentage;\r
-       }\r
-\r
-       private int createHistgram(INyARBufferReader i_reader,NyARIntSize i_size, int[] o_histgram) throws NyARException\r
-       {\r
-               int[][] in_buf = (int[][]) i_reader.getBuffer();\r
-               int[] histgram = o_histgram;\r
-\r
-               // ヒストグラムを作成\r
-               for (int i = 0; i < 256; i++) {\r
-                       histgram[i] = 0;\r
-               }\r
-               int sum = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       int sum2 = 0;\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               int v = in_buf[y][x];\r
-                               histgram[v]++;\r
-                               sum2 += v;\r
-                       }\r
-                       sum = sum + sum2 / i_size.w;\r
-               }\r
-               // 閾値ピクセル数確定\r
-               int th_pixcels = i_size.w * i_size.h * this._persentage / 100;\r
-\r
-               // 閾値判定\r
-               int i;\r
-               if (th_pixcels > 0) {\r
-                       // 黒点基準\r
-                       for (i = 0; i < 254; i++) {\r
-                               th_pixcels -= histgram[i];\r
-                               if (th_pixcels <= 0) {\r
-                                       break;\r
-                               }\r
-                       }\r
-               } else {\r
-                       // 白点基準\r
-                       for (i = 255; i > 1; i--) {\r
-                               th_pixcels += histgram[i];\r
-                               if (th_pixcels >= 0) {\r
-                                       break;\r
-                               }\r
-                       }\r
-               }\r
-               // 閾値の保存\r
-               return i;\r
-       }\r
-\r
-       public void analyzeRaster(INyARRaster i_input) throws NyARException\r
-       {\r
-               final INyARBufferReader buffer_reader=i_input.getBufferReader();        \r
-               assert (buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               int[] histgram = new int[256];\r
-               this._threshold = createHistgram(buffer_reader,i_input.getSize(), histgram);\r
-       }\r
-\r
-       /**\r
-        * デバック用の関数です。 ヒストグラムをラスタに書き出します。\r
-        * \r
-        * @param i_output\r
-        * 書き出し先のラスタオブジェクト 256ピクセル以上の幅があること。\r
-        */\r
-       public void debugDrawHistgramMap(INyARRaster i_input, INyARRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader(); \r
-               assert (in_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               assert (out_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               NyARIntSize size = i_output.getSize();\r
-\r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               // 0で塗りつぶし\r
-               for (int y = 0; y < size.h; y++) {\r
-                       for (int x = 0; x < size.w; x++) {\r
-                               out_buf[y][x] = 0;\r
-                       }\r
-               }\r
-               // ヒストグラムを計算\r
-               int[] histgram = new int[256];\r
-               int threshold = createHistgram(in_buffer_reader,i_input.getSize(), histgram);\r
-\r
-               // ヒストグラムの最大値を出す\r
-               int max_v = 0;\r
-               for (int i = 0; i < 255; i++) {\r
-                       if (max_v < histgram[i]) {\r
-                               max_v = histgram[i];\r
-                       }\r
-               }\r
-               // 目盛り\r
-               for (int i = 0; i < size.h; i++) {\r
-                       out_buf[i][0] = 128;\r
-                       out_buf[i][128] = 128;\r
-                       out_buf[i][255] = 128;\r
-               }\r
-               // スケーリングしながら描画\r
-               for (int i = 0; i < 255; i++) {\r
-                       out_buf[histgram[i] * (size.h - 1) / max_v][i] = 255;\r
-               }\r
-               // 値\r
-               for (int i = 0; i < size.h; i++) {\r
-                       out_buf[i][threshold] = 255;\r
-               }\r
-               return;\r
-       }\r
-\r
-       public int getThreshold()\r
-       {\r
-               return this._threshold;\r
-       }\r
-\r
-       public int getThreshold(int i_x, int i_y)\r
-       {\r
-               return this._threshold;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_SlidePTile.java
deleted file mode 100644 (file)
index 09676da..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasteranalyzer.threshold;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-\r
-/**\r
- * 明点と暗点をPタイル法で検出して、その中央値を閾値とする。\r
- * \r
- * \r
- */\r
-public class NyARRasterThresholdAnalyzer_SlidePTile implements INyARRasterThresholdAnalyzer\r
-{\r
-       private int _persentage;\r
-\r
-       private int _threshold;\r
-\r
-       /**\r
-        * @param i_persentage\r
-        * 0<=50であること。白/黒マーカーの場合は10~20を推奨 正の場合、黒点を基準にします。 負の場合、白点を基準にします。\r
-        * (CMOSカメラの場合、基準点は白点の方が良い)\r
-        */\r
-       public NyARRasterThresholdAnalyzer_SlidePTile(int i_persentage)\r
-       {\r
-               assert (0 <= i_persentage && i_persentage <= 50);\r
-               this._persentage = i_persentage;\r
-       }\r
-\r
-       private int createHistgram(INyARBufferReader i_reader,NyARIntSize i_size, int[] o_histgram) throws NyARException\r
-       {\r
-               int[][] in_buf = (int[][]) i_reader.getBuffer();\r
-               int[] histgram = o_histgram;\r
-\r
-               // ヒストグラムを作成\r
-               for (int i = 0; i < 256; i++) {\r
-                       histgram[i] = 0;\r
-               }\r
-               int sum = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       int sum2 = 0;\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               int v = in_buf[y][x];\r
-                               histgram[v]++;\r
-                               sum2 += v;\r
-                       }\r
-                       sum = sum + sum2 / i_size.w;\r
-               }\r
-               // 閾値ピクセル数確定\r
-               int th_pixcels = i_size.w * i_size.h * this._persentage / 100;\r
-               int th_wk;\r
-               int th_w, th_b;\r
-\r
-               // 黒点基準\r
-               th_wk = th_pixcels;\r
-               for (th_b = 0; th_b < 254; th_b++) {\r
-                       th_wk -= histgram[th_b];\r
-                       if (th_wk <= 0) {\r
-                               break;\r
-                       }\r
-               }\r
-               // 白点基準\r
-               th_wk = th_pixcels;\r
-               for (th_w = 255; th_w > 1; th_w--) {\r
-                       th_wk -= histgram[th_w];\r
-                       if (th_wk <= 0) {\r
-                               break;\r
-                       }\r
-               }\r
-               // 閾値の保存\r
-               return (th_w + th_b) / 2;\r
-       }\r
-\r
-       public void analyzeRaster(INyARRaster i_input) throws NyARException\r
-       {\r
-               final INyARBufferReader buffer_reader=i_input.getBufferReader();        \r
-               assert (buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-\r
-               int[] histgram = new int[256];\r
-               // 閾値の基準値を出す。\r
-               this._threshold = createHistgram(buffer_reader,i_input.getSize(), histgram);\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * ヒストグラムをラスタに書き出す。\r
-        * \r
-        * @param i_output\r
-        */\r
-       public void debugDrawHistgramMap(INyARRaster i_input, INyARRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader(); \r
-               assert (in_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               assert (out_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-\r
-               NyARIntSize size = i_output.getSize();\r
-\r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               // 0で塗りつぶし\r
-               for (int y = 0; y < size.h; y++) {\r
-                       for (int x = 0; x < size.w; x++) {\r
-                               out_buf[y][x] = 0;\r
-                       }\r
-               }\r
-               // ヒストグラムを計算\r
-               int[] histgram = new int[256];\r
-               int threshold = createHistgram(in_buffer_reader,i_input.getSize(), histgram);\r
-               for (int i = 255; i > 0; i--) {\r
-                       histgram[i] = Math.abs(histgram[i]);\r
-               }\r
-\r
-               // ヒストグラムの最大値を出す\r
-               int max_v = 0;\r
-               for (int i = 0; i < 255; i++) {\r
-                       if (max_v < histgram[i]) {\r
-                               max_v = histgram[i];\r
-                       }\r
-               }\r
-               // 目盛り\r
-               for (int i = 0; i < size.h; i++) {\r
-                       out_buf[i][0] = 128;\r
-                       out_buf[i][128] = 128;\r
-                       out_buf[i][255] = 128;\r
-               }\r
-               // スケーリングしながら描画\r
-               for (int i = 0; i < 255; i++) {\r
-                       out_buf[histgram[i] * (size.h - 1) / max_v][i] = 255;\r
-               }\r
-               // 値\r
-               for (int i = 0; i < size.h; i++) {\r
-                       out_buf[i][threshold] = 255;\r
-               }\r
-               return;\r
-       }\r
-\r
-       public int getThreshold()\r
-       {\r
-               return this._threshold;\r
-       }\r
-\r
-       public int getThreshold(int i_x, int i_y)\r
-       {\r
-               return this._threshold;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_AreaAverage.java
deleted file mode 100644 (file)
index 1a83b0c..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasterfilter.gs2bin;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter_GsToBin;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * 平均移動法を使った2値化フィルタ\r
- * \r
- */\r
-public class NyARRasterFilter_AreaAverage implements INyARRasterFilter_GsToBin\r
-{\r
-       private int _area = 8;\r
-\r
-       public void doFilter(NyARGlayscaleRaster i_input, NyARBinRaster i_output) throws NyARException\r
-       {\r
-               final NyARIntSize size = i_output.getSize();\r
-               final int[][] out_buf = (int[][]) i_output.getBufferReader().getBuffer();\r
-               final int[][] in_buf = (int[][]) i_input.getBufferReader().getBuffer();\r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-               assert (size.h % 8 == 0 && size.w % 8 == 0);//暫定実装なので。\r
-\r
-               final int area = this._area;\r
-               int y1 = area;\r
-               int x1 = area;\r
-               int y2 = size.h - area;\r
-               int x2 = size.w - area;\r
-\r
-               for (int y = y1; y < y2; y++) {\r
-                       int sum, nn;\r
-                       sum = nn = 0;\r
-                       for (int yy = y - area; yy < y + area + 1; yy++) {\r
-                               for (int xx = x1 - area; xx < x1 + area; xx++) {\r
-                                       sum += in_buf[yy][xx];\r
-                                       nn++;\r
-                               }\r
-                       }\r
-                       boolean first = true;\r
-                       for (int x = area; x < x2; x++) {\r
-                               if (!first) {\r
-                                       for (int yy = y - area; yy < y + area; yy++) {\r
-                                               sum += in_buf[yy][x + area];\r
-                                               sum -= in_buf[yy][x - area];\r
-                                       }\r
-                               }\r
-                               first = false;\r
-                               int th = (sum / nn);\r
-\r
-                               int g = in_buf[y][x];\r
-                               out_buf[y][x] = th < g ? 1 : 0;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/gs2bin/NyARRasterFilter_Threshold.java
deleted file mode 100644 (file)
index 0ba8de8..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasterfilter.gs2bin;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter_GsToBin;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-/**\r
- * 定数閾値による2値化をする。\r
- * \r
- */\r
-public class NyARRasterFilter_Threshold implements INyARRasterFilter_GsToBin\r
-{\r
-       private int _threshold;\r
-\r
-       public NyARRasterFilter_Threshold(int i_threshold)\r
-       {\r
-               this._threshold = i_threshold;\r
-       }\r
-\r
-       public void doFilter(NyARGlayscaleRaster i_input, NyARBinRaster i_output) throws NyARException\r
-       {\r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               final int[][] out_buf = (int[][]) i_output.getBufferReader().getBuffer();\r
-               final int[][] in_buf = (int[][]) i_input.getBufferReader().getBuffer();\r
-\r
-               int bp = 0;\r
-               NyARIntSize size = i_output.getSize();\r
-               for (int y = 0; y < size.h - 1; y++) {\r
-                       for (int x = 0; x < size.w; x++) {\r
-                               out_buf[y][x] = in_buf[y][x] >= this._threshold ? 1 : 0;\r
-                               bp += 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
deleted file mode 100644 (file)
index c9da6f5..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter_RgbToGs;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-public class NyARRasterFilter_RgbAve implements INyARRasterFilter_RgbToGs\r
-{\r
-       public void doFilter(INyARRgbRaster i_input, NyARGlayscaleRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader(); \r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               byte[] in_buf = (byte[]) in_buffer_reader.getBuffer();\r
-\r
-               NyARIntSize size = i_output.getSize();\r
-               switch (in_buffer_reader.getBufferType()) {\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                       convert24BitRgb(in_buf, out_buf, size);\r
-                       break;\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8X8_32:\r
-                       convert32BitRgbx(in_buf, out_buf, size);\r
-                       break;\r
-               default:\r
-                       throw new NyARException();\r
-               }\r
-               return;\r
-       }\r
-\r
-       private void convert24BitRgb(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               int bp = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
-                               bp += 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-       private void convert32BitRgbx(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               int bp = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
-                               bp += 4;\r
-                       }\r
-               }\r
-               return;\r
-       }       \r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbMul.java
deleted file mode 100644 (file)
index d0e21e2..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter_RgbToGs;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-public class NyARRasterFilter_RgbMul implements INyARRasterFilter_RgbToGs\r
-{\r
-       public void doFilter(INyARRgbRaster i_input, NyARGlayscaleRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader();                 \r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               int[][] out_buf = (int[][]) in_buffer_reader.getBuffer();\r
-               byte[] in_buf = (byte[]) out_buffer_reader.getBuffer();\r
-\r
-               NyARIntSize size = i_output.getSize();\r
-               switch (in_buffer_reader.getBufferType()) {\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                       convert24BitRgb(in_buf, out_buf, size);\r
-                       break;\r
-               default:\r
-                       throw new NyARException();\r
-               }\r
-               return;\r
-       }\r
-\r
-       private void convert24BitRgb(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               int bp = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) * (i_in[bp + 1] & 0xff) * (i_in[bp + 2] & 0xff)) >> 16;\r
-                               bp += 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbOr.java
deleted file mode 100644 (file)
index a2b6405..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.rasterfilter.rgb2gs;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.INyARRgbRaster;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter_RgbToGs;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-public class NyARRasterFilter_RgbOr implements INyARRasterFilter_RgbToGs\r
-{\r
-       public void doFilter(INyARRgbRaster i_input, NyARGlayscaleRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader();                 \r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               final int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               final byte[] in_buf = (byte[]) in_buffer_reader.getBuffer();\r
-\r
-               NyARIntSize size = i_output.getSize();\r
-               switch (in_buffer_reader.getBufferType()) {\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_B8G8R8_24:\r
-               case INyARBufferReader.BUFFERFORMAT_BYTE1D_R8G8B8_24:\r
-                       convert24BitRgb(in_buf, out_buf, size);\r
-                       break;\r
-               default:\r
-                       throw new NyARException();\r
-               }\r
-               return;\r
-       }\r
-\r
-       private void convert24BitRgb(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
-       {\r
-               int bp = 0;\r
-               for (int y = 0; y < i_size.h; y++) {\r
-                       for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) | (i_in[bp + 1] & 0xff) | (i_in[bp + 2] & 0xff));\r
-                               bp += 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARLabeling_ARToolKit_X2.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARLabeling_ARToolKit_X2.java
deleted file mode 100644 (file)
index 3c35e6b..0000000
+++ /dev/null
@@ -1,380 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.temp;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.labeling.*;\r
-\r
-/**\r
- * NyARLabeling_ARToolKitと同じ処理をするけど、エリア計算にintを使う。 \r
- * 画面サイズが1600x1600を超えると挙動が怪しくなる。\r
- * \r
- */\r
-public class NyARLabeling_ARToolKit_X2 implements INyARLabeling\r
-{\r
-       private static final int WORK_SIZE = 1024 * 32;// #define WORK_SIZE 1024*32\r
-\r
-       private final NyARWorkHolder work_holder = new NyARWorkHolder(WORK_SIZE);\r
-\r
-       private NyARIntSize _dest_size;\r
-\r
-       private INyARLabelingImage _out_image;\r
-\r
-       public void attachDestination(INyARLabelingImage i_destination_image) throws NyARException\r
-       {\r
-               // サイズチェック\r
-               NyARIntSize size = i_destination_image.getSize();\r
-               this._out_image = i_destination_image;\r
-\r
-               // NyLabelingImageのイメージ初期化(枠書き)\r
-               int[][] img = (int[][]) i_destination_image.getBufferReader().getBuffer();\r
-               for (int i = 0; i < size.w; i++) {\r
-                       img[0][i] = 0;\r
-                       img[size.h - 1][i] = 0;\r
-               }\r
-               for (int i = 0; i < size.h; i++) {\r
-                       img[i][0] = 0;\r
-                       img[i][size.w - 1] = 0;\r
-               }\r
-\r
-               // サイズ(参照値)を保存\r
-               this._dest_size = size;\r
-       }\r
-\r
-       public INyARLabelingImage getAttachedDestination()\r
-       {\r
-               return this._out_image;\r
-       }\r
-\r
-       /**\r
-        * static ARInt16 *labeling2( ARUint8 *image, int thresh,int *label_num, int **area, double **pos, int **clip,int **label_ref, int LorR ) 関数の代替品\r
-        * ラスタimageをラベリングして、結果を保存します。 Optimize:STEP[1514->1493]\r
-        * \r
-        * @param i_raster\r
-        * @throws NyARException\r
-        */\r
-       public void labeling(NyARBinRaster i_raster) throws NyARException\r
-       {\r
-               int m, n; /* work */\r
-               int i, j, k;\r
-               INyARLabelingImage out_image = this._out_image;\r
-\r
-               // サイズチェック\r
-               NyARIntSize in_size = i_raster.getSize();\r
-               this._dest_size.isEqualSize(in_size);\r
-\r
-               final int lxsize = in_size.w;// lxsize = arUtil_c.arImXsize;\r
-               final int lysize = in_size.h;// lysize = arUtil_c.arImYsize;\r
-               int[][] label_img = (int[][]) out_image.getBufferReader().getBuffer();\r
-\r
-               // 枠作成はインスタンスを作った直後にやってしまう。\r
-\r
-               // ラベリング情報のリセット(ラベリングインデックスを使用)\r
-               out_image.reset(true);\r
-\r
-               int[] label_idxtbl = out_image.getIndexArray();\r
-\r
-               int[] work2_pt;\r
-               int wk_max = 0;\r
-\r
-               int label_pixel;\r
-               int[][] raster_buf = (int[][]) i_raster.getBufferReader().getBuffer();\r
-               int[] line_ptr;\r
-               int[][] work2 = this.work_holder.work2;\r
-               int[] label_img_pt0, label_img_pt1;\r
-               for (j = 1; j < lysize - 1; j++) {// for (int j = 1; j < lysize - 1;j++, pnt += poff*2, pnt2 += 2) {\r
-                       line_ptr = raster_buf[j];\r
-                       label_img_pt0 = label_img[j];\r
-                       label_img_pt1 = label_img[j - 1];\r
-                       for (i = 1; i < lxsize - 1; i++) {// for(int i = 1; i < lxsize-1;i++, pnt+=poff, pnt2++) {\r
-                               // RGBの合計値が閾値より小さいかな?\r
-                               if (line_ptr[i] == 0) {\r
-                                       // pnt1 = ShortPointer.wrap(pnt2, -lxsize);//pnt1 =&(pnt2[-lxsize]);\r
-                                       if (label_img_pt1[i] > 0) {// if( *pnt1 > 0 ) {\r
-                                               label_pixel = label_img_pt1[i];// *pnt2 = *pnt1;\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                       } else if (label_img_pt1[i + 1] > 0) {// }else if(*(pnt1+1) > 0 ) {\r
-                                               if (label_img_pt1[i - 1] > 0) {// if( *(pnt1-1) > 0 ) {\r
-                                                       m = label_idxtbl[label_img_pt1[i + 1] - 1];// m =work[*(pnt1+1)-1];\r
-                                                       n = label_idxtbl[label_img_pt1[i - 1] - 1];// n =work[*(pnt1-1)-1];\r
-                                                       if (m > n) {\r
-                                                               label_pixel = n;// *pnt2 = n;\r
-                                                               // wk=IntPointer.wrap(work, 0);//wk =\r
-                                                               // &(work[0]);\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == m) {// if( *wk == m )\r
-                                                                               label_idxtbl[k] = n;// *wk = n;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else if (m < n) {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                               // wk=IntPointer.wrap(work,0);//wk = &(work[0]);\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == n) {// if( *wk == n ){\r
-                                                                               label_idxtbl[k] = m;// *wk = m;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                       }\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;\r
-                                                       work2_pt[1] += i;\r
-                                                       work2_pt[2] += j;\r
-                                                       work2_pt[6] = j;\r
-                                               } else if ((label_img_pt0[i - 1]) > 0) {// }else if(*(pnt2-1) > 0) {\r
-                                                       m = label_idxtbl[(label_img_pt1[i + 1]) - 1];// m =work[*(pnt1+1)-1];\r
-                                                       n = label_idxtbl[label_img_pt0[i - 1] - 1];// n =work[*(pnt2-1)-1];\r
-                                                       if (m > n) {\r
-\r
-                                                               label_pixel = n;// *pnt2 = n;\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == m) {// if( *wk == m ){\r
-                                                                               label_idxtbl[k] = n;// *wk = n;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else if (m < n) {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                               for (k = 0; k < wk_max; k++) {\r
-                                                                       if (label_idxtbl[k] == n) {// if( *wk == n ){\r
-                                                                               label_idxtbl[k] = m;// *wk = m;\r
-                                                                       }\r
-                                                               }\r
-                                                       } else {\r
-                                                               label_pixel = m;// *pnt2 = m;\r
-                                                       }\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                                       work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                                       work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               } else {\r
-\r
-                                                       label_pixel = label_img_pt1[i + 1];// *pnt2 =\r
-                                                       // *(pnt1+1);\r
-\r
-                                                       work2_pt = work2[label_pixel - 1];\r
-                                                       work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                                       work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                                       work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                                       if (work2_pt[3] > i) {// if(\r
-                                                               // work2[((*pnt2)-1)*7+3] >\r
-                                                               // i ){\r
-                                                               work2_pt[3] = i;// work2[((*pnt2)-1)*7+3] = i;\r
-                                                       }\r
-                                                       work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                               }\r
-                                       } else if ((label_img_pt1[i - 1]) > 0) {// }else if(\r
-                                               // *(pnt1-1) > 0 ) {\r
-                                               label_pixel = label_img_pt1[i - 1];// *pnt2 =\r
-                                               // *(pnt1-1);\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               if (work2_pt[4] < i) {// if( work2[((*pnt2)-1)*7+4] <i ){\r
-                                                       work2_pt[4] = i;// work2[((*pnt2)-1)*7+4] = i;\r
-                                               }\r
-                                               work2_pt[6] = j;// work2[((*pnt2)-1)*7+6] = j;\r
-                                       } else if (label_img_pt0[i - 1] > 0) {// }else if(*(pnt2-1) > 0) {\r
-                                               label_pixel = label_img_pt0[i - 1];// *pnt2 =*(pnt2-1);\r
-\r
-                                               work2_pt = work2[label_pixel - 1];\r
-                                               work2_pt[0]++;// work2[((*pnt2)-1)*7+0] ++;\r
-                                               work2_pt[1] += i;// work2[((*pnt2)-1)*7+1] += i;\r
-                                               work2_pt[2] += j;// work2[((*pnt2)-1)*7+2] += j;\r
-                                               if (work2_pt[4] < i) {// if( work2[((*pnt2)-1)*7+4] <i ){\r
-                                                       work2_pt[4] = i;// work2[((*pnt2)-1)*7+4] = i;\r
-                                               }\r
-                                       } else {\r
-                                               // 現在地までの領域を予約\r
-                                               this.work_holder.reserv(wk_max);\r
-                                               wk_max++;\r
-                                               label_idxtbl[wk_max - 1] = wk_max;\r
-                                               label_pixel = wk_max;// work[wk_max-1] = *pnt2 = wk_max;\r
-                                               work2_pt = work2[wk_max - 1];\r
-                                               work2_pt[0] = 1;\r
-                                               work2_pt[1] = i;\r
-                                               work2_pt[2] = j;\r
-                                               work2_pt[3] = i;\r
-                                               work2_pt[4] = i;\r
-                                               work2_pt[5] = j;\r
-                                               work2_pt[6] = j;\r
-                                       }\r
-                                       label_img_pt0[i] = label_pixel;\r
-                               } else {\r
-                                       label_img_pt0[i] = 0;// *pnt2 = 0;\r
-                               }\r
-                       }\r
-               }\r
-               // インデックステーブルとラベル数の計算\r
-               int wlabel_num = 1;// *label_num = *wlabel_num = j - 1;\r
-\r
-               for (i = 0; i < wk_max; i++) {// for(int i = 1; i <= wk_max; i++,wk++) {\r
-                       label_idxtbl[i] = (label_idxtbl[i] == i + 1) ? wlabel_num++ : label_idxtbl[label_idxtbl[i] - 1];// *wk=(*wk==i)?j++:work[(*wk)-1];\r
-               }\r
-               wlabel_num -= 1;// *label_num = *wlabel_num = j - 1;\r
-               if (wlabel_num == 0) {// if( *label_num == 0 ) {\r
-                       // 発見数0\r
-                       out_image.getLabelStack().clear();\r
-                       return;\r
-               }\r
-               // ラベルの整理\r
-               updateLabelStackLarge(out_image.getLabelStack(), label_idxtbl, in_size, work2, wk_max, wlabel_num);\r
-\r
-               return;\r
-       }\r
-       private int[][] __updateLabelStackLarge_temp=new int[64][7];/*area,x,y,l,r,t,b*/\r
-\r
-       /* 構造が変わるから、ハイスピード版実装するときに使う。 */\r
-       private void updateLabelStackLarge(NyARLabelingLabelStack i_stack, int[] i_lindex, NyARIntSize i_size, int[][] i_work, int i_work_max, int i_number_of_label) throws NyARException\r
-       {\r
-               //計算用のワークを確保\r
-               int[][] temp=this.__updateLabelStackLarge_temp;\r
-               if(temp.length<i_number_of_label){\r
-                       temp=new int[i_number_of_label+64][7];\r
-                       this.__updateLabelStackLarge_temp=temp;\r
-               }\r
-               \r
-               // ラベルバッファを予約\r
-               i_stack.reserv(i_number_of_label);\r
-               // エリアと重心、クリップ領域を計算\r
-               final NyARLabelingLabel[] labels = (NyARLabelingLabel[])i_stack.getArray();\r
-               for (int i = 0; i < i_number_of_label; i++) {\r
-                       final int[] temp_ptr = temp[i];\r
-                       temp_ptr[0]=0;//area\r
-                       temp_ptr[1]=0;//x\r
-                       temp_ptr[2]=0;//y\r
-                       temp_ptr[3]=i_size.w;//l\r
-                       temp_ptr[4]=0;//r\r
-                       temp_ptr[5]=i_size.h;//t\r
-                       temp_ptr[6]=0;//b\r
-               }\r
-               //計算!\r
-\r
-               for (int i = 0; i < i_work_max; i++) {\r
-                       final int temp_ptr[] = temp[i_lindex[i] - 1];\r
-                       final int[] work2_pt = i_work[i];\r
-                       temp_ptr[0] += work2_pt[0];\r
-                       temp_ptr[1] += work2_pt[1];\r
-                       temp_ptr[2] += work2_pt[2];\r
-                       if (temp_ptr[3] > work2_pt[3]) {\r
-                               temp_ptr[3] = work2_pt[3];\r
-                       }\r
-                       if (temp_ptr[4] < work2_pt[4]) {\r
-                               temp_ptr[4] = work2_pt[4];\r
-                       }\r
-                       if (temp_ptr[5] > work2_pt[5]) {\r
-                               temp_ptr[5] = work2_pt[5];\r
-                       }\r
-                       if (temp_ptr[6] < work2_pt[6]) {\r
-                               temp_ptr[6] = work2_pt[6];\r
-                       }\r
-               }\r
-               //ストア\r
-               for (int i = 0; i < i_number_of_label; i++) {// for(int i = 0; i < *label_num; i++ ) {\r
-                       final NyARLabelingLabel label_pt = labels[i];\r
-                       final int temp_ptr[] = temp[i];\r
-                       label_pt.area=temp_ptr[0];                      \r
-                       label_pt.pos_x= (double)temp_ptr[1]/label_pt.area;\r
-                       label_pt.pos_y= (double)temp_ptr[2]/label_pt.area;\r
-                       label_pt.clip_l= temp_ptr[3];\r
-                       label_pt.clip_r= temp_ptr[4];\r
-                       label_pt.clip_t= temp_ptr[5];\r
-                       label_pt.clip_b= temp_ptr[6];\r
-               }\r
-               return;\r
-       }\r
-}\r
-\r
-/**\r
- * NyARLabeling_O2のworkとwork2を可変長にするためのクラス\r
- * \r
- * \r
- */\r
-final class NyARWorkHolder\r
-{\r
-       private final static int ARRAY_APPEND_STEP = 256;\r
-\r
-       public final int[] work;\r
-\r
-       public final int[][] work2;\r
-\r
-       private int allocate_size;\r
-\r
-       /**\r
-        * 最大i_holder_size個の動的割り当てバッファを準備する。\r
-        * \r
-        * @param i_holder_size\r
-        */\r
-       public NyARWorkHolder(int i_holder_size)\r
-       {\r
-               // ポインタだけははじめに確保しておく\r
-               this.work = new int[i_holder_size];\r
-               this.work2 = new int[i_holder_size][];\r
-               this.allocate_size = 0;\r
-       }\r
-\r
-       /**\r
-        * i_indexで指定した番号までのバッファを準備する。\r
-        * \r
-        * @param i_index\r
-        */\r
-       public final void reserv(int i_index) throws NyARException\r
-       {\r
-               // アロケート済みなら即リターン\r
-               if (this.allocate_size > i_index) {\r
-                       return;\r
-               }\r
-               // 要求されたインデクスは範囲外\r
-               if (i_index >= this.work.length) {\r
-                       throw new NyARException();\r
-               }\r
-               // 追加アロケート範囲を計算\r
-               int range = i_index + ARRAY_APPEND_STEP;\r
-               if (range >= this.work.length) {\r
-                       range = this.work.length;\r
-               }\r
-               // アロケート\r
-               for (int i = this.allocate_size; i < range; i++) {\r
-                       this.work2[i] = new int[8];\r
-               }\r
-               this.allocate_size = range;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/core2/temp/NyARRasterFilter_Edge.java
deleted file mode 100644 (file)
index 2806ca7..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.core2.temp;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.INyARRasterFilter;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.INyARBufferReader;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-\r
-/**\r
- * エッジ検出フィルタ 入力 BUFFERFORMAT_INT2D 出力 BUFFERFORMAT_INT2D\r
- */\r
-public class NyARRasterFilter_Edge implements INyARRasterFilter\r
-{\r
-       public void doFilter(INyARRaster i_input, INyARRaster i_output) throws NyARException\r
-       {\r
-               INyARBufferReader in_buffer_reader=i_input.getBufferReader();   \r
-               INyARBufferReader out_buffer_reader=i_output.getBufferReader(); \r
-               assert (in_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               assert (out_buffer_reader.isEqualBufferType(INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8));\r
-               assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
-\r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
-               int[][] in_buf = (int[][]) in_buffer_reader.getBuffer();\r
-\r
-               int bp = 0;\r
-               NyARIntSize size = i_output.getSize();\r
-               for (int y = 1; y < size.h; y++) {\r
-                       int prev = 128;\r
-                       for (int x = 1; x < size.w; x++) {\r
-                               int w = in_buf[y][x];\r
-                               out_buf[y][x] = (Math.abs(w - prev) + Math.abs(w - in_buf[y - 1][x])) / 2;\r
-                               prev = w;\r
-                               bp += 3;\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
deleted file mode 100644 (file)
index 4932472..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.detector;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.match.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.pickup.*;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.*;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.*;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-\r
-class NyARDetectMarkerResult\r
-{\r
-       public int arcode_id;\r
-\r
-       public int direction;\r
-\r
-       public double confidence;\r
-\r
-       public NyARSquare ref_square;\r
-}\r
-\r
-class NyARDetectMarkerResultHolder\r
-{\r
-       public NyARDetectMarkerResult[] result_array = new NyARDetectMarkerResult[1];\r
-\r
-       /**\r
-        * result_holderを最大i_reserve_size個の要素を格納できるように予約します。\r
-        * \r
-        * @param i_reserve_size\r
-        */\r
-       public void reservHolder(int i_reserve_size)\r
-       {\r
-               if (i_reserve_size >= result_array.length) {\r
-                       int new_size = i_reserve_size + 5;\r
-                       result_array = new NyARDetectMarkerResult[new_size];\r
-                       for (int i = 0; i < new_size; i++) {\r
-                               result_array[i] = new NyARDetectMarkerResult();\r
-                       }\r
-               }\r
-       }\r
-}\r
-\r
-/**\r
- * 複数のマーカーを検出し、それぞれに最も一致するARコードを、コンストラクタで登録したARコードから 探すクラスです。最大300個を認識しますが、ゴミラベルを認識したりするので100個程度が限界です。\r
- * \r
- */\r
-public class NyARDetectMarker\r
-{\r
-       private static final int AR_SQUARE_MAX = 300;\r
-\r
-       private boolean _is_continue = false;\r
-\r
-       private NyARMatchPatt_Color_WITHOUT_PCA _match_patt;\r
-\r
-       private INyARSquareDetector _square_detect;\r
-\r
-       private final NyARSquareStack _square_list = new NyARSquareStack(AR_SQUARE_MAX);\r
-\r
-       private NyARCode[] _codes;\r
-\r
-       protected INyARTransMat _transmat;\r
-\r
-       private double[] _marker_width;\r
-\r
-       private int _number_of_code;\r
-\r
-       // 検出結果の保存用\r
-       private INyARColorPatt _patt;\r
-\r
-       private NyARDetectMarkerResultHolder _result_holder = new NyARDetectMarkerResultHolder();\r
-\r
-       /**\r
-        * 複数のマーカーを検出し、最も一致するARCodeをi_codeから検索するオブジェクトを作ります。\r
-        * \r
-        * @param i_param\r
-        * カメラパラメータを指定します。\r
-        * @param i_code\r
-        * 検出するマーカーのARCode配列を指定します。配列要素のインデックス番号が、そのままgetARCodeIndex関数で 得られるARCodeインデックスになります。 例えば、要素[1]のARCodeに一致したマーカーである場合は、getARCodeIndexは1を返します。\r
-        * 先頭からi_number_of_code個の要素には、有効な値を指定する必要があります。\r
-        * @param i_marker_width\r
-        * i_codeのマーカーサイズをミリメートルで指定した配列を指定します。 先頭からi_number_of_code個の要素には、有効な値を指定する必要があります。\r
-        * @param i_number_of_code\r
-        * i_codeに含まれる、ARCodeの数を指定します。\r
-        * @throws NyARException\r
-        */\r
-       public NyARDetectMarker(NyARParam i_param, NyARCode[] i_code, double[] i_marker_width, int i_number_of_code) throws NyARException\r
-       {\r
-               final NyARIntSize scr_size=i_param.getScreenSize();\r
-               // 解析オブジェクトを作る\r
-               this._square_detect = new NyARSquareDetector(i_param.getDistortionFactor(),scr_size);\r
-               this._transmat = new NyARTransMat(i_param);\r
-               // 比較コードを保存\r
-               this._codes = i_code;\r
-               // 比較コードの解像度は全部同じかな?(違うとパターンを複数種つくらないといけないから)\r
-               final int cw = i_code[0].getWidth();\r
-               final int ch = i_code[0].getHeight();\r
-               for (int i = 1; i < i_number_of_code; i++) {\r
-                       if (cw != i_code[i].getWidth() || ch != i_code[i].getHeight()) {\r
-                               // 違う解像度のが混ざっている。\r
-                               throw new NyARException();\r
-                       }\r
-               }\r
-               // 評価パターンのホルダを作る\r
-               this._patt = new NyARColorPatt_O3(cw, ch);\r
-               this._number_of_code = i_number_of_code;\r
-\r
-               this._marker_width = i_marker_width;\r
-               // 評価器を作る。\r
-               this._match_patt = new NyARMatchPatt_Color_WITHOUT_PCA();\r
-               //2値画像バッファを作る\r
-               this._bin_raster=new NyARBinRaster(scr_size.w,scr_size.h);              \r
-       }\r
-\r
-       private NyARBinRaster _bin_raster;\r
-\r
-       private NyARRasterFilter_ARToolkitThreshold _tobin_filter = new NyARRasterFilter_ARToolkitThreshold(100);\r
-\r
-       /**\r
-        * i_imageにマーカー検出処理を実行し、結果を記録します。\r
-        * \r
-        * @param i_raster\r
-        * マーカーを検出するイメージを指定します。\r
-        * @param i_thresh\r
-        * 検出閾値を指定します。0~255の範囲で指定してください。 通常は100~130くらいを指定します。\r
-        * @return 見つかったマーカーの数を返します。 マーカーが見つからない場合は0を返します。\r
-        * @throws NyARException\r
-        */\r
-       public int detectMarkerLite(INyARRgbRaster i_raster, int i_threshold) throws NyARException\r
-       {\r
-               // サイズチェック\r
-               if (!this._bin_raster.getSize().isEqualSize(i_raster.getSize())) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               // ラスタを2値イメージに変換する.\r
-               this._tobin_filter.setThreshold(i_threshold);\r
-               this._tobin_filter.doFilter(i_raster, this._bin_raster);\r
-\r
-               NyARSquareStack l_square_list = this._square_list;\r
-               // スクエアコードを探す\r
-               this._square_detect.detectMarker(this._bin_raster, l_square_list);\r
-\r
-               final int number_of_square = l_square_list.getLength();\r
-               // コードは見つかった?\r
-               if (number_of_square < 1) {\r
-                       // ないや。おしまい。\r
-                       return 0;\r
-               }\r
-               // 保持リストのサイズを調整\r
-               this._result_holder.reservHolder(number_of_square);\r
-\r
-               // 1スクエア毎に、一致するコードを決定していく\r
-               for (int i = 0; i < number_of_square; i++) {\r
-                       NyARSquare square = (NyARSquare)l_square_list.getItem(i);\r
-                       // 評価基準になるパターンをイメージから切り出す\r
-                       if (!this._patt.pickFromRaster(i_raster, square)) {\r
-                               // イメージの切り出しは失敗することもある。\r
-                               continue;\r
-                       }\r
-                       // パターンを評価器にセット\r
-                       if (!this._match_patt.setPatt(this._patt)) {\r
-                               // 計算に失敗した。\r
-                               throw new NyARException();\r
-                       }\r
-                       // コードと順番に比較していく\r
-                       int code_index = 0;\r
-                       _match_patt.evaluate(_codes[0]);\r
-                       double confidence = _match_patt.getConfidence();\r
-                       int direction = _match_patt.getDirection();\r
-                       for (int i2 = 1; i2 < this._number_of_code; i2++) {\r
-                               // コードと比較する\r
-                               _match_patt.evaluate(_codes[i2]);\r
-                               double c2 = _match_patt.getConfidence();\r
-                               if (confidence > c2) {\r
-                                       continue;\r
-                               }\r
-                               // より一致するARCodeの情報を保存\r
-                               code_index = i2;\r
-                               direction = _match_patt.getDirection();\r
-                               confidence = c2;\r
-                       }\r
-                       // i番目のパターン情報を保存する。\r
-                       final NyARDetectMarkerResult result = this._result_holder.result_array[i];\r
-                       result.arcode_id = code_index;\r
-                       result.confidence = confidence;\r
-                       result.direction = direction;\r
-                       result.ref_square = square;\r
-               }\r
-               return number_of_square;\r
-       }\r
-\r
-       /**\r
-        * i_indexのマーカーに対する変換行列を計算し、結果値をo_resultへ格納します。 直前に実行したdetectMarkerLiteが成功していないと使えません。\r
-        * \r
-        * @param i_index\r
-        * マーカーのインデックス番号を指定します。 直前に実行したdetectMarkerLiteの戻り値未満かつ0以上である必要があります。\r
-        * @param o_result\r
-        * 結果値を受け取るオブジェクトを指定してください。\r
-        * @throws NyARException\r
-        */\r
-       public void getTransmationMatrix(int i_index, NyARTransMatResult o_result) throws NyARException\r
-       {\r
-               final NyARDetectMarkerResult result = this._result_holder.result_array[i_index];\r
-               // 一番一致したマーカーの位置とかその辺を計算\r
-               if (_is_continue) {\r
-                       _transmat.transMatContinue(result.ref_square, result.direction, _marker_width[result.arcode_id], o_result);\r
-               } else {\r
-                       _transmat.transMat(result.ref_square, result.direction, _marker_width[result.arcode_id], o_result);\r
-               }\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * i_indexのマーカーの一致度を返します。\r
-        * \r
-        * @param i_index\r
-        * マーカーのインデックス番号を指定します。 直前に実行したdetectMarkerLiteの戻り値未満かつ0以上である必要があります。\r
-        * @return マーカーの一致度を返します。0~1までの値をとります。 一致度が低い場合には、誤認識の可能性が高くなります。\r
-        * @throws NyARException\r
-        */\r
-       public double getConfidence(int i_index)\r
-       {\r
-               return this._result_holder.result_array[i_index].confidence;\r
-       }\r
-\r
-       /**\r
-        * i_indexのマーカーの方位を返します。\r
-        * \r
-        * @param i_index\r
-        * マーカーのインデックス番号を指定します。 直前に実行したdetectMarkerLiteの戻り値未満かつ0以上である必要があります。\r
-        * @return 0,1,2,3の何れかを返します。\r
-        */\r
-       public int getDirection(int i_index)\r
-       {\r
-               return this._result_holder.result_array[i_index].direction;\r
-       }\r
-\r
-       /**\r
-        * i_indexのマーカーのARCodeインデックスを返します。\r
-        * \r
-        * @param i_index\r
-        * マーカーのインデックス番号を指定します。 直前に実行したdetectMarkerLiteの戻り値未満かつ0以上である必要があります。\r
-        * @return\r
-        */\r
-       public int getARCodeIndex(int i_index)\r
-       {\r
-               return this._result_holder.result_array[i_index].arcode_id;\r
-       }\r
-\r
-       /**\r
-        * getTransmationMatrixの計算モードを設定します。\r
-        * \r
-        * @param i_is_continue\r
-        * TRUEなら、transMatContinueを使用します。 FALSEなら、transMatを使用します。\r
-        */\r
-       public void setContinueMode(boolean i_is_continue)\r
-       {\r
-               this._is_continue = i_is_continue;\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
deleted file mode 100644 (file)
index 91c09a9..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.detector;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.*;\r
-import jp.nyatla.nyartoolkit.core.match.*;\r
-import jp.nyatla.nyartoolkit.core.param.NyARParam;\r
-import jp.nyatla.nyartoolkit.core.pickup.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.*;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.transmat.*;\r
-import jp.nyatla.nyartoolkit.core.types.NyARIntSize;\r
-import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2bin.NyARRasterFilter_ARToolkitThreshold;\r
-\r
-/**\r
- * 画像からARCodeに最も一致するマーカーを1個検出し、その変換行列を計算するクラスです。\r
- * \r
- */\r
-public class NyARSingleDetectMarker\r
-{\r
-       private static final int AR_SQUARE_MAX = 100;\r
-\r
-       private boolean _is_continue = false;\r
-       private NyARMatchPatt_Color_WITHOUT_PCA _match_patt;\r
-       private INyARSquareDetector _square_detect;\r
-\r
-       private final NyARSquareStack _square_list = new NyARSquareStack(AR_SQUARE_MAX);\r
-\r
-       private NyARCode _code;\r
-\r
-       protected INyARTransMat _transmat;\r
-\r
-       private double _marker_width;\r
-\r
-       // 検出結果の保存用\r
-       private int _detected_direction;\r
-\r
-       private double _detected_confidence;\r
-\r
-       private NyARSquare _detected_square;\r
-\r
-       private INyARColorPatt _patt;\r
-\r
-       /**\r
-        * 検出するARCodeとカメラパラメータから、1個のARCodeを検出するNyARSingleDetectMarkerインスタンスを作ります。\r
-        * \r
-        * @param i_param\r
-        * カメラパラメータを指定します。\r
-        * @param i_code\r
-        * 検出するARCodeを指定します。\r
-        * @param i_marker_width\r
-        * ARコードの物理サイズを、ミリメートルで指定します。\r
-        * @throws NyARException\r
-        */\r
-       public NyARSingleDetectMarker(NyARParam i_param, NyARCode i_code, double i_marker_width) throws NyARException\r
-       {\r
-               final NyARIntSize scr_size=i_param.getScreenSize();             \r
-               // 解析オブジェクトを作る\r
-               this._square_detect = new NyARSquareDetector(i_param.getDistortionFactor(),scr_size);\r
-               this._transmat = new NyARTransMat(i_param);\r
-               // 比較コードを保存\r
-               this._code = i_code;\r
-               this._marker_width = i_marker_width;\r
-               // 評価パターンのホルダを作る\r
-               this._patt = new NyARColorPatt_O3(_code.getWidth(), _code.getHeight());\r
-               // 評価器を作る。\r
-               this._match_patt = new NyARMatchPatt_Color_WITHOUT_PCA();\r
-               //2値画像バッファを作る\r
-               this._bin_raster=new NyARBinRaster(scr_size.w,scr_size.h);\r
-       }\r
-\r
-       NyARBinRaster _bin_raster;\r
-       NyARRasterFilter_ARToolkitThreshold _tobin_filter=new NyARRasterFilter_ARToolkitThreshold(100);\r
-\r
-       /**\r
-        * i_imageにマーカー検出処理を実行し、結果を記録します。\r
-        * \r
-        * @param i_raster\r
-        * マーカーを検出するイメージを指定します。イメージサイズは、カメラパラメータ\r
-        * と一致していなければなりません。\r
-        * @return マーカーが検出できたかを真偽値で返します。\r
-        * @throws NyARException\r
-        */\r
-       public boolean detectMarkerLite(INyARRgbRaster i_raster,int i_threshold) throws NyARException\r
-       {\r
-               //サイズチェック\r
-               if(!this._bin_raster.getSize().isEqualSize(i_raster.getSize())){\r
-                       throw new NyARException();\r
-               }\r
-\r
-               //ラスタを2値イメージに変換する.\r
-               this._tobin_filter.setThreshold(i_threshold);\r
-               this._tobin_filter.doFilter(i_raster,this._bin_raster);\r
-               \r
-               \r
-               this._detected_square = null;\r
-               NyARSquareStack l_square_list = this._square_list;\r
-               // スクエアコードを探す\r
-               this._square_detect.detectMarker(this._bin_raster, l_square_list);\r
-\r
-\r
-               int number_of_square = l_square_list.getLength();\r
-               // コードは見つかった?\r
-               if (number_of_square < 1) {\r
-                       return false;\r
-               }\r
-\r
-               // 評価基準になるパターンをイメージから切り出す\r
-               if (!this._patt.pickFromRaster(i_raster, (NyARSquare)l_square_list.getItem(0))) {\r
-                       // パターンの切り出しに失敗\r
-                       return false;\r
-               }\r
-               // パターンを評価器にセット\r
-               if (!this._match_patt.setPatt(this._patt)) {\r
-                       // 計算に失敗した。\r
-                       throw new NyARException();\r
-               }\r
-               // コードと比較する\r
-               this._match_patt.evaluate(this._code);\r
-               int square_index = 0;\r
-               int direction = this._match_patt.getDirection();\r
-               double confidence = this._match_patt.getConfidence();\r
-               for (int i = 1; i < number_of_square; i++) {\r
-                       // 次のパターンを取得\r
-                       this._patt.pickFromRaster(i_raster, (NyARSquare)l_square_list.getItem(i));\r
-                       // 評価器にセットする。\r
-                       this._match_patt.setPatt(this._patt);\r
-                       // コードと比較する\r
-                       this._match_patt.evaluate(this._code);\r
-                       double c2 = this._match_patt.getConfidence();\r
-                       if (confidence > c2) {\r
-                               continue;\r
-                       }\r
-                       // もっと一致するマーカーがあったぽい\r
-                       square_index = i;\r
-                       direction = this._match_patt.getDirection();\r
-                       confidence = c2;\r
-               }\r
-               // マーカー情報を保存\r
-               this._detected_square = (NyARSquare)l_square_list.getItem(square_index);\r
-               this._detected_direction = direction;\r
-               this._detected_confidence = confidence;\r
-               return true;\r
-       }\r
-\r
-       /**\r
-        * 検出したマーカーの変換行列を計算して、o_resultへ値を返します。\r
-        * 直前に実行したdetectMarkerLiteが成功していないと使えません。\r
-        * \r
-        * @param o_result\r
-        * 変換行列を受け取るオブジェクトを指定します。\r
-        * @throws NyARException\r
-        */\r
-       public void getTransmationMatrix(NyARTransMatResult o_result) throws NyARException\r
-       {\r
-               // 一番一致したマーカーの位置とかその辺を計算\r
-               if (this._is_continue) {\r
-                       this._transmat.transMatContinue(this._detected_square,this._detected_direction,this._marker_width, o_result);\r
-               } else {\r
-                       this._transmat.transMat(this._detected_square,this._detected_direction,this._marker_width, o_result);\r
-               }\r
-               return;\r
-       }\r
-\r
-       /**\r
-        * 検出したマーカーの一致度を返します。\r
-        * \r
-        * @return マーカーの一致度を返します。0~1までの値をとります。 一致度が低い場合には、誤認識の可能性が高くなります。\r
-        * @throws NyARException\r
-        */\r
-       public double getConfidence()\r
-       {\r
-               return this._detected_confidence;\r
-       }\r
-\r
-       /**\r
-        * 検出したマーカーの方位を返します。\r
-        * \r
-        * @return 0,1,2,3の何れかを返します。\r
-        */\r
-       public int getDirection()\r
-       {\r
-               return this._detected_direction;\r
-       }\r
-\r
-       /**\r
-        * getTransmationMatrixの計算モードを設定します。 初期値はTRUEです。\r
-        * \r
-        * @param i_is_continue\r
-        * TRUEなら、transMatCont互換の計算をします。 FALSEなら、transMat互換の計算をします。\r
-        */\r
-       public void setContinueMode(boolean i_is_continue)\r
-       {\r
-               this._is_continue = i_is_continue;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java b/branches/nyatla/src/jp/nyatla/nyartoolkit/sample/RawFileTest.java
deleted file mode 100644 (file)
index 55720ec..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.sample;\r
-\r
-import java.io.*;\r
-import java.util.*;\r
-\r
-import jp.nyatla.nyartoolkit.core.*;\r
-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.detector.NyARSingleDetectMarker;\r
-\r
-\r
-/**\r
- * 320x240のBGRA32で記録されたRAWイメージから、1種類のパターンを認識し、\r
- * その変換行列を1000回求め、それにかかったミリ秒時間を表示します。\r
- * \r
- */\r
-public class RawFileTest\r
-{\r
-       private final String code_file = "../Data/patt.hiro";\r
-\r
-       private final String data_file = "../Data/320x240ABGR.raw";\r
-\r
-       private final String camera_file = "../Data/camera_para.dat";\r
-\r
-       public RawFileTest()\r
-       {\r
-       }\r
-\r
-\r
-       public void Test_arDetectMarkerLite() throws Exception\r
-       {\r
-               // AR用カメラパラメタファイルをロード\r
-               NyARParam ap = new NyARParam();\r
-               ap.loadARParamFromFile(camera_file);\r
-               ap.changeScreenSize(320, 240);\r
-\r
-               // AR用のパターンコードを読み出し\r
-               NyARCode code = new NyARCode(16, 16);\r
-               code.loadARPattFromFile(code_file);\r
-\r
-               // 試験イメージの読み出し(320x240 BGRAのRAWデータ)\r
-               File f = new File(data_file);\r
-               FileInputStream fs = new FileInputStream(data_file);\r
-               byte[] buf = new byte[(int) f.length()];\r
-               fs.read(buf);\r
-               INyARRgbRaster ra = NyARRgbRaster_BGRA.wrap(buf, 320, 240);\r
-               // Blank_Raster ra=new Blank_Raster(320, 240);\r
-\r
-               // 1パターンのみを追跡するクラスを作成\r
-               NyARSingleDetectMarker ar = new NyARSingleDetectMarker(ap, code, 80.0);\r
-               NyARTransMatResult result_mat = new NyARTransMatResult();\r
-               ar.setContinueMode(false);\r
-               ar.detectMarkerLite(ra, 100);\r
-               ar.getTransmationMatrix(result_mat);\r
-\r
-               // マーカーを検出\r
-               Date d2 = new Date();\r
-               for (int i = 0; i < 1000; i++) {\r
-                       // 変換行列を取得\r
-                       ar.detectMarkerLite(ra, 100);\r
-                       ar.getTransmationMatrix(result_mat);\r
-               }\r
-               Date d = new Date();\r
-               System.out.println(d.getTime() - d2.getTime());\r
-       }\r
-\r
-       public static void main(String[] args)\r
-       {\r
-\r
-               try {\r
-                       RawFileTest t = new RawFileTest();\r
-                       // t.Test_arGetVersion();\r
-                       t.Test_arDetectMarkerLite();\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/utils/DoubleValue.java b/branches/nyatla/src/jp/nyatla/utils/DoubleValue.java
deleted file mode 100644 (file)
index 5798a73..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.utils;\r
-\r
-public class DoubleValue\r
-{\r
-       public double value;\r
-}
\ No newline at end of file
diff --git a/branches/nyatla/src/jp/nyatla/utils/IntValue.java b/branches/nyatla/src/jp/nyatla/utils/IntValue.java
deleted file mode 100644 (file)
index e4fa0da..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.utils;\r
-\r
-public class IntValue\r
-{\r
-       public int value;\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/utils/NyObjectStack.java b/branches/nyatla/src/jp/nyatla/utils/NyObjectStack.java
deleted file mode 100644 (file)
index ccb4998..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.utils;\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-\r
-/**\r
- * オンデマンド割り当てをするオブジェクト配列。\r
- * 配列には実体を格納します。\r
- */\r
-public abstract class NyObjectStack\r
-{\r
-       private final static int ARRAY_APPEND_STEP = 64;\r
-\r
-       protected final Object[] _items;\r
-\r
-       private int _allocated_size;\r
-\r
-       protected int _length;\r
-\r
-       /**\r
-        * 最大ARRAY_MAX個の動的割り当てバッファを準備する。\r
-        * \r
-        * @param i_array\r
-        */\r
-       public NyObjectStack(Object[] i_array)\r
-       {\r
-               // ポインタだけははじめに確保しておく\r
-               this._items = i_array;\r
-               // アロケート済サイズと、使用中個数をリセット\r
-               this._allocated_size = 0;\r
-               this._length = 0;\r
-       }\r
-\r
-       /**\r
-        * ポインタを1進めて、その要素を予約し、その要素へのポインタを返します。\r
-        * 特定型に依存させるときには、継承したクラスでこの関数をオーバーライドしてください。\r
-        */\r
-       public final Object prePush() throws NyARException\r
-       {\r
-               // 必要に応じてアロケート\r
-               if (this._length >= this._allocated_size) {\r
-                       // 要求されたインデクスは範囲外\r
-                       if (this._length >= this._items.length) {\r
-                               throw new NyARException();\r
-                       }\r
-                       // 追加アロケート範囲を計算\r
-                       int range = this._length + ARRAY_APPEND_STEP;\r
-                       if (range >= this._items.length) {\r
-                               range = this._items.length;\r
-                       }\r
-                       // アロケート\r
-                       this.onReservRequest(this._allocated_size, range, this._items);\r
-                       this._allocated_size = range;\r
-               }\r
-               // 使用領域を+1して、予約した領域を返す。\r
-               Object ret = this._items[this._length];\r
-               this._length++;\r
-               return ret;\r
-       }\r
-       /**\r
-        * 見かけ上の要素数を1減らして、最後尾のアイテムを返します。\r
-        * @return\r
-        */\r
-       public final Object pop() throws NyARException\r
-       {\r
-               if(this._length<1){\r
-                       throw new NyARException();\r
-               }\r
-               this._length--;\r
-               return this.getItem(this._length);\r
-       }\r
-       /**\r
-        * 0~i_number_of_item-1までの領域を予約します。\r
-        * 予約すると、見かけ上の要素数は0にリセットされます。\r
-        * @param i_number_of_reserv\r
-        */\r
-       final public void reserv(int i_number_of_item) throws NyARException\r
-       {\r
-               // 必要に応じてアロケート\r
-               if (i_number_of_item >= this._allocated_size) {\r
-                       // 要求されたインデクスは範囲外\r
-                       if (i_number_of_item >= this._items.length) {\r
-                               throw new NyARException();\r
-                       }\r
-                       // 追加アロケート範囲を計算\r
-                       int range = i_number_of_item+ARRAY_APPEND_STEP;\r
-                       if (range >= this._items.length) {\r
-                               range = this._items.length;\r
-                       }\r
-                       // アロケート\r
-                       this.onReservRequest(this._allocated_size, range, this._items);\r
-                       this._allocated_size = range;\r
-               }\r
-               //見かけ上の配列サイズを指定\r
-               this._length=i_number_of_item;\r
-               return;\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * この関数を継承先クラスで実装して下さい。\r
-        * i_bufferの配列の、i_start番目からi_end-1番目までの要素に、オブジェクトを割り当てて下さい。\r
-        * \r
-        * @param i_start\r
-        * @param i_end\r
-        * @param i_buffer\r
-        */\r
-       protected abstract void onReservRequest(int i_start, int i_end, Object[] i_buffer);\r
-       /**\r
-        * 配列を返します。\r
-        * \r
-        * @return\r
-        */\r
-       public final Object[] getArray()\r
-       {\r
-               return this._items;\r
-       }\r
-       public final Object getItem(int i_index)\r
-       {\r
-               return this._items[i_index];\r
-       }\r
-       /**\r
-        * 配列の見かけ上の要素数を返却します。\r
-        * @return\r
-        */\r
-       public final int getLength()\r
-       {\r
-               return this._length;\r
-       }\r
-       \r
-       /**\r
-        * 見かけ上の要素数をリセットします。\r
-        */\r
-       public final void clear()\r
-       {\r
-               this._length = 0;\r
-       }\r
-}\r
diff --git a/branches/nyatla/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java b/branches/nyatla/src/jp/nyatla/utils/j2se/LabelingBufferdImage.java
deleted file mode 100644 (file)
index 18d57d6..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-/* \r
- * PROJECT: NyARToolkit\r
- * --------------------------------------------------------------------------------\r
- * This work is based on the original ARToolKit developed by\r
- *   Hirokazu Kato\r
- *   Mark Billinghurst\r
- *   HITLab, University of Washington, Seattle\r
- * http://www.hitl.washington.edu/artoolkit/\r
- *\r
- * The NyARToolkit is Java version ARToolkit class library.\r
- * Copyright (C)2008 R.Iizuka\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this framework; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
- * \r
- * For further information please contact.\r
- *     http://nyatla.jp/nyatoolkit/\r
- *     <airmail(at)ebony.plala.or.jp>\r
- * \r
- */\r
-package jp.nyatla.utils.j2se;\r
-\r
-import java.awt.Graphics;\r
-import java.awt.image.*;\r
-import java.awt.color.*;\r
-import java.awt.*;\r
-\r
-\r
-import jp.nyatla.nyartoolkit.NyARException;\r
-import jp.nyatla.nyartoolkit.core.types.*;\r
-import jp.nyatla.nyartoolkit.core.rasterreader.*;\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.types.stack.*;\r
-\r
-\r
-/**\r
- * bitmapとして利用可能なラベリングイメージです。\r
- * \r
- * \r
- */\r
-public class LabelingBufferdImage extends BufferedImage\r
-{\r
-       public final static int COLOR_125_COLOR = 0;// 125色ラベルモード\r
-\r
-       public final static int COLOR_256_MONO = 1;// 64階調モノクロモード\r
-\r
-       public final static int COLOR_64_MONO = 2;// 64階調モノクロモード\r
-\r
-       public final static int COLOR_32_MONO = 3;// 32階調モノクロモード\r
-\r
-       public final static int COLOR_16_MONO = 4;// 16階調モノクロモード\r
-\r
-       public final static int COLOR_8_MONO = 5;// 16階調モノクロモード\r
-\r
-       private int[] _rgb_table;\r
-\r
-       private int _number_of_color;\r
-\r
-       /**\r
-        * i_width x i_heightの大きさのイメージを作成します。\r
-        * \r
-        * @param i_width\r
-        * @param i_height\r
-        */\r
-       public LabelingBufferdImage(int i_width, int i_height, int i_color_mode)\r
-       {\r
-               super(i_width, i_height, ColorSpace.TYPE_RGB);\r
-               // RGBテーブルを作成\r
-               switch (i_color_mode) {\r
-               case COLOR_125_COLOR:\r
-                       this._rgb_table = new int[125];\r
-                       this._number_of_color = 125;\r
-                       for (int i = 0; i < 5; i++) {\r
-                               for (int i2 = 0; i2 < 5; i2++) {\r
-                                       for (int i3 = 0; i3 < 5; i3++) {\r
-                                               this._rgb_table[((i * 5) + i2) * 5 + i3] = ((((i * 63) << 8) | (i2 * 63)) << 8) | (i3 * 63);\r
-                                       }\r
-                               }\r
-                       }\r
-                       break;\r
-               case COLOR_256_MONO:\r
-                       this._rgb_table = new int[256];\r
-                       this._number_of_color = 256;\r
-                       for (int i = 0; i < 256; i++) {\r
-                               this._rgb_table[i] = (i << 16) | (i << 8) | i;\r
-                       }\r
-                       break;\r
-               case COLOR_64_MONO:\r
-                       this._rgb_table = new int[64];\r
-                       this._number_of_color = 64;\r
-                       for (int i = 0; i < 64; i++) {\r
-                               int m = (i * 4);\r
-                               this._rgb_table[i] = (m << 16) | (m << 8) | m;\r
-                       }\r
-                       break;\r
-               case COLOR_32_MONO:\r
-                       this._rgb_table = new int[32];\r
-                       this._number_of_color = 32;\r
-                       for (int i = 0; i < 32; i++) {\r
-                               int m = (i * 8);\r
-                               this._rgb_table[i] = (m << 16) | (m << 8) | m;\r
-                       }\r
-                       break;\r
-               case COLOR_16_MONO:\r
-                       this._rgb_table = new int[32];\r
-                       this._number_of_color = 16;\r
-                       for (int i = 0; i < 16; i++) {\r
-                               int m = (i * 8);\r
-                               this._rgb_table[i] = (m << 16) | (m << 8) | m;\r
-                       }\r
-                       break;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       public void drawImage(NyARGlayscaleRaster i_raster) throws NyARException\r
-       {\r
-               assert (i_raster.getBufferReader().getBufferType() == INyARBufferReader.BUFFERFORMAT_INT2D_GLAY_8);\r
-\r
-               int w = this.getWidth();\r
-               int h = this.getHeight();\r
-               // サイズをチェック\r
-               NyARIntSize size = i_raster.getSize();\r
-               if (size.h > h || size.w > w) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               int[][] limg;\r
-               // イメージの描画\r
-               limg = (int[][]) i_raster.getBufferReader().getBuffer();\r
-               for (int i = 0; i < h; i++) {\r
-                       for (int i2 = 0; i2 < w; i2++) {\r
-                               this.setRGB(i2, i, this._rgb_table[limg[i][i2] % this._number_of_color]);\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-\r
-       public void drawImage(NyARBinRaster i_raster) throws NyARException\r
-       {\r
-               assert (i_raster.getBufferReader().getBufferType() == INyARBufferReader.BUFFERFORMAT_INT2D_BIN_8);\r
-\r
-               int w = this.getWidth();\r
-               int h = this.getHeight();\r
-               // サイズをチェック\r
-               NyARIntSize size = i_raster.getSize();\r
-               if (size.h > h || size.w > w) {\r
-                       throw new NyARException();\r
-               }\r
-\r
-               int[][] limg;\r
-               // イメージの描画\r
-               limg = (int[][]) i_raster.getBufferReader().getBuffer();\r
-               for (int i = 0; i < h; i++) {\r
-                       for (int i2 = 0; i2 < w; i2++) {\r
-                               this.setRGB(i2, i, limg[i][i2] > 0 ? 255 : 0);\r
-                       }\r
-               }\r
-               return;\r
-       }\r
-\r
-       public void overlayData(NyARIntPointStack i_stack)\r
-       {\r
-               int count = i_stack.getLength();\r
-               NyARIntPoint[] items = (NyARIntPoint[])i_stack.getArray();\r
-               Graphics g = this.getGraphics();\r
-               for (int i = 0; i < count; i++) {\r
-                       int x = items[i].x;\r
-                       int y = items[i].y;\r
-                       g.setColor(Color.red);\r
-                       g.drawLine(x - 5, y, x + 5, y);\r
-                       g.drawLine(x, y + 5, x, y - 5);\r
-               }\r
-               return;\r
-       }\r
-       public void overlayData(NyARIntRectStack i_stack)\r
-       {\r
-               Color[] c=new Color[]{Color.cyan,Color.red,Color.green};\r
-               int count = i_stack.getLength();\r
-               NyARIntRect[] items = (NyARIntRect[])i_stack.getArray();\r
-               Graphics g = this.getGraphics();\r
-               for (int i = 0; i < count; i++) {\r
-                       int x = items[i].x;\r
-                       int y = items[i].y;\r
-                       g.setColor(c[i%1]);\r
-                       g.drawRect(x,y,items[i].w,items[i].h);\r
-               }\r
-               return;\r
-       }\r
-}\r
diff --git a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
deleted file mode 100644 (file)
index d22fdbf..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/* このソースは実験用のソースです。
- * 動いたり動かなかったりします。
- * 
- */
-package jp.nyatla.nyartoolkit.dev;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-
-
-import jp.nyatla.nyartoolkit.core.labeling.*;
-import jp.nyatla.nyartoolkit.core.raster.*;
-import jp.nyatla.nyartoolkit.core.rasterfilter.*;
-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 {
-    private JmfNyARRaster_RGB _raster;
-    private JmfCameraCapture capture;
-
-
-    public LabelingCamera() throws NyARException, NyARException
-    {
-       setBounds(0, 0, 640 + 64, 720 + 64);
-       // キャプチャの準備
-       capture = new JmfCameraCapture(320, 240, 30f,
-               JmfCameraCapture.PIXEL_FORMAT_RGB);
-       capture.setCaptureListener(this);
-
-       // キャプチャイメージ用のラスタを準備
-       this._raster = new JmfNyARRaster_RGB(320, 240);
-    }
-    
-    private NyARBinRaster _binraster1=new NyARBinRaster(320,240);
-    private NyARGlayscaleRaster _gsraster1=new NyARGlayscaleRaster(320,240);
-    private NyARLabelingImage _limage=new NyARLabelingImage(320, 240);
-    private LabelingBufferdImage _bimg=new LabelingBufferdImage(320, 240,LabelingBufferdImage.COLOR_256_MONO);
-    private LabelingBufferdImage _bimg2=new LabelingBufferdImage(320, 240,LabelingBufferdImage.COLOR_256_MONO);
-
-    public void onUpdateBuffer(Buffer i_buffer)
-    {
-       try {
-           // キャプチャしたバッファをラスタにセット
-           _raster.setBuffer(i_buffer);
-           
-           Graphics g = getGraphics();
-           //キャプチャ画像
-           BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-           Image img = b2i.createImage(i_buffer);
-           this.getGraphics().drawImage(img, 32, 32, this);
-           
-           INyARRasterFilter_GsToBin filter_gs2bin;
-           //画像1
-           INyARRasterFilter_RgbToGs filter_rgb2gs=new NyARRasterFilter_RgbAve();
-           filter_rgb2gs.doFilter(_raster, _gsraster1);
-           this._bimg2.drawImage(this._gsraster1);
-           this.getGraphics().drawImage(this._bimg2, 32+320, 32,320+320+32,240+32,0,240,320,0, this);
-
-           //画像2
-           filter_gs2bin=new NyARRasterFilter_ARToolKitThreshold(128);
-           filter_gs2bin.doFilter(_gsraster1, _binraster1);
-           this._bimg.drawImage(_binraster1);
-           this.getGraphics().drawImage(this._bimg, 32, 32+240,320+32,240+32+240,0,240,320,0, this);
-           //画像3
-           //threshold.debugDrawHistgramMap(_workraster, _workraster2);
-           //this._bimg2.setImage(this._workraster2);
-           //this.getGraphics().drawImage(this._bimg2, 32+320, 32+240,320+32+320,240+32+240,0,240,320,0, this);
-
-           //画像4
-           NyARRasterThresholdAnalyzer_SlidePTile threshold=new NyARRasterThresholdAnalyzer_SlidePTile(15);
-           threshold.analyzeRaster(_gsraster1);
-           filter_gs2bin=new NyARRasterFilter_AreaAverage();
-           filter_gs2bin.doFilter(_gsraster1, _binraster1);
-           this._bimg.drawImage(_binraster1);
-           
-           NyARRasterDetector_QrCodeEdge detector=new NyARRasterDetector_QrCodeEdge(10000);
-           detector.analyzeRaster(_binraster1);
-           
-           this._bimg.overlayData(detector.geResult());
-           
-           this.getGraphics().drawImage(this._bimg, 32, 32+480,320+32,480+32+240,0,240,320,0, this);
-           //画像5
-           
-           
-/*         threshold2.debugDrawHistgramMap(_workraster, _workraster2);
-           this._bimg2.drawImage(this._workraster2);
-           this.getGraphics().drawImage(this._bimg2, 32+320, 32+480,320+32+320,480+32+240,0,240,320,0, this);
-*/         
-           
-           //      this.getGraphics().drawImage(this._bimg, 32, 32, this);
-
-
-       } catch (Exception e) {
-           e.printStackTrace();
-       }
-
-    }
-    private INyARLabeling labelingFactory(int i_idx)
-    {
-       switch(i_idx){
-       case 0:{NyARLabeling_ARToolKit l=new NyARLabeling_ARToolKit();l.setThresh(4);return l;}
-       case 1:{return new NyLineLabeling();}
-       }
-       return null;
-       
-       
-    }
-
-    private void startCapture()
-    {
-       try {
-           capture.start();
-       } catch (Exception e) {
-           e.printStackTrace();
-       }
-    }
-
-    public static void main(String[] args) {
-       try {
-           LabelingCamera mainwin = new LabelingCamera();
-           mainwin.setVisible(true);
-           mainwin.startCapture();
-       } catch (Exception e) {
-           e.printStackTrace();
-       }
-
-    }
-
-}
diff --git a/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java b/branches/nyatla/test/jp/nyatla/nyartoolkit/dev/LabelingTest.java
deleted file mode 100644 (file)
index b9b7c28..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* このソースは実験用のソースです。\r
- * 動いたり動かなかったりします。\r
- * \r
- */\r
-package jp.nyatla.nyartoolkit.dev;\r
-\r
-import java.awt.Frame;\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
-\r
-import jp.nyatla.nyartoolkit.core.raster.*;\r
-import jp.nyatla.nyartoolkit.core.raster.rgb.NyARRgbRaster_BGRA;\r
-import jp.nyatla.nyartoolkit.core.labeling.*;\r
-\r
-import jp.nyatla.nyartoolkit.core2.rasteranalyzer.*;\r
-import jp.nyatla.utils.j2se.*;\r
-\r
-public class LabelingTest extends Frame\r
-{\r
-    private final String data_file  ="../Data/320x240ABGR.raw";\r
-    public void drawImage() throws Exception\r
-    {\r
-       File f=new File(data_file);\r
-       FileInputStream fs=new FileInputStream(data_file);\r
-       byte[] buf=new byte[(int)f.length()];\r
-       fs.read(buf);\r
-       NyARRgbRaster_BGRA ra=NyARRgbRaster_BGRA.wrap(buf, 320, 240);\r
-       NyARLabelingImage limage=new NyARLabelingImage(320,240);\r
-       INyARLabeling labeling=new NyARLabeling_ARToolKit();\r
-//     INyARLabeling labeling=new NyLineLabeling();\r
-       INyARRasterReaderFactory rf=new NyARRasterReaderFactory_RgbTotal();\r
-       labeling.attachDestination(limage);\r
-       labeling.labeling(rf.createReader(ra));\r
-       LabelingBufferdImage img=new LabelingBufferdImage(320,240,LabelingBufferdImage.COLOR_125_COLOR);\r
-       img.setLabelingImage(limage);\r
-       this.getGraphics().drawImage(img, 32,32,this);\r
-    }\r
-    public static void main(String[] args)\r
-    {\r
-       try{\r
-           LabelingTest app=new LabelingTest();\r
-           app.setVisible(true);\r
-           app.setBounds(0,0,640,480);\r
-           app.drawImage();\r
-       }catch(Exception e){\r
-           e.printStackTrace();\r
-       }\r
-    }\r
-}\r