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

Merge pull request #2716 from dumganhar/iss2244-getEye-develop 

fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
This commit is contained in:
James Chen 2013-06-03 00:34:36 -07:00
parent 97607425b8 86af06c909
commit bf9ae3e413
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
3ff60497346cab1d4592901c3a03048c34bf725a
fd1fc798950f08a5340a8e458c357668fb2c01eb

4
tools/tojs/cocos2dx.ini
View File

@ -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],