songchengjiang
96e6595e95
Added getInverseViewMatrix
2014-08-29 10:42:02 +08:00
yangxiao
18a0f34c5c
Merge branch 'newcode' into billboard
2014-08-29 10:12:00 +08:00
songchengjiang
06e3eb955f
repaired BillBoard Depth Test
2014-08-29 09:30:59 +08:00
songchengjiang
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
yangxiao
a3dd4e101a
animation transition
2014-08-28 18:53:15 +08:00
minggo
50a2cb2b86
remove unneeded includes
2014-08-28 17:32:23 +08:00
minggo
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
yangxiao
16ab05a8cf
sequence3d
2014-08-28 13:47:17 +08:00
lvlong
a05d50d66e
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-28 12:02:33 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
yangxiao
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
lvlong
e05f6bc874
modify for compress
2014-08-27 18:44:31 +08:00
yangxiao
8cb3edf91f
merge cocos light work
2014-08-27 14:53:39 +08:00
yangxiao
fdc0fad935
tmp work
2014-08-27 14:46:24 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
yangxiao
8a38ce10be
first version billboard
2014-08-26 15:07:37 +08:00
yangxiao
7ff75fb397
remove warning
2014-08-26 14:19:08 +08:00
yangxiao
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
songchengjiang
1a1ccda3ed
repaired Action BUG
2014-08-25 13:58:15 +08:00
yangxiao
c7f7623320
reserve animation size
2014-08-25 11:30:34 +08:00
yangxiao
3a0d63caa6
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 14:55:11 +08:00
yangxiao
a102946d35
android and linux
2014-08-22 14:54:26 +08:00
XiaoYang
e4737f9070
Merge pull request #112 from liuliang2004/Meshv3
...
Modify project file
2014-08-22 14:46:46 +08:00
yangxiao
39cc03173b
remove unused variable
2014-08-22 14:43:48 +08:00
liuliang
c7c091e4b6
Modify project file
2014-08-22 14:32:27 +08:00
yangxiao
81dbb0bca4
add comment
2014-08-22 14:02:51 +08:00
yangxiao
d90572fc10
engine refactor hide concept of submesh
2014-08-22 13:52:03 +08:00
yangxiao
7818b28ee3
Merge branch 'newcode' into v3
2014-08-22 13:32:57 +08:00
yangxiao
022b7e3fd3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 13:27:14 +08:00
yangxiao
2d5431353a
engine adjust
2014-08-22 13:25:26 +08:00
pandamicro
bb5e189f30
Fix warning or Bundle3D
2014-08-21 20:02:22 +08:00
lvlong
4ce334c0c3
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-21 18:16:21 +08:00
lvlong
d00bcbccb0
add texture coord2-7
2014-08-21 18:14:24 +08:00
lvlong
7753f4c471
modify assert(0)
2014-08-21 13:30:51 +08:00
songchengjiang
e42eb950a3
Name modification
2014-08-21 11:33:00 +08:00
liuliang
9ee6683569
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-21 11:24:11 +08:00
liuliang
082689971d
Modify the model resolution
2014-08-21 11:23:31 +08:00
lvlong
1f349cb3fe
fix binary load bug.
2014-08-21 10:38:33 +08:00
songchengjiang
5bad6e216b
Added No Normal Shader
2014-08-21 10:33:16 +08:00
yangxiao
3a69fc9b14
rename ModelDataNode to ModelData
2014-08-20 19:19:49 +08:00
yangxiao
fcf4d79b06
setGLProgramState support
2014-08-20 19:01:04 +08:00
yangxiao
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
songchengjiang
3a1c0583fb
optimization
2014-08-20 16:41:45 +08:00
songchengjiang
8b5bd3dbb6
Repaired the errors of Shader PassValue On Android
...
Light modification
2014-08-20 16:20:22 +08:00
yangxiao
9a6181fdca
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-20 15:02:26 +08:00
yangxiao
79857c471b
multiply Mesh attrib support
2014-08-20 15:02:16 +08:00
XiaoYang
82c2304e64
Merge pull request #105 from lvlonggame/merge-bundle
...
format code
2014-08-20 14:23:40 +08:00
lvlong
8e0d80d4c6
Merge branch 'newcode' into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-20 14:00:25 +08:00
liuliang
df272ee7f5
Modify the parsing
2014-08-20 13:53:15 +08:00
liuliang
a27a420a91
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCSprite3D.cpp
2014-08-20 11:45:48 +08:00
liuliang
c6cd9b029d
Modify the parsing
2014-08-20 11:40:04 +08:00
lvlong
93ee44c912
format code
2014-08-20 10:24:46 +08:00
songchengjiang
4cf1c6a47c
deleted redundant code
...
Replace Tab Format
2014-08-19 16:32:49 +08:00
songchengjiang
d9bf2c2b7e
Finished Light And Test
2014-08-19 15:51:30 +08:00
yangxiao
54423efe9f
fix reskin
2014-08-19 15:25:00 +08:00
XiaoYang
9f444b7010
Merge pull request #104 from liuliang2004/Meshv3
...
Modification is compatible with the old model
2014-08-19 14:32:05 +08:00
liuliang
9d3bab3810
Modification is compatible with the old model
2014-08-19 14:03:41 +08:00
songchengjiang
680f089ae1
Shader: Light struct modification
2014-08-19 13:54:30 +08:00
yangxiao
5cf30a363c
remove unused code
2014-08-19 13:54:06 +08:00
yangxiao
289b04a2ae
merge cocos2d
2014-08-19 13:19:42 +08:00
yangxiao
b2d43a4167
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-19 11:56:21 +08:00
yangxiao
f2729c7ef2
cache work
2014-08-19 11:56:09 +08:00
lvlong
2b70cf3dd8
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 20:22:56 +08:00
lvlong
9c25139895
animation & animations
2014-08-18 20:22:18 +08:00
yangxiao
d5df1f3ab2
forget return true
2014-08-18 18:56:01 +08:00
yangxiao
d6ed1af1f7
compute submesh aabb error
2014-08-18 18:34:18 +08:00
songchengjiang
9603366fcb
Fixed Android compiled Problem
2014-08-18 18:05:13 +08:00
yangxiao
b9c28dd8d7
return true
2014-08-18 17:57:14 +08:00
yangxiao
2f600f8af4
fix bundle mac
2014-08-18 17:52:27 +08:00
liuliang
ee4e4ca455
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-18 17:39:28 +08:00
liuliang
e151b207a4
Modified binary load model, compatible with the old format
2014-08-18 17:31:04 +08:00
songchengjiang
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
yangxiao
01c1691a4f
deal aabb
2014-08-18 17:02:13 +08:00
samuele3hu
91fd40dd3a
Add a newline for some files
2014-08-18 15:27:54 +08:00
samuele3hu
7596a8a831
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-18 14:58:57 +08:00
yangxiao
30ce92f677
obj work, make code clean
2014-08-18 14:16:34 +08:00
yangxiao
219404bd7d
change tex param
2014-08-18 11:42:41 +08:00
yangxiao
cd4da73beb
merge, obj not work now
2014-08-18 11:28:57 +08:00
yangxiao
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
liuliang
2f816aea2c
Modified load static model
2014-08-18 10:32:23 +08:00
samuele3hu
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
yangxiao
1e961e00b7
obj loader work
2014-08-17 22:49:53 +08:00
lvlong
da63032a46
draw sub mesh bug
2014-08-16 20:38:00 +08:00
lvlong
b1c9fb99e3
animation is ok.
2014-08-16 19:51:59 +08:00
lvlong
9c41b1a826
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 18:20:29 +08:00
lvlong
4f4b8dc25c
for testing
2014-08-16 18:19:41 +08:00
yangxiao
fb1b7ca3bb
fix skeleton
2014-08-16 18:18:15 +08:00
lvlong
24bb827ef4
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 16:58:02 +08:00
yangxiao
7159914248
old model work
2014-08-16 16:56:04 +08:00
lvlong
4dd9102e87
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 15:45:28 +08:00
lvlong
5b59b8a987
fixed some loading problems.
2014-08-16 15:40:00 +08:00
yangxiao
a11ac316bf
create model
2014-08-16 14:52:44 +08:00
yangxiao
8a5bbabe21
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:49:47 +08:00
yangxiao
47d15a4aa1
load
2014-08-16 14:49:38 +08:00
lvlong
84dcff2f7a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-16 14:44:41 +08:00
lvlong
d60a7734b1
merge bundle.
2014-08-16 14:28:15 +08:00
yangxiao
ae361c91cd
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:16:27 +08:00
yangxiao
ef2db59825
modify render
2014-08-16 14:16:17 +08:00
liuliang
ae79603791
Modify the material parsing
2014-08-16 14:14:37 +08:00
lvlong
f8f416cd3c
merge bundle
2014-08-16 11:12:26 +08:00
liuliang
21dcc51c0f
Modify the material parsing
2014-08-16 10:41:42 +08:00
liuliang
1b92409d78
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-16 09:59:25 +08:00
liuliang
f35dd346eb
Modify Analytic
2014-08-16 09:59:08 +08:00
yangxiao
3ab7c6b952
create from bundle data
2014-08-15 20:52:45 +08:00
songchengjiang
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
liuliang
b4a20feabc
Parse the data file
2014-08-15 18:27:28 +08:00
yangxiao
9ab48bd71e
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 18:27:03 +08:00
yangxiao
a740841f5e
submeshid
2014-08-15 18:21:58 +08:00
liuliang
0db924d7cd
Parse the data file
2014-08-15 18:20:37 +08:00
liuliang
c533f66b9f
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-15 17:46:40 +08:00
liuliang
b5665a4723
Modify the binary parsing
2014-08-15 17:46:21 +08:00
liuliang
ab80c5026d
Modify the binary parsing
2014-08-15 17:45:37 +08:00
yangxiao
d09695b118
create from data
2014-08-15 17:41:04 +08:00
yangxiao
6f0fc48e8e
merge cocos2d
2014-08-15 16:36:17 +08:00
yangxiao
e2312bd353
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 15:55:32 +08:00
yangxiao
42916bcbe6
newmodel
2014-08-15 15:55:21 +08:00
liuliang
4c8b24d113
Modify the binary parsing
2014-08-15 15:32:15 +08:00
yangxiao
88bb1482e3
newmodel
2014-08-15 14:58:30 +08:00
songchengjiang
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
yangxiao
fdcec51cf4
struct for newmodel
2014-08-15 13:03:53 +08:00
songchengjiang
7ed40a8051
Added Light
2014-08-15 10:32:07 +08:00
yangxiao
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
yangxiao
84bb22780a
merge cocos2d
2014-08-14 17:16:20 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
lvlong
dbf58b8873
modify function name and add default to switch block.
2014-08-14 13:15:37 +08:00
yangxiao
f6da3b76b5
use renderer passed instead of get from global
2014-08-14 10:29:17 +08:00
yangxiao
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
Huabing.Xu
cb8c80de0d
export MeshSkin as CC_DLL
2014-08-12 14:41:25 +08:00
lvlong
f191bebe72
optimize Sprite3D get aabb.
2014-08-12 13:45:06 +08:00
lvlong
c592ac4248
for pull request modify!!
2014-08-11 10:40:34 +08:00
yangxiao
53c143c679
remove normalize
2014-08-09 00:02:40 +08:00
yangxiao
73a0b7701d
remove normalize
2014-08-09 00:02:19 +08:00
lvlong
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
lvlong
28769c9b15
add obb sample
2014-08-08 11:16:33 +08:00
yangxiao
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
yangxiao
8ffd0fe16e
spelling error
2014-08-04 16:07:16 +08:00
yangxiao
4084fdc461
add new file to cmake
2014-08-04 15:49:12 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
yangxiao
52d3c4461f
adjust
2014-07-31 20:20:29 +08:00
yangxiao
7562214c63
adjust
2014-07-31 20:19:43 +08:00
yangxiao
342dc05890
adjust
2014-07-31 20:17:51 +08:00
yangxiao
4aec1d37c8
code adjust
2014-07-31 20:14:43 +08:00
yangxiao
49052ab28d
code adjust
2014-07-31 18:42:58 +08:00
yangxiao
ca0afcfa92
add Quaternion::ZERO
2014-07-31 18:36:30 +08:00
yangxiao
17304b4775
add comment
2014-07-31 18:28:52 +08:00
yangxiao
780914687e
code style adjust according minggo
2014-07-31 18:14:01 +08:00
yangxiao
38c86f7697
skeleton retain
2014-07-31 10:57:19 +08:00
yangxiao
2c29560514
add CC_DLL
2014-07-31 10:28:39 +08:00
yangxiao
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +08:00
yangxiao
9f1cfbfca5
add skeleton and refactor skin
2014-07-30 18:32:34 +08:00
yangxiao
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +08:00
minggo
7ba4f2ed5e
Merge pull request #7526 from chenguangqi/v3
...
fixed compile error.
2014-07-21 13:54:31 +08:00
陈广歧
8b4953bbfc
fixed compile error.
...
```bash
# compile for android.
$ ./build_native.py
```
Error message as follow:
```
ssize_tjni/../../cocos2d/cocos/./3d/CCBundleReader.cpp:94:23: error: return type of out-of-line
definition of 'cocos2d::BundleReader::tell' differs from that in the declaration
ssize_t BundleReader::tell()
^
jni/../../cocos2d/cocos/./3d/CCBundleReader.h:90:14: note: previous declaration is here
long int tell();
^
1 error generated.
```
2014-07-19 18:29:52 +08:00
Huabing.Xu
3c6e87d34e
Merge branch 'v3' into v3_dll
...
Conflicts:
cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
Huabing.Xu
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
Huabing.Xu
ed690114d7
add CC_DLL for mesh, lua works now
2014-07-15 15:19:34 +08:00
Huabing.Xu
dbd3fce0a5
windows dll version of cpp-tests works
2014-07-15 13:54:08 +08:00
Huabing.Xu
60334e8b3e
add CC_DLL for 3d
2014-07-15 09:45:43 +08:00
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
minggo
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
yangxiao
fd8541e32d
rename Bone to Bone3D
2014-07-11 10:17:36 +08:00
minggo
c7856b21fd
Merge pull request #7366 from Dhilan007/v3-fixed-warn
...
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
yangxiao
0b4c6b7f7a
comment
2014-07-10 11:05:48 +08:00
yangxiao
d7b88e86ff
add comment
2014-07-10 10:56:52 +08:00
yangxiao
ef1f6892e1
deprecated Mesh::create use less parameter ones instead
2014-07-10 10:54:37 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
yangxiao
dbea3a4d04
deprecated functions
2014-07-09 14:07:33 +08:00
yangxiao
0c28106b48
init playreverse
2014-07-09 09:59:18 +08:00
yangxiao
90b6841e25
adjust api according feedback
2014-07-09 09:53:15 +08:00
lvlong
6de3309f90
have two GL_UNSIGNED_INT delete one
2014-07-08 20:13:57 +08:00
yangxiao
8b482fdfcd
remove gl_fixed
2014-07-08 11:02:00 +08:00
lvlong
e315ef527a
parseGLType bug
2014-07-07 17:22:46 +08:00
lvlong
a48d33ce31
Merge branch 'newcode' into v3
2014-07-07 17:06:37 +08:00
lvlong
0a9e96bfdf
modify Bundle3D::parseGLType add other type
2014-07-07 09:16:08 +08:00
yangxiao
d2cd2449d8
adjust code
2014-07-04 10:42:02 +08:00
lvlong
ff908d771a
add a space to test pushing
2014-07-01 11:26:29 +08:00
lvlong
e44dee6607
merge
2014-07-01 11:08:37 +08:00
lvlong
e3cc234cfb
Revert "modify BundleReader and the version read"
...
This reverts commit 660c80fac7
.
2014-07-01 11:05:48 +08:00
lvlong
660c80fac7
modify BundleReader and the version read
2014-07-01 10:45:01 +08:00
lvlong
c1afd7133a
modify BundleReader and the version read
2014-07-01 09:30:14 +08:00
lvlong
df7ab50062
modify BundleReader and the version read
2014-07-01 09:26:21 +08:00
minggo
36e864552e
Merge pull request #7253 from super626/v3
...
c3b loader bug
2014-06-30 17:33:13 +08:00
lvlong
701a2b60c2
sub-version > 0
2014-06-30 17:14:47 +08:00
lvlong
42aaf38468
modify reader-64bit bug
2014-06-30 17:10:07 +08:00
Dhilan007
26f3445311
add missing files for the projects
2014-06-30 17:07:55 +08:00
yangxiao
58e9fcc741
remove unused code
2014-06-27 22:11:29 +08:00
Huabing.Xu
9126819941
linux work now for bundleReader
2014-06-27 01:22:41 -07:00
lvlong
9d9c1eb51a
change the tab in code to space
2014-06-27 14:42:48 +08:00
lvlong
e6e9c6caa9
modify bug about parent index is -1
2014-06-27 09:32:09 +08:00
yangxiao
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
yangxiao
2175b25730
fix animation bug
2014-06-26 21:58:26 +08:00