Commit Graph

493 Commits

Author SHA1 Message Date
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
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
Huabing.Xu 8e51377f2d fix primitive draw error 2014-08-29 16:00:04 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
yangxiao 18a0f34c5c Merge branch 'newcode' into billboard 2014-08-29 10:12:00 +08:00
Huabing.Xu 528f4b5c0c fix TextureAtlas drawNumberofQuads bug 2014-08-29 10:06:44 +08:00
songchengjiang e6f055f3fd calculated Z in View
Transparent Render
2014-08-28 19:22:01 +08:00
yangxiao c5a152708d clear transparent queue 2014-08-28 13:35:32 +08:00
yangxiao fdcef01244 remove v_normal when no lights 2014-08-28 13:04:49 +08:00
Huabing.Xu 08006aa47a Merge branch 'v3' into v3_trianglesCommand 2014-08-28 10:56:38 +08:00
yangxiao 52b2b1d2cb transparent render queue 2014-08-28 10:53:57 +08:00
songchengjiang 014ba0d12e Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new 2014-08-28 10:17:32 +08:00
songchengjiang 5067741140 Deleted Plane Model 2014-08-28 10:16:15 +08:00
Huabing.Xu bdf92cfbd4 Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched 2014-08-28 09:58:39 +08:00
yangxiao d0943afb62 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-28 09:24:04 +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
songchengjiang 365c57bc2b replaced Light Shader by optimized Light Shader 2014-08-27 23:40:49 +08:00
songchengjiang 26dc7de802 Repaired Light Shader BUG On ios 2014-08-27 21:03:52 +08:00
songchengjiang 72773a806c decompose Light Struct 2014-08-27 19:12:49 +08:00
Huabing.Xu c627affa5e add triangles command, make quad command inherit from triangles command 2014-08-27 18:39:49 +08:00
yangxiao a71f42c817 add transparent queue 2014-08-27 17:53:46 +08:00
songchengjiang 731d1165c3 Spot Light Shader optimization 2014-08-27 17:09:20 +08:00
Huabing.Xu 91e332c253 dynamic update index for quad command 2014-08-27 16:43:14 +08:00
songchengjiang 682bcf9755 Tab Format 2014-08-27 16:28:53 +08:00
songchengjiang 53ad652463 Light Shader optimization 2014-08-27 16:26:01 +08:00
Huabing.Xu c4ecff9804 temp backup 2014-08-27 14:54:35 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
yangxiao 26f7345693 2d cull only for default camera 2014-08-27 12:09:23 +08:00
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
yangxiao 65b0cca132 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-26 14:37:56 +08:00
songchengjiang 3369bb7e51 Replaced Tab Format 2014-08-26 14:25:01 +08:00
songchengjiang cf964d62de Light Shader optimization 2014-08-26 14:18:22 +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
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
minggo 0701fe1dfb Merge pull request #7853 from super626/v3
Better reskin model support
2014-08-22 19:18:47 +08:00
yangxiao 1db3d14896 reset bone number to 60, put test in alphabetical order 2014-08-22 16:06:36 +08:00
yangxiao 6ff2aa2755 change skin joint count to 40 2014-08-22 15:00:34 +08:00
lvlong d00bcbccb0 add texture coord2-7 2014-08-21 18:14:24 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
songchengjiang e42eb950a3 Name modification 2014-08-21 11:33:00 +08:00
songchengjiang 5bad6e216b Added No Normal Shader 2014-08-21 10:33:16 +08:00
yangxiao bd4aec4bcd support multi-attribs 2014-08-20 18:20:19 +08:00
songchengjiang 8b5bd3dbb6 Repaired the errors of Shader PassValue On Android
Light modification
2014-08-20 16:20:22 +08:00
songchengjiang 58abc4c08f Light Shader modification for Android 2014-08-19 19:24:19 +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
songchengjiang 680f089ae1 Shader: Light struct modification 2014-08-19 13:54:30 +08:00
lvlong 43bc54b134 delete empty line 2014-08-18 20:28:59 +08:00
songchengjiang 9603366fcb Fixed Android compiled Problem 2014-08-18 18:05:13 +08:00
lvlong 7311d5139b add VERTEX_ATTRIB_TEX_COORD1 2014-08-18 18:02:58 +08:00
songchengjiang 10afb9b9af Finished Point Light
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
songchengjiang 9b3a02f350 Added Light Test
Added Point Light
2014-08-17 21:33:33 +08:00
songchengjiang def3f8220b Fixed GLProgram 2014-08-15 19:24:06 +08:00
songchengjiang 2b1efc59cb GLProgram Added Light Shader
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
Huabing.Xu 5e7b75c5c7 fix android background and foreground crash for primitive 2014-08-15 14:05:17 +08:00
yangxiao 6ce3b5c20a add mirror test 2014-08-13 17:38:16 +08:00
Huabing.Xu 6cf2e7d091 add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
Huabing.Xu 1145859d38 remove commented codes 2014-08-12 11:44:06 +08:00
Huabing.Xu c1a71453d5 Merge branch 'v3_renderPrimitive' into v3 2014-08-11 14:39:16 +08:00
Huabing.Xu be4bcf7c36 add init value for flag 2014-08-08 13:47:50 +08:00
Huabing.Xu e7e94ffe70 add const constrain for getVertexData() and getIndexData() 2014-08-07 17:59:36 +08:00
Huabing.Xu 274140fbf8 linux work now 2014-08-07 02:35:04 -07:00
Huabing.Xu 9891f438ba change copyright 2014-08-07 15:53:20 +08:00
Huabing.Xu ba2ae6826c Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive 2014-08-07 15:36:41 +08:00
Huabing.Xu 9978065d00 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive 2014-08-07 15:13:47 +08:00
Huabing.Xu 16842b4a69 android work now, add shadowBuffer to recreate VBO 2014-08-07 14:15:49 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
Huabing.Xu 64c2ede765 IOS work now
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
Huabing.Xu b1954ef516 clean up primitive code 2014-08-05 17:49:35 +08:00
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
Huabing.Xu 7fbd81aeca add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
Huabing.Xu 95a8b23d64 fix draw bug in primitive when using indices 2014-08-04 17:56:56 +08:00
Huabing.Xu a0d1b0dad8 allow null index buffer when create primitive 2014-08-04 17:21:23 +08:00
Huabing.Xu 2dca0a4809 remove IndexData class 2014-08-04 17:00:08 +08:00
Huabing.Xu bbf11f5d06 refactor vertex data
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
Huabing.Xu f269d7345e original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
Huabing.Xu 99eed6a0be finish index data 2014-07-30 15:51:41 +08:00
Huabing.Xu 23406c6463 Merge branch 'v3' into v3_renderPrimitive
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-07-30 15:09:25 +08:00
boyu0 85b9765b8f Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha() 2014-07-28 10:38:22 +08:00
boyu0 34a8d26124 Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image. 2014-07-25 18:19:04 +08:00
Huabing.Xu 68894e622f add indexData 2014-07-25 11:58:54 +08:00
Huabing.Xu a4cd61f30a compiles OK: raw version of vertex Index buffer, half version of vertex data 2014-07-25 09:58:24 +08:00
Huabing.Xu b281c38c20 init version of VertexIndexBuffer 2014-07-23 09:20:33 +08:00
Sergey 59cbc153d4 Copyright & small fixes 2014-07-22 15:49:38 +04:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
Huabing.Xu 952ca0eb75 add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +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
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
minggo 0f7968de89 Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
yangxiao e9d3bc1b76 remove unused code 2014-07-08 13:36:22 +08:00
yangxiao b19ca902ce Merge branch 'newcode' into v3 2014-07-08 11:19:26 +08:00
Huabing.Xu 9fb85e303f change the logic of texture loading 2014-07-08 10:08:02 +08:00
Huabing.Xu d935b5db38 roll back initWithImage logic 2014-07-07 17:35:05 +08:00
yangxiao 4304d740b4 delete call back 2014-07-04 17:22:39 +08:00
yangxiao 0af286c3be fix android background to foreground 2014-07-04 16:10:43 +08:00
yangxiao d2cd2449d8 adjust code 2014-07-04 10:42:02 +08:00
yangxiao 05d20d59d4 change position attributes to vec3 2014-07-04 09:25:06 +08:00
boyu0 6db8ec8aad fix crash when load pvr bgra8888 image in android. 2014-06-30 20:58:26 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
minggo 7f28e81d09 Merge pull request #7226 from super626/v3
Animation3D
2014-06-29 16:41:13 +08:00
yangxiao fd41f33165 unused code 2014-06-27 17:21:39 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
Huabing.Xu 7254977358 roll back quadcommand 2014-06-27 12:44:19 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
oleksandr.kuznietsov 1fbdbfc8f4 Updated pull request #7065 due to new changes in current branch
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
2014-06-26 13:26:41 +03:00
Huabing.Xu e19ce7054b add comments 2014-06-26 11:21:29 +08:00
yangxiao accf6f91ea render optimization 2014-06-25 17:36:55 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
yangxiao 617ec1dcf9 support vao 2014-06-24 19:45:51 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
yangxiao ace56df74d batch sprite3D rendering 2014-06-24 09:27:10 +08:00
yangxiao c03ac80700 Sprite3D render batch, not finished 2014-06-23 23:58:45 +08:00
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
Timur Losev 196a924f89 - Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the
cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
2014-06-22 20:53:01 +03:00
minggo cdbd3508d4 Merge pull request #7139 from zawasp/uniform_struct
fix warning Uniform is struct, not class.
2014-06-19 20:55:37 +08:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Mircea Rila 69f1bb6193 fix warning Uniform is struct, not class. 2014-06-19 11:46:00 +03:00
minggo 26cca348cb Merge pull request #7085 from super626/v3
Sprite3D animation
2014-06-17 21:05:58 +08:00
Dale Stammen b66269d85d Merge branch 'v3' into wp8-v3-template 2014-06-16 09:11:27 -07:00
yangxiao 452fdc047a Merge branch 'newcode' into v3 2014-06-16 22:36:01 +08:00
yangxiao 36808abb72 simplify shader 2014-06-16 19:23:51 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
minggo 7c789e6a36 Merge pull request #7049 from dabingnn/v3_fixDeleteTexture
fix bug for deleteTexture
2014-06-13 15:26:16 +08:00
Huabing.Xu 4e94eaabed Merge branch 'v3' into v3Animation 2014-06-13 12:06:11 +08:00
Dale Stammen 70f3f0f913 release glTextures before reloading cached textures 2014-06-12 16:31:46 -07:00
Dale Stammen 48404a8fb5 fixed reloading of textures from VolatileTexture cache 2014-06-12 16:31:07 -07:00
Dale Stammen 49a94a20ef added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures 2014-06-12 16:28:38 -07:00
lvlong dbadabb6e9 skin: getPosition() 2014-06-12 18:46:45 +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 9acf8e6253 fix bug for deleteTexture 2014-06-12 15:22:41 +08:00
minggo 5a28ba68b4 Merge pull request #7031 from sachingarg05/GLProgramNoAbort
GLProgram should not abort() if shader compilation fails, returning false is better.
2014-06-12 15:03:29 +08:00
Dhilan007 d755b7ffcb issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file. 2014-06-12 11:21:42 +08:00
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
yangxiao 5b05ab6353 fix rendering bug 2014-06-11 14:05:35 +08:00
Sachin Garg 8ba4c7a083 GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device). 2014-06-10 17:59:15 +05:30
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
vision ae16c88538 Save the bound texture unit so that the sampler can be updated dynamiclly. 2014-06-09 10:58:28 +08:00
yangxiao 0c95fe1fbd animation test 2014-06-06 19:12:08 +08:00
yangxiao ed8f8a9cad sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00
vision 860057c307 Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories. 2014-06-05 10:58:27 +08:00
vision c90f2b3251 remove unused codes in CCTexture2D 2014-06-05 10:09:36 +08:00
yangxiao 54caf26a57 animation3d 2014-06-04 18:17:09 +08:00
Huabing.Xu 41d19007eb Merge branch 'v3.1hotfix' into v3
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
Dhilan007 e1bb1c62c0 [hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-29 10:26:07 +08:00
Huabing.Xu 99d1ccf41e remove foreground event listener when GLProgramState is deleted 2014-05-28 16:51:33 +08:00
Huabing.Xu 2084fc4ddc using lambda function instead of member function 2014-05-28 15:50:37 +08:00
Huabing.Xu 30f4f256d8 fix background/forground of Sprite3D on android platform 2014-05-28 15:16:00 +08:00