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

ligthmask to unsigned int

This commit is contained in:
yangxiao 2014-09-26 15:52:04 +08:00
parent 98d9cea774
commit 11a7bf8697
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/renderer/CCMeshCommand.cpp
View File

@ -530,11 +530,6 @@ void MeshCommand::setLightUniformNames()
}
}
void MeshCommand::setLightMask( unsigned short lightmask )
{
_lightMask = lightmask;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
void MeshCommand::listenRendererRecreated(EventCustom* event)
{

4
cocos/renderer/CCMeshCommand.h
View File

@ -62,7 +62,7 @@ public:
void setMatrixPaletteSize(int size) { _matrixPaletteSize = size; }
void setLightMask(unsigned short lightmask);
void setLightMask(unsigned int lightmask) { _lightMask = lightmask; }
void execute();
@ -127,7 +127,7 @@ protected:
// ModelView transform
Mat4 _mv;
unsigned short _lightMask;
unsigned int _lightMask;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8)
EventListenerCustom* _rendererRecreatedListener;