From atsuoigarashi ¡÷ users.sourceforge.jp Tue May 11 18:44:39 2010 From: atsuoigarashi ¡÷ users.sourceforge.jp (atsuoigarashi ¡÷ users.sourceforge.jp) Date: Tue, 11 May 2010 18:44:39 +0900 Subject: [Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, android-1.6, updated. 620bc7a18e1b8d3cf1da08dd78f7f80610e6206d Message-ID: <1273571079.054816.16219.nullmailer@users.sourceforge.jp> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to "nyartoolkit-and" repository containing the "nyartoolkit-and" project. The branch, android-1.6 has been updated via 620bc7a18e1b8d3cf1da08dd78f7f80610e6206d (commit) from 3c938fb51525799f0a38ed2a78db1d61359ffba5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 620bc7a18e1b8d3cf1da08dd78f7f80610e6206d Author: Atsuo Igarashi Date: Mon May 10 20:46:52 2010 +0900 Add support multiple marker. Found first marker hiro assigns droid model. Found first marker kanji assigns miku model. Others assigns a cube object. Signed-off-by: Atsuo Igarashi ----------------------------------------------------------------------- Summary of changes: assets/droid.mqo | 1810 ++++++++++++++++++++ gen/jp/androidgroup/nyartoolkit/R.java | 4 +- res/raw/multi.pdf | Bin 0 -> 26418 bytes res/raw/{patt.hiro => patthiro} | 0 Data/patt.kanji => res/raw/pattkanji | 0 .../androidgroup/nyartoolkit/ARToolkitDrawer.java | 56 +- src/jp/androidgroup/nyartoolkit/ModelRenderer.java | 161 +- .../nyartoolkit/NyARToolkitAndroidActivity.java | 13 +- 8 files changed, 1940 insertions(+), 104 deletions(-) create mode 100644 assets/droid.mqo create mode 100644 res/raw/multi.pdf rename res/raw/{patt.hiro => patthiro} (100%) copy Data/patt.kanji => res/raw/pattkanji (100%) hooks/post-receive -- nyartoolkit-and (nyartoolkit-and) From atsuoigarashi ¡÷ users.sourceforge.jp Tue May 18 20:09:19 2010 From: atsuoigarashi ¡÷ users.sourceforge.jp (atsuoigarashi ¡÷ users.sourceforge.jp) Date: Tue, 18 May 2010 20:09:19 +0900 Subject: [Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, android-1.6, updated. 4e44567d4225c0ffcb416c4410ea5219f88abdba Message-ID: <1274180959.730683.25873.nullmailer@users.sourceforge.jp> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to "nyartoolkit-and" repository containing the "nyartoolkit-and" project. The branch, android-1.6 has been updated via 4e44567d4225c0ffcb416c4410ea5219f88abdba (commit) from 620bc7a18e1b8d3cf1da08dd78f7f80610e6206d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4e44567d4225c0ffcb416c4410ea5219f88abdba Author: Atsuo Igarashi Date: Mon May 17 10:50:41 2010 +0900 Remove Dev1Camera device. Signed-off-by: Atsuo Igarashi ----------------------------------------------------------------------- Summary of changes: gen/jp/androidgroup/nyartoolkit/R.java | 25 +- res/layout/devonecamera.xml | 21 - .../nyartoolkit/NyARToolkitAndroidActivity.java | 30 +- .../nyartoolkit/hardware/Dev1Camera.java | 827 -------------------- 4 files changed, 14 insertions(+), 889 deletions(-) delete mode 100644 res/layout/devonecamera.xml delete mode 100644 src/jp/androidgroup/nyartoolkit/hardware/Dev1Camera.java hooks/post-receive -- nyartoolkit-and (nyartoolkit-and) From atsuoigarashi ¡÷ users.sourceforge.jp Wed May 19 15:49:21 2010 From: atsuoigarashi ¡÷ users.sourceforge.jp (atsuoigarashi ¡÷ users.sourceforge.jp) Date: Wed, 19 May 2010 15:49:21 +0900 Subject: [Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, android-1.6, updated. 3b9d4fae384670561bcfa2847df490649bde064b Message-ID: <1274251761.702917.1268.nullmailer@users.sourceforge.jp> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to "nyartoolkit-and" repository containing the "nyartoolkit-and" project. The branch, android-1.6 has been updated via 3b9d4fae384670561bcfa2847df490649bde064b (commit) via 3025deff413b77f96263cae041049b5373b20767 (commit) via 50cf42bf4b42639d7c3f4b49f6e559711e520c1e (commit) from 4e44567d4225c0ffcb416c4410ea5219f88abdba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3b9d4fae384670561bcfa2847df490649bde064b Author: Atsuo Igarashi Date: Wed May 19 14:44:11 2010 +0900 Move loading message to outside of a loop. Signed-off-by: Atsuo Igarashi commit 3025deff413b77f96263cae041049b5373b20767 Author: Atsuo Igarashi Date: Wed May 19 12:06:01 2010 +0900 Fix of closing failure for N1Camera. Signed-off-by: Atsuo Igarashi commit 50cf42bf4b42639d7c3f4b49f6e559711e520c1e Author: Atsuo Igarashi Date: Tue May 18 20:37:40 2010 +0900 Fix of start-up failure after first launch. Signed-off-by: Atsuo Igarashi ----------------------------------------------------------------------- Summary of changes: src/jp/androidgroup/nyartoolkit/ModelRenderer.java | 20 +++++++------- .../nyartoolkit/NyARToolkitAndroidActivity.java | 27 +------------------ .../nyartoolkit/hardware/N1Camera.java | 1 + 3 files changed, 13 insertions(+), 35 deletions(-) hooks/post-receive -- nyartoolkit-and (nyartoolkit-and) From atsuoigarashi ¡÷ users.sourceforge.jp Thu May 27 15:22:22 2010 From: atsuoigarashi ¡÷ users.sourceforge.jp (atsuoigarashi ¡÷ users.sourceforge.jp) Date: Thu, 27 May 2010 15:22:22 +0900 Subject: [Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, master, updated. 834c0b21888319ad847576c1f0388ba8d60ff8c7 Message-ID: <1274941342.250905.20586.nullmailer@users.sourceforge.jp> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to "nyartoolkit-and" repository containing the "nyartoolkit-and" project. The branch, master has been updated via 834c0b21888319ad847576c1f0388ba8d60ff8c7 (commit) from a2776c5c6f8415ef91c94c35d3b954afbef6a427 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 834c0b21888319ad847576c1f0388ba8d60ff8c7 Author: nyatla Date: Thu May 27 15:31:00 2010 +0900 [bugfix]NyARToolkit +NyIdMarkerDataEncoder_RawBit - encording bag git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk ¡÷ 472 7cac0a50-4618-4814-88d0-24b83990f816 ----------------------------------------------------------------------- Summary of changes: .../data/NyIdMarkerDataEncoder_RawBit.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- nyartoolkit-and (nyartoolkit-and) From atsuoigarashi ¡÷ users.sourceforge.jp Thu May 27 15:28:03 2010 From: atsuoigarashi ¡÷ users.sourceforge.jp (atsuoigarashi ¡÷ users.sourceforge.jp) Date: Thu, 27 May 2010 15:28:03 +0900 Subject: [Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, android-1.6, updated. 6929ad904f58ac81fc5fe6250a5bcd41d09b23bd Message-ID: <1274941683.676816.29319.nullmailer@users.sourceforge.jp> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to "nyartoolkit-and" repository containing the "nyartoolkit-and" project. The branch, android-1.6 has been updated via 6929ad904f58ac81fc5fe6250a5bcd41d09b23bd (commit) via 834c0b21888319ad847576c1f0388ba8d60ff8c7 (commit) from 6f07ee239b1d1f894e6f9c7a700918c45e0ff55b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6929ad904f58ac81fc5fe6250a5bcd41d09b23bd Merge: 6f07ee239b1d1f894e6f9c7a700918c45e0ff55b 834c0b21888319ad847576c1f0388ba8d60ff8c7 Author: Atsuo Igarashi Date: Thu May 27 15:37:17 2010 +0900 Merge branch 'master' into android-1.6 ----------------------------------------------------------------------- Summary of changes: .../data/NyIdMarkerDataEncoder_RawBit.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- nyartoolkit-and (nyartoolkit-and)