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

279 Commits

Author SHA1 Message Date
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