db659107d3
Merge pull request #9052 from huangshiwu/v3_fixbug
...
fix ui crash bug caused by DrawNode
2014-11-07 10:33:08 +08:00
ace9933d72
fix ui crash bug caused by DrawNode
2014-11-07 10:05:29 +08:00
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
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
b144eb345a
Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug
...
fix DrawNode's memory leak -- delete vaos those are generated and forget...
2014-10-11 17:31:17 +08:00
184d9356b8
fix DrawNode's memory leak -- delete vaos those are generated and forget to release
2014-10-11 12:00:14 +08:00
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
11d8829b3a
Deprecate DrawPrimitives and enhance DrawNode --little modify
2014-09-12 14:50:41 +08:00
6182a872c6
Deprecate DrawPrimitives and enhance DrawNode --more modify
2014-09-12 11:12:20 +08:00
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
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
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
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
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
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
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
3e16857c92
remove kmMat4 interface in class DrawNode
2014-04-09 09:59:56 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
2e315fb215
migrate Vertex2f to Vector2
2014-04-02 15:25:37 +08:00
a0ab8fcdf3
onDraw() updated
...
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.
`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
2014-03-05 15:49:08 -08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
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
82700339c0
Adds a way to print the renderer vertices
2014-02-07 19:37:44 -08:00
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
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
2133c0e566
Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode
...
Conflicts:
cocos/2d/CCDrawNode.h
2014-01-09 17:03:08 +08:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
6bc0a7066f
change CustomCommand variable to class member.
2013-12-26 21:19:12 +08:00
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +08:00
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
minggo