atsuo****@users*****
atsuo****@users*****
2010年 5月 11日 (火) 18:44:39 JST
ForkThis 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 <atsuo****@gmail*****>
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 <atsuo****@gmail*****>
-----------------------------------------------------------------------
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)