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

Merge pull request #3158 from dumganhar/deprecated-func 

closed 2405: Updating bindings-generator, bindings-generator should not bind deprecated methods.
This commit is contained in:
James Chen 2013-07-15 19:27:22 -07:00
parent 93e75bad9f 62b12cbe82
commit dd5a745626
6 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
16f9fcf29ae0c1b3a14728f0a11518f50355fb18 08ecad70e8370c7af451fddea1c59d05e80ca696

2
samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
6e5e943a982f3ba38f0119ff2a8a4d25f9c76945 cfc5c1f04972a605515e3e606ec7da4be4b75c2e

1
scripting/javascript/bindings/js/jsb.js
View File

@ -12,3 +12,4 @@ require('jsb_opengl_constants.js');
require('jsb_opengl.js'); require('jsb_opengl.js');
require('jsb_cocosbuilder.js'); require('jsb_cocosbuilder.js');
require('jsb_sys.js'); require('jsb_sys.js');
require('jsb_deprecated.js');

23
scripting/javascript/bindings/js/jsb_deprecated.js Normal file
View File

@ -0,0 +1,23 @@
// Deprecated functions
var cc = cc || {};
(function() {
var logW = function(old_name, new_name) {
cc.log("\n********** \n"+old_name +" was deprecated, please use "+ new_name +" instead.\n**********");
};
cc.AnimationCache.purgeSharedAnimationCache = function() {
logW("cc.AnimationCache.purgeSharedAnimationCache", "cc.AnimationCache.destroyInstance");
cc.AnimationCache.destroyInstance();
};
// Example of deprecating a member function
// cc.TiledGrid3DAction.prototype.originalTile = function() {
// logW("cc.TiledGrid3DAction.prototype.originalTile", "cc.TiledGrid3DAction.prototype.getOriginalTile");
// return cc.TiledGrid3DAction.prototype.getOriginalTile.apply(this, arguments);
// };
})();

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 446febf1da3076d93427f637526e8d04db5b5157 Subproject commit 6612820da6286ffb45ddaec16b75f1624624b88c

9
tools/tojs/cocos2dx.ini
View File

@ -44,7 +44,7 @@ skip = Node::[^setPosition$ getGrid setGLServerState description getUserObject .
LayerColor::[getBlendFunc setBlendFunc], LayerColor::[getBlendFunc setBlendFunc],
ParticleSystem::[getBlendFunc setBlendFunc], ParticleSystem::[getBlendFunc setBlendFunc],
DrawNode::[getBlendFunc setBlendFunc drawPolygon], DrawNode::[getBlendFunc setBlendFunc drawPolygon],
Director::[sharedDirector getAccelerometer (g|s)et.*Dispatcher getOpenGLView getProjection getClassTypeInfo], Director::[getAccelerometer (g|s)et.*Dispatcher getOpenGLView getProjection getClassTypeInfo],
Layer.*::[didAccelerate (g|s)etBlendFunc keyPressed keyReleased unregisterScriptKeypadHandler], Layer.*::[didAccelerate (g|s)etBlendFunc keyPressed keyReleased unregisterScriptKeypadHandler],
Menu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns], Menu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns],
MenuItem.*::[create setCallback initWithCallback], MenuItem.*::[create setCallback initWithCallback],
@ -96,16 +96,13 @@ skip = Node::[^setPosition$ getGrid setGLServerState description getUserObject .
Bezier.*::[create actionWithDuration], Bezier.*::[create actionWithDuration],
CardinalSpline.*::[create actionWithDuration setPoints], CardinalSpline.*::[create actionWithDuration setPoints],
Scheduler::[pause resume unschedule schedule update isTargetPaused], Scheduler::[pause resume unschedule schedule update isTargetPaused],
TextureCache::[sharedTextureCache purgeSharedTextureCache addPVRTCImage], TextureCache::[addPVRTCImage],
Timer::[getSelector], Timer::[getSelector],
*::[copyWith.* onEnter.* onExit.* ^description$ getObjectType], *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType],
FileUtils::[sharedFileUtils purgeFileUtils (g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo], FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo],
SimpleAudioEngine::[getClassTypeInfo], SimpleAudioEngine::[getClassTypeInfo],
Application::[^application.* ^run$], Application::[^application.* ^run$],
Camera::[getEyeXYZ getCenterXYZ getUpXYZ], Camera::[getEyeXYZ getCenterXYZ getUpXYZ],
ShaderCache::[sharedShaderCache purgeSharedShaderCache],
AnimationCache::[sharedAnimationCache purgeSharedAnimationCache],
SpriteFrameCache::[sharedSpriteFrameCache purgeSharedSpriteFrameCache],
ccFontDefinition::[*] ccFontDefinition::[*]
rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY], rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY],