Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
Jason Lust
5455d20fc1
Fix Issue #2354
...
Once a Texture Atlas VAO has deallocated by glDeleteVertexArrays. The GLStateCache may have been recently set to that vaoID. When shortly after a new glGenVertexArrays gets the same vaoID but the glBindVertexArray is bypassed because of the GLStateCache is not aware the VAO was just invalidated, and new vertex are copied to the old freed address.
2013-07-12 19:51:42 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
James Chen
ad8a3ac1b5
issue #2388 : One more static_cast.
2013-07-10 10:08:07 +08:00
James Chen
596c4c3cf2
issue #2387 : Using static_cast instead of C style cast while iterating CCDictionary.
2013-07-09 14:40:43 +08:00
dumganhar
b41dd9277d
issue #2300 : Warning fixes.
2013-07-08 23:12:11 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
James Chen
d64fb7339c
issue #2129 : FontDefinition* --> const FontDefinition&
2013-07-08 15:18:16 +08:00
James Chen
1eacab0278
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
2013-07-08 10:51:07 +08:00
Ricardo Quesada
c65b6f1417
Adds const to more getters
...
adds `const` to more getters.
2013-07-06 22:01:21 -07:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
Ricardo Quesada
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
Ricardo Quesada
216c6eada5
Adds more const in getters
...
In Sprite and Texture2D
2013-07-03 17:44:41 -07:00
Huabing.Xu
5929c7662c
issue #2328 refractor etc support:
...
1. GL_ETC1_RGB8_OES not defined will return not support hardware etc
2. remove some space and comments
2013-07-02 15:36:47 +08:00
Huabing.Xu
041bef148a
Merge branch 'origin/develop'
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d.vcxproj.filters
2013-07-02 13:47:02 +08:00
Huabing.Xu
9642930779
give Texture2D::_pixelFormat a default value in construction
2013-07-01 18:16:56 +08:00
Huabing.Xu
4e9e893c8e
1. Add C++ code to decode ETC file
...
2. Configuration and function supportsETC()
2013-07-01 17:40:57 +08:00
James Chen
b76798505c
closed #2342 : Fixing indention.
2013-06-29 15:04:43 +08:00
James Chen
bb2f19535b
closed #2342 : Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
2013-06-29 15:01:50 +08:00
Justin Hawkwood
37ca32e75c
Corrected code to use textDefinition properties
2013-06-29 15:00:17 +08:00
minggo
ca2966745e
closed #2305 : fix a running time error
2013-06-26 15:11:13 +08:00
minggo
9d44b52ebf
issue #2305:use c++11 thread correctly
2013-06-26 14:48:19 +08:00
James Chen
62902ad212
Fixing compilation errors for Emscripten port.
2013-06-24 10:21:36 +08:00
minggo
b434190a70
issue #2305 : tab -> 4 spaces
2013-06-21 15:49:45 +08:00
minggo
ef7fd16f76
issue #2305 : tab -> 4 spaces
2013-06-21 15:43:17 +08:00
minggo
68559dfa00
issue #2305 : use c++11 thread instead of pthread in CCTextureCache
2013-06-21 15:29:21 +08:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
James Chen
136a9743d4
issue #2129 : [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.
2013-06-20 12:56:51 +08:00
James Chen
b7a33afc71
fixed #2303 : float assignment fix.
2013-06-19 14:09:23 +08:00
James Chen
f007819f74
Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop
...
Conflicts:
cocos2dx/textures/CCTexture2D.cpp
2013-06-19 14:05:55 +08:00
James Chen
b91e432258
Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate
...
fixed #2301 : Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
2013-06-18 22:56:02 -07:00
James Chen
1eadcd8b38
fixed #2301 : Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate
...
Conflicts:
cocos2dx/proj.emscripten/cocos2dx.mk
2013-06-19 13:03:51 +08:00
Andrew Glass
9df6d1271b
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2
...
When loading a PVRv3 the _format variable would not be set, always being the default value.
2013-06-18 16:16:17 +02:00
James Gregory
ad90fe88a8
Merge remote-tracking branch 'origin/master' into emscriptenate
2013-06-17 20:30:36 -07:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Chen
7295551f0f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-15 11:15:28 +08:00
minggo
47f4aee3cc
issue #2284 : use GLuint to fix compiling error
2013-06-14 16:48:18 +08:00
James Chen
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
Ricardo Quesada
98190a21c0
Actions with clone() pattern 1/3
...
This is the 1st patch of 3.
1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
2013-06-13 17:25:14 -07:00
Mykyta Usikov
28e8899089
fixed strokeColor and fontFillColor of CCLabelTTF
2013-06-13 14:16:33 +03:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Gregory
872be8e964
Initial commit of browser accelerated async image-loading code for Emscripten.
2013-06-12 14:46:32 -07:00
James Gregory
cdb63898d9
Simplify AsyncStruct slightly -- make it a class, add a constructor.
2013-06-12 10:03:12 -07:00
minggo
c84a071ae5
issue #2271 : fixed memory leak of CCTextureCache::snapshotTextures()
2013-06-09 15:08:26 +08:00
minggo
ec7bf7a9d6
issue #2271 : fixed memory leak of CCTextureCache::snapshotTextures()
2013-06-09 15:03:38 +08:00
minggo
6eaa1f97ec
Merge pull request #2828 from minggo/develop
...
fixed #2161 : fixed crash of loading ETC file
2013-06-08 02:02:52 -07:00
minggo
d5bfe10379
fixed #2161 : fixed crash of loading ETC file
2013-06-08 17:01:45 +08:00
minggo
2b3f3b6744
fixed #2161 : fixed crash of loading ETC file
2013-06-08 16:58:18 +08:00