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

933 Commits

Author SHA1 Message Date
Liam 4d379ed9bd revert ccplane 2015-11-30 14:53:37 +08:00
Liam e0349ae975 update sprite 3d test 2015-11-30 14:48:19 +08:00
XiaoFeng 71871bacf9 Add aabb dirty mark when load from file 2015-11-27 15:53:26 +08:00
XiaoFeng 2d28b78e41 Add 3 missing class export 
Change clearShader logic.
 2015-11-27 14:58:18 +08:00
XiaoFeng a61fe711e2 Update 2015-11-27 14:01:43 +08:00
XiaoFeng f5f09133e6 Change ASSERT to safety mode 2015-11-26 16:49:01 +08:00
XiaoFeng 09606e96cd Add comment for new function 2015-11-25 11:33:24 +08:00
XiaoFeng d0cd640ac8 Update 2015-11-25 11:15:17 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
XiaoFeng 722f20c4b6 Update implement remove condition macro check. 2015-11-24 18:29:58 +08:00
yangxiao 1ac82fa273 fix terrain ray trace bug when there is offset 2015-11-24 15:13:52 +08:00
XiaoFeng eb644ee79f Combine Studio change for 3d components 2015-11-16 15:05:43 +08:00
yangxiao 39a6f1e8f1 char* to string 2015-11-12 18:08:29 +08:00
yangxiao 3016bf696a fix updateVerticesForLOD 2015-11-05 15:18:46 +08:00
yangxiao 16a79ed9df function genMaterial keeps old state block 2015-11-04 11:10:28 +08:00
yangxiao 11f5e6cf96 setGLProgramState should not modify state block 2015-10-29 14:22:13 +08:00
yangxiao a4d67867d7 check light enable or not when switching shader 2015-10-20 15:11:39 +08:00
yangxiao d6eb1b938f correct spot light init value 2015-10-08 11:27:02 +08:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
yangxiao 36d4f5564d merge cocos 2015-09-18 14:08:33 +08:00
pandamicro 3f5df0ccc3 Merge pull request #13647 from super626/motionstreak3d 
Motionstreak3d
 2015-09-18 11:59:33 +08:00
yangxiao 6f1b04fd89 merge cocos 2015-09-18 09:37:26 +08:00
yangxiao 256832d000 replace genGLProgramState to genMaterial 2015-09-17 14:45:16 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
yangxiao fb7ade6578 reset set material 2015-09-16 18:08:23 +08:00
yangxiao b5e69930cd fix shader light parameter 2015-09-16 18:04:52 +08:00
yangxiao d5fab0bd38 merge cocos 2015-09-10 10:44:09 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
yangxiao 153bdb7170 add comment 2015-09-09 11:11:17 +08:00
yangxiao f944750627 add material cache 2015-09-08 15:29:54 +08:00
yangxiao c3ac446f35 resolve conflict 2015-09-07 14:45:09 +08:00
yangxiao 97c59c87ac built in material for sprite3d 2015-09-07 13:59:38 +08:00
songchengjiang addce6c565 add CC_DLL 2015-09-02 15:55:58 +08:00
yangxiao c23805889f add motionstreak3d 2015-09-01 11:02:22 +08:00
yangxiao b6c4f4cf50 add comment 2015-09-01 10:39:14 +08:00
yangxiao 030ab8858d enable depth write for transparent object 2015-08-31 18:34:09 +08:00
yangxiao bc07d7954a fix render state 2015-08-28 23:00:45 +08:00
yangxiao bc2e66d03b add motionstreak3d 2015-08-28 11:40:12 +08:00
yangxiao 7884138dcc disable blend when drawing skybox 2015-08-25 14:32:25 +08:00
yangxiao 7dcc3dd982 Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
yangxiao 8f81267960 skybox is not transparent 2015-08-19 18:25:34 +08:00
pandamicro dbd0b6dd86 Merge pull request #13272 from yangws/bug_21800 
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
 2015-08-12 10:25:30 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +08:00
Vladimir Perminov 7cacdaeaf1 Add getFileExtension to FileUtils 
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.

More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )

And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
 2015-08-05 22:21:16 +03:00
yangxiao fc4c25c51e add comment 2015-08-03 13:30:30 +08:00
yangxiao b6774a5f44 fix warning 2015-08-03 10:27:57 +08:00
yangxiao 929cd4fbfe set default value for _lightDir 2015-08-03 10:12:04 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
pandamicro 00a3d572d1 Merge pull request #12899 from super626/v3 
Animate3D Callback and Bug fix
 2015-08-01 18:24:05 +08:00
jianglong0156 dcda083efa rename the initTerrain to initWithTerrainData 2015-07-31 18:35:47 +08:00
jianglong0156 4439b02a84 rename the init function name 2015-07-31 15:21:54 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +08:00
pandamicro 4cd0ced683 Merge pull request #12805 from super626/animate3d 
fix #11487 animate3d bugs
 2015-07-29 11:09:03 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-07-15 11:13:27 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
yangxiao 8598c5037e fix #11487 animate3d bugs 2015-07-13 16:10:48 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback 
add Animate3DCallbackTest
 2015-07-13 11:43:13 +08:00
songchengjiang a1dd466588 modify Animate3D keyFrameCallback 2015-07-10 15:50:09 +08:00
yangxiao c4587ecda1 if has normal use the shader with normal 2015-07-10 11:44:20 +08:00
songchengjiang a1956e2210 fix issue#9310 issue#10151 issue#12551 2015-07-09 18:05:47 +08:00
yangxiao 97a17cdc8a program created dummy texture instead of empty texture 2015-07-08 17:00:01 +08:00
yangxiao f7cdd7162b adapter according to latest objloader 2015-07-08 15:33:43 +08:00
yangxiao dac84ade0d index to short 2015-07-08 14:03:53 +08:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
Ricardo Quesada ad1fc88fa8 compiles on Xcode 7 2015-07-06 16:30:29 -07:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
pandamicro e7c6ae7b13 Merge pull request #12637 from super626/skybox 
Set Texturecube tex parameter to clamp to edge
 2015-07-02 18:34:38 +08:00
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
yangxiao 52daa2234c add setForce2DQueue 2015-07-01 14:24:22 +08:00
yangxiao f4a81f0e53 optimize draw 2015-06-25 15:14:44 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
yangxiao 77f1af91f9 opt getIntersectionPoint 2015-06-24 15:49:09 +08:00
yangxiao 086b01321c code simplify 2015-06-24 14:10:38 +08:00
yangxiao 7546bfe9af make getChunkByIndex protected 2015-06-24 10:56:46 +08:00
yangxiao d1baacdf8a fix terrain ray trace 2015-06-24 10:49:18 +08:00
yangxiao bfdb06e31b add empty line 2015-06-23 18:31:20 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
XiaoYang 59e6b6fdc2 Merge pull request #352 from tangziwen/v3 
Using ray-triangle intersect test instead of the newton method
 2015-06-23 16:30:18 +08:00
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
tangziwen 1e016dc6d8 Always get the minimum distance intersect point. 2015-06-23 14:41:20 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
XiaoYang 96bb244d69 Merge pull request #351 from tangziwen/v3 
fix terraintest and Terrain::getInstersectionPoint()
 2015-06-18 14:47:49 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
Vincent Yang 187437068f Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
pandamicro bb275351f0 Merge pull request #12363 from super626/v3 
Fix terrain lod computing bugs
 2015-06-17 17:49:39 +08:00
yangxiao 12a352a1db add comment 2015-06-17 16:32:08 +08:00
XiaoYang 5dd2aa2884 Merge pull request #349 from tangziwen/v3 
fix camera position
 2015-06-17 16:01:02 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
songchengjiang c08a355a06 fix the bug of light 
replace atanf with atan2f
 2015-06-17 11:17:46 +08:00
tangziwen 60115b1ce1 update 2015-06-16 17:46:21 +08:00
tangziwen 0eaf9b5acc Fix camera's incorrect position in chunks' LOD calculating. 2015-06-16 17:29:43 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
Ricardo Quesada 2a3347dd49 RenderState: default state fixes 
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
 2015-06-12 15:03:48 -07:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 
# Conflicts:
#	external/config.json
 2015-06-10 10:23:43 +08:00
pandamicro 1b75d4a192 Merge pull request #12212 from super626/sprite3d 
call setTransparent
 2015-06-08 14:21:40 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	cocos/2d/MarchingSquare.cpp
 2015-06-08 13:59:26 +08:00
子龙山人 c5ba7eef8b Merge pull request #12019 from super626/v3 
getIntersectionPoint failed when there is no intersection on the terrain
 2015-06-08 11:26:19 +08:00
Ricardo Quesada 453a3d93bc samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
yangxiao 8e558db3d6 call setTransparent 2015-06-05 16:25:09 +08:00
WuHao 5b572ab803 Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader 
...part of Material
 2015-06-02 16:56:59 -07:00
WuHao 3c5326ba1f removed spritePolygon, merge into sprite and draft of AutoPolygon 2015-06-02 10:10:09 +08:00
yangxiao 618f63cb35 replace windows folder sperator 2015-05-29 16:43:36 +08:00
yangxiao 410d09525f setTransparent for mesh command 2015-05-29 16:38:42 +08:00
yangxiao db2b2cf0b8 getTrianglesList for obj file 2015-05-29 16:37:37 +08:00
yangxiao 2e27bfd6c7 add comment 2015-05-28 12:40:16 +08:00
yangxiao a5976a43f7 code style 2015-05-27 18:19:44 +08:00
子龙山人 b8fdb152fd Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue 
fix assert failure of NinePatchImageParser and rapidjson
 2015-05-27 11:17:31 +08:00
Vincent Yang 8105e9c714 Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
Vincent Yang 246913c092 Fix bug: skybox can't move to other position except origin point in world space. 2015-05-26 17:14:26 +08:00
Huabing.Xu 6d9f850e2c use trianglescommand for sprite 2015-05-22 15:54:56 +08:00
tangziwen fb1a7f1e8b fix Terrain::getIntersectionPoint 2015-05-22 09:07:57 +08:00
minggo ba694beccb Merge pull request #11895 from super626/v3 
fix #10767
 2015-05-20 11:20:47 +08:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock 
cleaner code, conforms to new way of setting the state
 2015-05-19 17:18:44 -07:00
tangziwen 8d791390ff fix crash when visiting camera is not exist 2015-05-19 14:47:28 +08:00
minggo 9f3284d62f Merge pull request #11833 from super626/v3 
getTriangleList to bundle and add terrain to 3d render queue
 2015-05-14 18:16:27 +08:00
yangxiao e659373648 add getTriangleList to bundle 2015-05-14 10:30:20 +08:00
yangxiao 0f0f85b33c terrain to 3d render queue 2015-05-14 10:29:50 +08:00
minggo 7732cd6e77 Merge pull request #11814 from super626/issue9767 
add issue9767 test
 2015-05-14 10:20:09 +08:00
Ricardo Quesada fde5f8d63c Adds better sample 
adds clone support as well
 2015-05-13 17:39:39 -07:00
yangxiao ec69a34c51 add issue9767 test 2015-05-13 16:16:45 +08:00
Ricardo Quesada c693573d77 more samples 
and API fixes
 2015-05-12 22:24:52 -07:00
Ricardo Quesada a83c10fdbf Merge pull request #11807 from ricardoquesada/material_vertexattrib 
Adds support of VertexAttribBinding per Pass
 2015-05-12 21:05:02 -07:00
Ricardo Quesada d23ff0ea2c Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
minggo a587b28e38 Merge pull request #11792 from super626/v3 
particle3d can not be seen when added to scene with terrain
 2015-05-13 09:38:21 +08:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
yangxiao 4d71175318 resove conflict 2015-05-12 12:12:29 +08:00
songchengjiang f25c02f230 fix bugs of terrain 2015-05-11 12:02:32 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
cnsoft 62741e3ff8 fix a nullptr bug. 
get model from : http://pan.baidu.com/s/1sjofSWd pass: 9xis    it will crash in cocos studio or client.
 2015-05-06 14:38:38 +08:00
Ricardo Quesada 90c9dffc1a cleanup Material Code 
- removes unused code
- removes experimental code
 2015-05-05 15:59:41 -07:00
Ricardo Quesada ce95bfe059 Squashed commit of the following: 
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:46:57 2015 -0700

    compiles on win32

commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:01:04 2015 -0700

    compiles on windows!

commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 10:20:13 2015 -0700

    windows fix

    CALLBACK is defined in windows. Use CALLBACK_FN instead

commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 09:51:02 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 17:05:49 2015 -0700

    Material system works Ok.

    Deftaul states are being applyied to RenderState::StateBlock::_default
    state as well!

commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 15:52:09 2015 -0700

    more fixes for material

    blending works as expected

commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 12:14:00 2015 -0700

    compiles on Android

    compiles on Android

commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 11:01:46 2015 -0700

    Cmakefiles

    works with Cmake again

commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat May 2 18:17:50 2015 -0700

    Particle3D working Ok with its own uniforms

commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 17:32:00 2015 -0700

    MeshCommand now works 100% on Material!

commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 15:49:14 2015 -0700

    multiple meshes work Ok

commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 13:43:56 2015 -0700

    Adds `clone` to GLProgramState

commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:54:34 2015 -0700

    adds comment about the glprogramstate bug

commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:28:39 2015 -0700

    some uniforms moved to Material

commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 16:52:07 2015 -0700

    depth test moved to Material!

commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 13:12:28 2015 -0700

    Material/Technique/Pass subclass of RenderState

    Inheritance of RenderState. Code from GamePlay3D

commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 12:05:26 2015 -0700

    same as v3

commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 11:37:40 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 18:02:21 2015 -0700

    fixes on blending

commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:51:05 2015 -0700

    better defaults for StateBlock

commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:46:36 2015 -0700

    RenderState::bind() binds lots of states

commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:40:07 2015 -0700

    Adds REnderState parsing in .material

commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:06:31 2015 -0700

    RenderState added into RenderState

    Code based on GamePlay3D. Adds GamePlay3d License.

commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 11:27:55 2015 -0700

    Merge branch 'v3' into material_system

commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 18:15:12 2015 -0700

    order files alphabetically

    order files alphabetically

commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 17:46:07 2015 -0700

    Adds cmake and android support

commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 16:33:50 2015 -0700

    for some reason the callback was crashing

    ... bug in the callback code?
    in any case, we didn't need it and it was making the code slower.

commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 14:00:24 2015 -0700

    more little fixes

commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 12:11:28 2015 -0700

    MeshCommand using Material internally

    works

commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 10:34:03 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 17:41:27 2015 -0700

    improved readebility of MeshCommand code

commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 15:41:07 2015 -0700

    mesh supports Material

    `Mesh` supports `Material`
    Now `MeshCommand` needs to implement it correctly.

commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 11:23:28 2015 -0700

    Merge branch 'v3' into material_system

commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 17:40:48 2015 -0700

    Adding Material into Mesh

    WIP.

commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:39:54 2015 -0700

    cosmetic

commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:26:41 2015 -0700

    moves even more code form Sprite3D to Mesh

commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:15:21 2015 -0700

    Moves "draw" from `Sprite3D` to `Mesh`

commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 15:00:50 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 14:46:28 2015 -0700

    cosmetic

commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 16:44:21 2015 -0700

    revert my changes...

    ...actually the GLProgramState code was Ok... ouch

commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 15:40:54 2015 -0700

    parsing GLProgramState validates the attributes

commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 12:10:31 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 17:45:34 2015 -0700

    little progress on Sprite3D + Material

    GLProgramState needs to decouple Uniforms from Attributes in
    `applyGLProgram`.

    binding the attributes is something that needs to be done
    at a different order.
    Perhaps the attributes are part of a VAO or something else.
    the method `applyAttributes()` has a variable to avoid that...
    but everything looks very hackish.

commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 15:46:02 2015 -0700

    doesn't crash :)

    but doesn't show anything either

commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 13:35:45 2015 -0700

    adding sprit3d test

commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 12:10:32 2015 -0700

    MeshCommand: initial draw with Material

commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 10:41:05 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 21:57:28 2015 -0700

    adding Material to MeshCommand

commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 19:39:09 2015 -0700

    pre commit before merging MeshCommand

commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 18:19:00 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:22:03 2015 -0700

    Pass conforms to create()/init() pattern

commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:04:19 2015 -0700

    defines are strings

    better error checking when creating objects
    autorelase added in Pass, Material, Technique

commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 11:23:47 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:31:37 2015 -0700

    blur effect works with alpha

commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:35 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:07 2015 -0700

    Material, Technique, Pass: they have parent

commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 21:48:06 2015 -0700

    multipass works

commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:31:04 2015 -0700

    yeah!

    more materials... a lot to do yet

commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:06:46 2015 -0700

    yeah! works!

commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 16:43:54 2015 -0700

    simple test of material system works!!!

commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 13:51:45 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 18:04:23 2015 -0700

    JSON file curated

    fixes minor bugs

commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 17:22:36 2015 -0700

    parsers shaders!

    including uniforms

commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 23:24:18 2015 -0700

    Material parses texture

commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 18:22:33 2015 -0700

    material parsing almost working

commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 09:23:23 2015 -0700

    Merge branch 'v3' into material_system

commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 18:42:42 2015 -0700

    json parsing broken

    ha... I need to parse the content of the file, to the name of the file.
    to be fixed tomorrow

commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 10:19:11 2015 -0700

    Merge branch 'v3' into material_system

commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:41:12 2015 -0700

    Adds more dummy files for material

commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:01:16 2015 -0700

    adds empty test

commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 15:36:24 2015 -0700

    more material fixes

    multiple passes added in renderer

commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 11:52:30 2015 -0700

    Merge branch 'v3' into material_system

commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:42:35 2015 -0700

    Merge branch 'v3' into material_system

commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:18:34 2015 -0700

    Merge branch 'cpp_compiles_on_mac' into material_system

commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:09:59 2015 -0700

    compiles on Mac

commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 13:54:59 2015 -0700

    Merge branch 'v3' into material_system

commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 8 14:16:27 2015 -0700

    Merge branch 'v3' into material_system

commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:15:28 2015 +0800

    Merge branch 'v3' into material_system

commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:13:24 2015 +0800

    little changes to pass

commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:36:43 2015 +0800

    Merge branch 'v3' into material_system

commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:23:17 2015 +0800

    small changes

commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Mar 26 18:20:46 2015 -0700

    initial Material system
 2015-05-05 13:07:32 -07:00
yangxiao 59988fdcc0 missing texture color 2015-04-29 10:30:18 +08:00