• R/O
  • HTTP
  • SSH
  • HTTPS

nyartoolkit-and: List of commits

NyARToolkit for Android v2.x, 3.x mainline.

master: NyARToolkit core.
android-1.6: for Android 1.6. obsolete version.
android-2.2: for Android 2.2. current version.


RSS
Rev. Time Author
5867a2f NyARTK4.nyatla 2012-05-26 23:00:25 nyatla

rollback to a3da5d5

41cfabd 2012-05-26 22:47:15 nyatla

rollback to a3da5d5

8f07324 2012-05-26 01:18:33 nyatla

backup

792a5c0 2012-05-26 01:01:13 nyatla

delete olds

1b44d6c 2012-05-26 01:00:18 nyatla

backup

be72a53 2012-05-26 00:54:23 nyatla

backup

f183111 2012-05-24 19:44:37 nyatla

backup

a3da5d5 2012-03-21 00:22:49 rokubou

キャプチャサイズの自動変更に対応。 320x240~640x480 の間で自動的に切り替わる。
コメント追加

d34109d 2012-03-20 23:20:59 rokubou

gitの設定変更

9cc16d4 2012-03-20 23:19:32 rokubou

Readme の追加と更新

2817e70 2012-03-20 23:06:54 rokubou

Add Sample : Simple Marker system sample

ab50268 2012-03-20 23:04:29 rokubou

パス情報変更

8e5d4cc 2012-03-20 22:53:33 rokubou

Add Sample : Simple Cube

8d69629 2012-03-20 22:47:42 rokubou

NyARToolKit for Java v4.0.1 を適応した、基礎コード

07b9fa9 android-2.2 2011-05-30 13:20:06 rokubou

3.0用にコメント修正

cac41fc 2011-05-13 14:45:58 atsuoigarashi

Version up to 3.0.0.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

3c94d44 2011-05-13 11:38:38 Atsuo Igarashi

Add Sphere.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

84a601d 2011-05-12 10:12:18 Atsuo Igarashi

Add to specify camera preview size in strings.xml.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

32f470f 2011-05-11 18:28:13 atsuoigarashi

Add support Wavefromt(.obj) model.

Signed-off-by: atsuoigarashi <atsuoigarashi@gmail.com>

a6ec8a0 2011-04-15 16:30:02 Atsuo Igarashi

Fix compile error for Android SDK.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

92002d4 2011-04-15 15:26:58 Atsuo Igarashi

Merge branch 'master' into android-2.2

Conflicts:
lib/src/jp/nyatla/nyartoolkit/detector/NyARDetectMarker.java
readme.ja.txt
sample/java3d/.classpath
sample/java3d/src/jp/nyatla/nyartoolkit/java3d/sample/NyARJava3D.java
sample/jogl/.classpath
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite2.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/JavaSimpleLite_ImageSource.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/SingleARMarker.java
sample/jogl/src/jp/nyatla/nyartoolkit/jogl/sample/SingleNyIdMarker.java
sample/sandbox/.classpath
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/LabelingCamera.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/NyARColorPatt_DiagonalRatio.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/NyARSquareDetector_Vector.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/OptimizeCompareTest.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/PattPickupTest.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/PattPickupTestS.java
sample/sandbox/src.dev/jp/nyatla/nyartoolkit/dev/Solver.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/analyzer/histogram/NyARHistogramAnalyzer_PTile.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasteranalyzer/NyARRasterDetector_QrCodeEdge.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasteranalyzer/threshold/NyARRasterThresholdAnalyzer_DiffHistogram.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterFilter_Edge.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/NyARRasterOperator_Mul.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_CbCrCut.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/rasterfilter/rgb2gs/NyARRasterFilter_Rgb2Gs_RgbOr.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARFixedFloat16Point2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARFixedFloat16Point3d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Linear.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Point2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/NyARI64Point3d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARFixedFloat16Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARFixedFloat24Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARI64Matrix22.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/core/types/matrix/NyARI64Matrix33.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARQrCodeSymbolBinder.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARRasterFilter_QrAreaAverage.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/NyARSingleQrDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrTest.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/JavaSimpleLite_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARRasterFilter_ARTTh_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSingleDetectMarker_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/quadx2/NyARSquareDetector_Quad.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/utils/NyARSingleEdgeFinder.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/vertexdetect/NyARVertexDetector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/JavaSimpleLite_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloat16Mat.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatFitVecCalculator.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatIdeal2Observ.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatObserv2IdealMap.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatPca2d.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotMatrix.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotTransOptimize_O2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatRotVector.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatTransOffset.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARFixedFloatVertexCounter.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSingleDetectMarker_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARSquareDetector_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyARTransMat_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/NyMath.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/RawFileTest_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/SingleARMarkerProcesser_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/SquareContourDetector_X2.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/sandbox/x2/VisualTest.java
sample/sandbox/src.sandbox/jp/nyatla/nyartoolkit/utils/j2se/NyARRGBRaster_BufferedImage.java
src/jp/nyatla/nyartoolkit/detector/NyARSingleDetectMarker.java
src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
utils/j2se/.classpath
utils/j2se/.project
utils/j2se/src/jp/nyatla/nyartoolkit/utils/j2se/LabelingBufferdImage.java
utils/j2se/src/jp/nyatla/nyartoolkit/utils/j2se/NyARRasterImageIO.java
utils/java3d/.classpath
utils/java3d/.project
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java
utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java
utils/jmf/.classpath
utils/jmf/.project
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java
utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/JmfCaptureTest.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
utils/jogl/.classpath
utils/jogl/.project
utils/qt/.classpath
utils/qt/.project
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java
utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
utils/qt/test/jp/nyatla/nyartoolkit/qt/test/NyarToolkitLinkTest.java
utils/qt/test/jp/nyatla/nyartoolkit/qt/test/QtCaptureTest.java

770e857 2011-04-15 13:41:26 Atsuo Igarashi

Change converting YUV420SP to BGRA instead of converting YUV420SP to
RGBA.
I missed to commit this, sorry.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

0b1ba96 2011-04-13 14:16:57 Atsuo Igarashi

Add calling roundOrientation().

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

f4138bb 2011-04-13 13:21:19 Atsuo Igarashi

Move controlling part of MediaPlayer.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

62aea3b 2011-04-13 10:08:08 Atsuo Igarashi

Avoid setting camera parameters each preview frame.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

33cefba 2011-04-11 16:43:50 Atsuo Igarashi

Remove unnecessary setPreviewDisplay(null).

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

a915e01 2011-04-06 17:49:03 Atsuo Igarashi

Use MediaPlayer instead of VoicePlayer.

Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>

60e7b5a master 2011-04-05 18:46:01 nyatla

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@811 7cac0a50-4618-4814-88d0-24b83990f816

38ef052 2011-04-05 18:45:06 nyatla

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@810 7cac0a50-4618-4814-88d0-24b83990f816

221b832 2011-04-05 18:44:10 nyatla

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@809 7cac0a50-4618-4814-88d0-24b83990f816

Show on old repository browser