Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

This commit is contained in:
Liam 2014-10-27 11:16:58 +08:00
parent 19ed3d1965 7ccf684a3e
commit d6564be67e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,7 +1,8 @@
cocos2d-x-3.3 ?? cocos2d-x-3.3 ??
[FIX] WP/WinRT: Windows 8.1 universal app support; `UIEditBox` support [FIX] GLProgramState: enabled GLProgramState restoring on render recreated on WP8
[FIX] Label: label shifting when outline feature enabled [FIX] Label: label shifting when outline feature enabled
[FIX] Sprite3D: did not create attached sprite from cache [FIX] Sprite3D: did not create attached sprite from cache
[FIX] WP/WinRT: Windows 8.1 universal app support; `UIEditBox` support
cocos2d-x-3.3-rc0 Oct.21 2014 cocos2d-x-3.3-rc0 Oct.21 2014
[NEW] 3d: added light support: direction light, point light, spot light and ambient light [NEW] 3d: added light support: direction light, point light, spot light and ambient light

4
cocos/renderer/CCGLProgramState.cpp
View File

@ -279,7 +279,7 @@ GLProgramState::GLProgramState()
, _textureUnitIndex(1) , _textureUnitIndex(1)
, _uniformAttributeValueDirty(true) , _uniformAttributeValueDirty(true)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
/** listen the event that renderer was recreated on Android/WP8 */ /** listen the event that renderer was recreated on Android/WP8 */
CCLOG("create rendererRecreatedListener for GLProgramState"); CCLOG("create rendererRecreatedListener for GLProgramState");
_backToForegroundlistener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom*) { _uniformAttributeValueDirty = true; }); _backToForegroundlistener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom*) { _uniformAttributeValueDirty = true; });
@ -289,7 +289,7 @@ GLProgramState::GLProgramState()
GLProgramState::~GLProgramState() GLProgramState::~GLProgramState()
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
Director::getInstance()->getEventDispatcher()->removeEventListener(_backToForegroundlistener); Director::getInstance()->getEventDispatcher()->removeEventListener(_backToForegroundlistener);
#endif #endif

2
cocos/renderer/CCGLProgramState.h
View File

@ -218,7 +218,7 @@ protected:
uint32_t _vertexAttribsFlags; uint32_t _vertexAttribsFlags;
GLProgram *_glprogram; GLProgram *_glprogram;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
EventListenerCustom* _backToForegroundlistener; EventListenerCustom* _backToForegroundlistener;
#endif #endif
}; };