diff --git a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id index 73e2087859..df1b329fac 100644 --- a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id +++ b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id @@ -1 +1 @@ -3ff60497346cab1d4592901c3a03048c34bf725a \ No newline at end of file +fd1fc798950f08a5340a8e458c357668fb2c01eb \ No newline at end of file diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index e9961ee827..437cefb328 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -100,9 +100,9 @@ skip = CCNode::[convertToWindowSpace ^setPosition$ getGrid setGLServerState desc CCFileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo], SimpleAudioEngine::[getClassTypeInfo], CCApplication::[^application.* ^run$], + CCCamera::[getEyeXYZ getCenterXYZ getUpXYZ], ccFontDefinition::[*] - rename_functions = CCDirector::[sharedDirector=getInstance], CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY], CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName], @@ -121,7 +121,7 @@ rename_functions = CCDirector::[sharedDirector=getInstance], CCSpriteBatchNode::[initWithFile=init], CCTouch::[getID=getId], SimpleAudioEngine::[sharedEngine=getInstance preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic], - CCCamera::[setUpXYZ=setUp getUpXYZ=getUp setEyeXYZ=setEye getEyeXYZ=getEye setCenterXYZ=setCenter getCenterXYZ=getCenter], + CCCamera::[setUpXYZ=setUp setEyeXYZ=setEye setCenterXYZ=setCenter], CCTMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty], CCTexture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat], CCShaderCache::[programForKey=getProgram sharedShaderCache=getInstance],