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

452 Commits

Author SHA1 Message Date
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01: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
G17hao 29c4f83fd8 Update CCGroupCommand.cpp 
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
 2015-01-20 19:28:30 +08:00
G17hao ff1731eded Update CCGroupCommand.h 
add a vector container for save unused id.
traversal unordered_map is too slow, use vector to replace it
 2015-01-20 19:27:01 +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
Huabing.Xu c60c3fb2b1 refresh uniforms and attributes when access uniform or attribute table 2014-12-30 18:32:09 +08:00
Huabing.Xu b92802a770 optimise Renderer::fillQuads() 2014-12-30 15:07:50 +08:00
Huabing.Xu 6576c16fe1 optimise QuadCommand::init() 2014-12-30 14:21:33 +08:00
Huabing.Xu 485c72651d exextract updateUniformsAndAttributes 2014-12-30 11:13:14 +08:00
Huabing.Xu 2348e5c247 optimize rendering code 2014-12-29 18:45:55 +08:00
tjunxin 561350c2bc comment line 83 
As known,  _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
 2014-12-18 13:49:54 +08:00
XiaoYang b106b2f7ce Merge pull request #175 from lvlonggame/v3 
fix bug: same model in mirror state cullFace problem.
 2014-12-12 09:52:01 +07:00
lvlong d0ce99413d fix bug: same model in mirror state cullFace problem. 2014-12-11 14:24:26 +08:00
Huabing.Xu 697e1fd75e Merge pull request #9377 from dabingnn/v3.3Perf 
performance improvement
 2014-12-04 21:08:24 +08:00
Huabing.Xu 27ff06b1d2 performance improvement 2014-12-04 18:37:57 +08:00
minggo 7fd037c416 Merge pull request #9359 from super626/v3 
Initialize variable when defined
 2014-12-04 13:40:21 +08:00
tangziwen da8dc13601 avoid the case that "hasAmbient" use before assign 2014-12-03 16:00:52 +08:00
minggo 4e84b4d4f6 Merge pull request #9130 from samael65535/patch-1 
Add shader linking log
 2014-11-26 13:51:15 +08:00
Dale Stammen a5b1faa379 added winrt and wp8 support for EVENT_RENDERER_RECREATED 2014-11-21 10:00:34 -08:00
samael f60b6bbd91 Update CCGLProgram.cpp 
add shader linking log
 2014-11-20 11:41:16 +08:00
samael 26b95d3dae add shader linking log 
add shader linking log
 2014-11-15 12:15:56 +08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
Dale Stammen 32a5a2cbb8 Merge branch 'v3' into wp8-shader-fix 2014-10-28 22:08:04 -07:00
Dale Stammen ee83a8a6e0 disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:57:40 -07:00
minggo f1ac0df761 Merge pull request #8921 from TimothyZhang/fix-program-cache-add 
release old program with the same key before adding glprogram
 2014-10-27 11:22:00 +08:00
minggo 7c09787324 Merge pull request #8925 from Teivaz/v3 
* [WP8] Enabled GLProgramState restoring on render recreated
 2014-10-27 11:13:18 +08:00
Timothy Zhang d42f8cac65 replace tab with 4 spaces 2014-10-27 10:02:28 +08:00
Timothy Zhang 80230258d6 replace tab with 4 spaces 2014-10-27 09:59:47 +08:00
Dale Stammen 40e49cdc12 Merge branch 'v3' into wp8.1-universal 2014-10-24 07:08:55 -07:00
minggo ab365b9498 Merge pull request #8892 from dumganhar/rm-uthash 
Removes uthash in CCGLProgram,uses std::unordered_map instead
 2014-10-24 21:50:47 +08:00
teivaz bfe83e5624 * [WP8] Enabled GLProgramState restoring on render recreated 2014-10-24 16:00:08 +03:00
Timothy Zhang 0fb584ad92 release old program with the same key before adding glprogram 2014-10-24 18:31:00 +08:00
Dale Stammen c0ebee6bc7 gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE 2014-10-23 07:15:22 -07:00
Dale Stammen 14568361aa gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE 2014-10-23 07:14:58 -07:00
Dale Stammen 01fbcfcd31 Windows 8.1 ANGLE reguires vert and frag shaders to use same precision 2014-10-23 07:13:38 -07:00
James Chen 22776dcd88 Removes uthash in CCGLProgram 2014-10-21 17:29:24 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
minggo 1fba616ba7 Merge pull request #8859 from super626/v3 
3d shader optimize
 2014-10-20 14:12:54 +08:00
yangxiao 30733cf35e shader optimize 2014-10-20 13:41:26 +08:00
Eric Zhong fdd20b4d73 fix memory leak when reload texture 2014-10-20 10:43:18 +08:00
minggo 91ef975c57 Merge pull request #8667 from super626/v3 
Modify return type of Mesh::getAABB,  add Animate3D::create from start frame and end frame
 2014-10-17 13:40:53 +08:00
yangxiao 4991b2308d fix warning 2014-10-17 11:58:12 +08:00
minggo a4d31262ac Merge pull request #8735 from dabingnn/v3_OptimizeQuadCommand 
V3 optimize quad command
 2014-10-16 16:01:37 +08:00
Huabing.Xu 97aa69a7c2 works on no VAO devices 2014-10-16 15:33:31 +08:00
Huabing.Xu 90030140d5 fix some format problem 2014-10-16 14:56:17 +08:00
Huabing.Xu 93ea1b9078 separate trianglesCommand and QuadCommand 2014-10-16 14:15:29 +08:00
Dale Stammen 21802abe13 added CC_DLL to export VolatileTextureMgr 2014-10-14 14:21:34 -07:00
Dale Stammen 20246d648b check for PixelFormat::DEFAULT 2014-10-14 14:21:02 -07:00
Dale Stammen c28e2c66c5 precompiled shaders for WP8 only 2014-10-14 14:20:32 -07:00
yangxiao d81e4d7a92 fix light uniform array errors, and using shader without light by default fix #8612 2014-10-13 15:17:22 +08:00
Huabing.Xu e69465e428 remove texture unit 4-7, only 0 -3 is reserved 2014-10-10 14:06:37 +08:00
Huabing.Xu f097c76e46 fix compile error for macro redefinition 2014-10-10 14:05:57 +08:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao c335df1071 fix normal flag check error 2014-09-26 16:46:15 +08:00
yangxiao 11a7bf8697 ligthmask to unsigned int 2014-09-26 15:52:04 +08:00
yangxiao db2ff49f26 adjust according to minggo 2014-09-26 14:13:26 +08:00
yangxiao ca9eb3d203 support ambient light without normal & optimaze code 2014-09-25 18:32:33 +08:00
yangxiao 2317720fd2 move uniformnames to cpp 2014-09-25 16:18:55 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
songchengjiang d956148a94 Tab Format 2014-09-23 17:19:27 +08:00
songchengjiang b51dc584d5 Light optimization 2014-09-23 17:08:28 +08:00
songchengjiang 216c40fe9e Modified Light Shader 2014-09-22 18:08:58 +08:00
songchengjiang f052e45c04 Move Light Uniforms into Meshcommand 2014-09-19 10:54:07 +08:00
songchengjiang b9ceccda74 Format 2014-09-18 18:07:20 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
yangxiao 720264fb98 add comment 2014-09-18 12:04:42 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +08:00
yangxiao 8c77130ae0 refactor light compile 2014-09-17 18:58:35 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
Huabing.Xu 34e3e23af5 Fix compile error 2014-09-17 10:35:42 +08:00
Huabing.Xu f702b4e9b3 add draw calls and draw verts for PrimitiveCommand 2014-09-16 12:04:35 +08:00
minggo 34a015895d Merge pull request #8020 from dabingnn/v3_MaterialIDBug 
fix bug for MeshCommand materialID generation
 2014-09-12 17:15:49 +08:00
Huabing.Xu 1571367042 fix bug for MeshCommand materialID generation 2014-09-12 15:43:10 +08:00
yangxiao df9ab144fe light work 2014-09-11 15:46:32 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
Huabing.Xu 73b201b702 roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5 2014-09-05 16:01:17 +08:00
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
Huabing.Xu 6f03e97a6d add trianglesCommand head file to cocos2d 
remove invoking of base class constructor
 2014-09-04 11:20:43 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
songchengjiang 045af3f7a3 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:24:38 +08:00
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +08:00
yangxiao de80d8c344 fix warning 2014-09-02 11:22:01 +08:00
yangxiao 39e33cbf71 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:12:24 +08:00
yangxiao de3921c101 fix render stats bug 2014-09-02 11:12:15 +08:00
Huabing.Xu 57dd8fd4e1 remove commented code 2014-09-01 15:19:02 +08:00
yangxiao c24701ac79 Merge branch 'newcode' into v3 2014-09-01 15:11:27 +08:00
Huabing.Xu dad62ad6df Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/renderer/CCQuadCommand.h
 2014-09-01 14:27:19 +08:00
Huabing.Xu 06eb6c2425 put TrianglesCommand in a seperate file 2014-09-01 11:49:04 +08:00
yangxiao 49e6b098a6 check running scene when checkVisibility 2014-09-01 09:56:05 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00