lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |
lvlong
|
1ca69d2689
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2014-06-12 16:28:36 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
Huabing.Xu
|
e70918e325
|
extract Animation3DData
|
2014-06-12 14:03:33 +08:00 |
lvlong
|
9fe7c1a9da
|
loader
|
2014-06-12 10:01:54 +08:00 |
Huabing.Xu
|
f1bc0971aa
|
extract mesh data, material data, skin data into a header file for reuse in converter and engine
|
2014-06-11 18:24:14 +08:00 |
yangxiao
|
d76525ced1
|
use my data temp
|
2014-06-11 14:20:14 +08:00 |
Huabing.Xu
|
9ee6f1f3e0
|
adjust shader uniform settings
use a new fake data for testing
|
2014-06-11 12:07:25 +08:00 |
yangxiao
|
cddad40ec0
|
make it rotate
|
2014-06-11 10:01:52 +08:00 |
yangxiao
|
6d09b50699
|
animation bug
|
2014-06-10 19:53:06 +08:00 |
yangxiao
|
a991940268
|
debug Sprite3D with .c3t
|
2014-06-09 18:37:58 +08:00 |
yangxiao
|
0c95fe1fbd
|
animation test
|
2014-06-06 19:12:08 +08:00 |
yangxiao
|
87c7e2b0e9
|
worldmat cache in bone
|
2014-06-05 18:21:25 +08:00 |
yangxiao
|
ed8f8a9cad
|
sprite3d with skin render&bundle
|
2014-06-05 16:36:01 +08:00 |