Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,181 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

349 Commits

Author SHA1 Message Date
minggo 2f04e7a6ac Merge pull request #10239 from super626/v3 
fix bug on uniform cache
 2015-01-29 10:13:11 +08:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Huabing.Xu c8a783e4ac use const auto& 2015-01-28 10:59:29 +08:00
Huabing.Xu 5f5c00b7d2 remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE 2015-01-28 10:32:22 +08:00
Nite Luo be6ca1b6d2 add force depth write 2015-01-27 17:05:51 -08:00
Nite Luo c364323bbc Not using static value to save previous render state since other commands like custom command could change them 2015-01-27 16:26:31 -08:00
Nite Luo 8f539a0107 Make PositionZ independent from global Z 2015-01-27 15:41:58 -08:00
Nite Luo b89e255099 Finish organize the render queue 2015-01-27 14:41:16 -08:00
Nite Luo 78d8a694c8 Merge branch 'v3' into v3_fixRenderer 
Conflicts:
	cocos/renderer/CCRenderer.cpp
	cocos/renderer/CCRenderer.h
 2015-01-27 11:23:48 -08:00
Nite Luo 3c635d044e Add Queue_count for render queues 2015-01-27 11:12:51 -08:00
yangxiao 220b34d105 Merge branch 'newcode' into v3 2015-01-27 16:35:54 +08:00
yangxiao fad8f9f1da format 2015-01-27 16:31:15 +08:00
yangxiao af8a6c16b1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-27 16:24:07 +08:00
lvlong 57970da398 Do some optimize 2015-01-27 15:50:05 +08:00
Huabing.Xu a38b210803 add depth in renderCommand 
refactor rendering order of renderQueue
 2015-01-27 14:29:09 +08:00
Nite Luo 15adaf2877 save/restore render state 2015-01-26 16:37:11 -08:00
lvlong bb419719aa fix bug: about caching uniform. 2015-01-26 18:40:00 +08:00
Huabing.Xu 285a280bb4 enable attribute cache as before 2015-01-23 18:19:25 +08:00
Huabing.Xu 421310f3a8 Merge branch 'v3' into v3_fixCrashNoVAO 
Conflicts:
	cocos/renderer/ccGLStateCache.cpp
 2015-01-23 14:50:21 +08:00
Huabing.Xu 550fc44187 disbale cache for s_attributeFlags 2015-01-23 14:32:36 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
Huabing.Xu 0ca47ab40f fix crash for textureAtlas 2015-01-21 14:14:53 +08:00
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32 
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
 2015-01-20 18:09:11 +08:00
Huabing.Xu 79eee9b145 fix crash on windows 2015-01-20 16:50:51 +08:00
Dale Stammen 86567afa5f added kShaderType_PositionColor_noMVP_GrayScale for WP8 to support UIScale9Sprite 2015-01-16 15:02:05 -08:00
Dale Stammen 2c6ec3eebe added ccShader_PositionColorPointsize-no-gl_PointSize.vert for WP8.1 2015-01-16 11:19:00 -08:00
Nite Luo d43a8cf9ca Move setDepthTest to renderer 2015-01-15 16:54:27 -08:00
Nite Luo 9848a8133b Fix Vertex Z issue 2015-01-15 16:41:07 -08:00
Nite Luo 9d7604cab7 undeprecate init for custom command 2015-01-15 15:56:44 -08:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
minggo 5459149279 Merge pull request #9969 from huangshiwu/pointSize 
DrawNode enable draw different size points
 2015-01-14 11:38:31 +08:00
huangshiwu 9fd000895c modify file copyright information 2015-01-14 11:20:33 +08:00
Nite Luo 4335328e3d Add support for creating empty sprite3D 2015-01-13 16:41:24 -08:00
huangshiwu fea492ab4f DrawNode enable draw different size points 2015-01-13 22:30:50 +08:00
Nite Luo 45562f3203 optimize based on review commends 2015-01-12 22:52:20 -08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix 
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2015-01-12 20:43:55 -08:00
Nite Luo fee8bc1b28 Remove Transparent Queue, Move transform calculation of Billboard to visit 2015-01-12 18:17:47 -08:00
minggo 74e9fc6382 Merge pull request #9932 from dabingnn/v3_addParamForVertexIndexBufferUsage 
add param for usage in class VertexBuffer and IndexBuffer
 2015-01-12 19:33:18 +08:00
Huabing.Xu 2b79ff1d87 add param for usage in class VertexBuffer and IndexBuffer 2015-01-12 14:59:12 +08:00
Huabing.Xu d5416d8a7a refresh attributes and uniforms in glprogramstate 2015-01-12 14:43:31 +08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
Nite Luo e7480a7efb Enable tansparent queue and create camera rotation demo 2015-01-08 16:30:00 -08:00
Nite Luo b675a2ca61 Turn off Depth Write by default, only 3D opaque object will write to Depth buffer 2015-01-07 16:35:08 -08:00
Huabing.Xu 8dde42b66a code adjust, delay deprecated flag specification 2015-01-05 13:52:22 +08:00
Huabing.Xu 63e6557165 fix GLProgram log crash on windows 2015-01-04 21:51:22 +08:00
minggo 51c89c3a22 Merge pull request #9720 from dabingnn/v3_perf 
V3 perf
 2014-12-31 10:02:59 +08:00
minggo 274d7d2276 Merge pull request #9718 from darkdukey/depthWriteFix 
Disable write to depth buffer for transparent objects
 2014-12-31 10:00:48 +08:00
Nite Luo a68dfa13ec Disable Depth Write for transparent objects 2014-12-30 13:35:29 -08:00