Commit Graph

32 Commits

Author SHA1 Message Date
Ricardo Quesada 9b118e5e96 Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
2014-04-26 10:11:22 -07:00
Huabing.Xu debad86ec1 fix compile error after merge 2014-04-15 22:35:35 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
James Chen b276c42ae6 GroupCommandManager should not be a singleton, it should be managed by Renderer. 2014-04-12 13:01:42 +08:00
Huabing.Xu a8378a2b99 adjust comment 2014-04-11 17:31:35 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command
2. fix bug: renderTexture->SpriteRenderTextureBug
2014-04-11 16:05:22 +08:00
Huabing.Xu 07ac817a7c Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-10 10:52:15 +08:00
Huabing.Xu 8d01d4e07d remove kmMat4 interface in cocos/2d folder 2014-04-09 11:53:01 +08:00
Huabing.Xu 7f1fb13113 closed #4629: remove unused _renderStack 2014-04-08 16:54:00 +08:00
Huabing.Xu 1a7f46598f closed #4629: fix bug for group command 2014-04-07 22:51:32 +08:00
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
children Test`.
2014-04-04 12:48:16 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Huabing.Xu c7315a2e3e closed #3874: expand textureID bit to 32bits 2014-02-26 15:01:45 +08:00
Ricardo Quesada 82700339c0 Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
Huabing.Xu 159f44a5dc issue #3812: performance improvement, 1. add vector reserve 2. use C++11 range loop 2014-01-22 18:24:23 +08:00
Huabing.Xu cc39ca4f16 issue #3812: rename convertToWorldCoordiantes->convertToWorldCoordinates 2014-01-22 17:09:13 +08:00
Huabing.Xu 7ea9a4f025 issue #3812: remove member variable _lastCommand 2014-01-22 16:03:04 +08:00
Huabing.Xu 5bbd48a9bf issue #3812: remove member variable _firstCommand, remove comment codes 2014-01-22 15:52:00 +08:00
Huabing.Xu 5397618aab Merge branch 'develop' into develop_refactor_culling
* develop: (127 commits)
  issue #3677: Wrong include fix.
  issue #3677: File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
  issue #3677: Updates Windows project to add PerformanceEventDispatcherTest.
  issue #3677: Updates Android.mk and CMakeLists.txt.
  issue #3677: Adds EventDispatcher performance test.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3713: every autorelease will cause a release operation
  do not mix github access token with jenkins job trigger token
  issue #3781, Update travis-scripts, llvm-installing parts no need now.
  issue #3713: use reference in loop
  issue #3781, Minor fix & update submodule.
  closed #3808: EditBox on Mac works again.
  issue #3713:fix memory leak of autoreleas pool
  closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context
  global Z order uses floats
  ActionsProgress test include fixes
  Removed unused code and files.
  ...

Conflicts:
	cocos/2d/renderer/CCRenderer.cpp
2014-01-22 15:37:25 +08:00
Huabing.Xu cf6785ffcf issue #3812: using std::vector<QuadCommand*> to hold current batched command 2014-01-22 15:18:27 +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
Ricardo Quesada 069a4fb170 Renderer: Don't sort z=0 Commands
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
2014-01-17 23:10:04 -08:00
Ricardo Quesada cb9761125b Renderer: When not using VAOs, call...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -08:00
Ricardo Quesada f8dc8f0b38 Renderer performance fixes
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
2014-01-15 14:35:26 -08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
Ricardo Quesada 156f69c528 Renderer is subclass of Object again... needed for Android.
ouch
2013-12-17 19:06:22 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00