diff --git a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id index 7ad9f54af3..24259265d5 100644 --- a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id @@ -1 +1 @@ -bdd889bcea3be1d011cb3d2d24c0ab27be936cc0 \ No newline at end of file +d0b231fcad3b4e35d4f2a998dce1b7437ae689ab \ No newline at end of file diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index 0972d19149..39ae0ade27 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -103,6 +103,7 @@ skip = Node::[^setPosition$ getGrid setGLServerState description getUserObject . SimpleAudioEngine::[getClassTypeInfo], Application::[^application.* ^run$], Camera::[getEyeXYZ getCenterXYZ getUpXYZ], + ShaderCache::[sharedShaderCache, purgeSharedShaderCache], ccFontDefinition::[*] rename_functions = SpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY], @@ -125,7 +126,7 @@ rename_functions = SpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpri Camera::[setUpXYZ=setUp setEyeXYZ=setEye setCenterXYZ=setCenter], TMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty], Texture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat], - ShaderCache::[programForKey=getProgram sharedShaderCache=getInstance], + ShaderCache::[programForKey=getProgram], FileUtils::[loadFilenameLookupDictionaryFromFile=loadFilenameLookup], Application::[sharedApplication=getInstance]