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

19 Commits

Author SHA1 Message Date
CaiWenzhi 8b9d572961 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-04 16:59:06 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
cai wenzhi 683d3c9f14 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
cai wenzhi 4f90676e92 Add method for editor 2014-03-01 22:34:25 +08:00
Ricardo Quesada d78304599d Cache working OK. 
Performance increased in 20% for static objects.
 2014-02-28 16:10:48 -08:00
Ricardo Quesada eb66ddd931 visit and draw improved. 
`visit()` and `draw()` are improved.
they both receive:
 - `Renderer`
 - `kmMat4` for transformation
 - `bool` whether or not the transform changed from the previous frame

Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).

Those parameters are needed for:
 - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
 - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
 - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.

We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
 2014-02-27 21:43:54 -08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CaiWenzhi f10e1ee04c optimize scissor clipping 2014-01-20 13:38:13 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
CaiWenzhi c3b7a9645a Fixed bugs of "anchor point" and "update" 2014-01-09 19:00:47 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CaiWenzhi ad30f8ff96 Fixed bug of clippinglayout 2014-01-06 10:56:33 +08:00
CaiWenzhi 530f82ee27 Add refresh layout method 2013-12-26 14:57:30 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CaiWenzhi 2432e6e40d add "override" 2013-11-14 13:42:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00