diff --git a/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index 4738aa91ef..ef830a0cb0 100755 --- a/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -100,7 +100,6 @@ public class Cocos2dxHelper { //Cocos2dxHelper.nativeSetAssetManager(sAssetManager); Cocos2dxBitmap.setContext(activity); - Cocos2dxETCLoader.setContext(activity); } public static Activity getActivity() { diff --git a/cocos2dx/proj.win32/cocos2d.vcxproj b/cocos2dx/proj.win32/cocos2d.vcxproj index d3644045be..3a9a883e64 100644 --- a/cocos2dx/proj.win32/cocos2d.vcxproj +++ b/cocos2dx/proj.win32/cocos2d.vcxproj @@ -107,7 +107,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(ProjectDir)..;$(ProjectDir)..\platform\win32;$(ProjectDir)..\platform\third_party\win32\iconv;$(ProjectDir)..\platform\third_party\win32\zlib;$(ProjectDir)..\platform\third_party\win32\libpng;$(ProjectDir)..\platform\third_party\win32\libjpeg;$(ProjectDir)..\platform\third_party\win32\libtiff;$(ProjectDir)..\platform\third_party\win32\libwebp;$(ProjectDir)..\platform\third_party\win32\libfreetype2;$(ProjectDir)..\platform\third_party\win32\OGLES;..\include;$(ProjectDir)..\kazmath\include;%(AdditionalIncludeDirectories) + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(ProjectDir)..;$(ProjectDir)..\platform\win32;$(ProjectDir)..\platform\third_party\win32\iconv;$(ProjectDir)..\platform\third_party\win32\zlib;$(ProjectDir)..\platform\third_party\win32\libpng;$(ProjectDir)..\platform\third_party\win32\libjpeg;$(ProjectDir)..\platform\third_party\win32\libtiff;$(ProjectDir)..\platform\third_party\win32\libwebp;$(ProjectDir)..\platform\third_party\win32\libfreetype2;$(ProjectDir)..\platform\third_party\win32\OGLES;..\include;$(ProjectDir)..\kazmath\include;$(ProjectDir)..\platform\third_party\common\etc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua b/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua index 594c43b12a..52a3e5f892 100644 --- a/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua +++ b/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua @@ -313,12 +313,12 @@ local function ActionCardinalSpline() local function drawCardinalSpline() kmGLPushMatrix() kmGLTranslatef(50, 50, 0) - cc.DrawPrimitives.ccDrawCardinalSpline(array, 0, 100) + cc.DrawPrimitives.drawCardinalSpline(array, 0, 100) kmGLPopMatrix() kmGLPushMatrix() kmGLTranslatef(size.width / 2, 50, 0) - cc.DrawPrimitives.ccDrawCardinalSpline(array, 1, 100) + cc.DrawPrimitives.drawCardinalSpline(array, 1, 100) kmGLPopMatrix() end @@ -376,10 +376,10 @@ local function ActionCatmullRom() local function drawCatmullRom() kmGLPushMatrix() kmGLTranslatef(50, 50, 0) - cc.DrawPrimitives.ccDrawCatmullRom(array, 50) + cc.DrawPrimitives.drawCatmullRom(array, 50) kmGLPopMatrix() - cc.DrawPrimitives.ccDrawCatmullRom(array2,50) + cc.DrawPrimitives.drawCatmullRom(array2,50) end array:retain() @@ -954,7 +954,7 @@ local function ActionFollow() local x = winSize.width * 2 - 100 local y = winSize.height local vertices = { cc.p(5, 5), cc.p(x - 5, 5), cc.p(x - 5,y - 5), cc.p(5,y - 5) } - gl.DrawPrimitives.ccDrawPoly(vertices, 4, true) + cc.DrawPrimitives.drawPoly(vertices, 4, true) end local glNode = gl.glNodeCreate() diff --git a/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua b/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua index 168f462432..a2884fb64d 100644 --- a/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua +++ b/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua @@ -86,55 +86,55 @@ local function drawPrimitivesMainLayer() glNode:setAnchorPoint(cc.p(0.5, 0.5)) local function primitivesDraw() - gl.DrawPrimitives.ccDrawLine(VisibleRect:leftBottom(), VisibleRect:rightTop() ) + cc.DrawPrimitives.drawLine(VisibleRect:leftBottom(), VisibleRect:rightTop() ) gl.lineWidth( 5.0 ) - gl.DrawPrimitives.ccDrawColor4B(255,0,0,255) - gl.DrawPrimitives.ccDrawLine( VisibleRect:leftTop(), VisibleRect:rightBottom() ) + cc.DrawPrimitives.drawColor4B(255,0,0,255) + cc.DrawPrimitives.drawLine( VisibleRect:leftTop(), VisibleRect:rightBottom() ) - gl.DrawPrimitives.ccPointSize(64) - gl.DrawPrimitives.ccDrawColor4B(0, 0, 255, 128) - gl.DrawPrimitives.ccDrawPoint(VisibleRect:center()) + cc.DrawPrimitives.setPointSize(64) + cc.DrawPrimitives.drawColor4B(0, 0, 255, 128) + cc.DrawPrimitives.drawPoint(VisibleRect:center()) local points = {cc.p(60,60), cc.p(70,70), cc.p(60,70), cc.p(70,60) } - gl.DrawPrimitives.ccPointSize(4) - gl.DrawPrimitives.ccDrawColor4B(0,255,255,255) - gl.DrawPrimitives.ccDrawPoints(points,4) + cc.DrawPrimitives.setPointSize(4) + cc.DrawPrimitives.drawColor4B(0,255,255,255) + cc.DrawPrimitives.drawPoints(points,4) gl.lineWidth(16) - gl.DrawPrimitives.ccDrawColor4B(0, 255, 0, 255) - gl.DrawPrimitives.ccDrawCircle( VisibleRect:center(), 100, 0, 10, false) + cc.DrawPrimitives.drawColor4B(0, 255, 0, 255) + cc.DrawPrimitives.drawCircle( VisibleRect:center(), 100, 0, 10, false) gl.lineWidth(2) - gl.DrawPrimitives.ccDrawColor4B(0, 255, 255, 255) - gl.DrawPrimitives.ccDrawCircle( VisibleRect:center(), 50, math.pi / 2, 50, true) + cc.DrawPrimitives.drawColor4B(0, 255, 255, 255) + cc.DrawPrimitives.drawCircle( VisibleRect:center(), 50, math.pi / 2, 50, true) gl.lineWidth(2) - gl.DrawPrimitives.ccDrawColor4B(255, 0, 255, 255) - gl.DrawPrimitives.ccDrawSolidCircle( cc.p(VisibleRect:center().x + 140 ,VisibleRect:center().y), 40, math.rad(90), 50, 1.0, 1.0) + cc.DrawPrimitives.drawColor4B(255, 0, 255, 255) + cc.DrawPrimitives.drawSolidCircle( cc.p(VisibleRect:center().x + 140 ,VisibleRect:center().y), 40, math.rad(90), 50, 1.0, 1.0) gl.lineWidth(10) - gl.DrawPrimitives.ccDrawColor4B(255, 255, 0, 255) + cc.DrawPrimitives.drawColor4B(255, 255, 0, 255) local yellowPoints = { cc.p(0,0), cc.p(50,50), cc.p(100,50), cc.p(100,100), cc.p(50,100)} - gl.DrawPrimitives.ccDrawPoly( yellowPoints, 5, false) + cc.DrawPrimitives.drawPoly( yellowPoints, 5, false) gl.lineWidth(1) local filledVertices = { cc.p(0,120), cc.p(50,120), cc.p(50,170), cc.p(25,200), cc.p(0,170) } - gl.DrawPrimitives.ccDrawSolidPoly(filledVertices, 5, cc.c4f(0.5, 0.5, 1, 1)) + cc.DrawPrimitives.drawSolidPoly(filledVertices, 5, cc.c4f(0.5, 0.5, 1, 1)) gl.lineWidth(2) - gl.DrawPrimitives.ccDrawColor4B(255, 0, 255, 255) + cc.DrawPrimitives.drawColor4B(255, 0, 255, 255) local closePoints= { cc.p(30,130), cc.p(30,230), cc.p(50,200) } - gl.DrawPrimitives.ccDrawPoly( closePoints, 3, true) + cc.DrawPrimitives.drawPoly( closePoints, 3, true) - gl.DrawPrimitives.ccDrawQuadBezier(VisibleRect:leftTop(), VisibleRect:center(), VisibleRect:rightTop(), 50) + cc.DrawPrimitives.drawQuadBezier(VisibleRect:leftTop(), VisibleRect:center(), VisibleRect:rightTop(), 50) - gl.DrawPrimitives.ccDrawCubicBezier(VisibleRect:center(), cc.p(VisibleRect:center().x + 30, VisibleRect:center().y + 50), cc.p(VisibleRect:center().x + 60,VisibleRect:center().y - 50), VisibleRect:right(), 100) + cc.DrawPrimitives.drawCubicBezier(VisibleRect:center(), cc.p(VisibleRect:center().x + 30, VisibleRect:center().y + 50), cc.p(VisibleRect:center().x + 60,VisibleRect:center().y - 50), VisibleRect:right(), 100) local solidvertices = {cc.p(60,160), cc.p(70,190), cc.p(100,190), cc.p(90,160)} - gl.DrawPrimitives.ccDrawSolidPoly( solidvertices, 4, cc.c4f(1, 1, 0, 1) ) + cc.DrawPrimitives.drawSolidPoly( solidvertices, 4, cc.c4f(1, 1, 0, 1) ) local array = { cc.p(0, 0), @@ -143,13 +143,13 @@ local function drawPrimitivesMainLayer() cc.p(0, size.height - 80), cc.p(0, 0), } - gl.DrawPrimitives.ccDrawCatmullRom( array, 5) + cc.DrawPrimitives.drawCatmullRom( array, 5) - gl.DrawPrimitives.ccDrawCardinalSpline( array, 0,100) + cc.DrawPrimitives.drawCardinalSpline( array, 0,100) gl.lineWidth(1) - gl.DrawPrimitives.ccDrawColor4B(255,255,255,255) - gl.DrawPrimitives.ccPointSize(1) + cc.DrawPrimitives.drawColor4B(255,255,255,255) + cc.DrawPrimitives.setPointSize(1) end glNode:registerScriptDrawHandler(primitivesDraw) diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua b/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua index 4e44e63518..b6ea8eb8a2 100644 --- a/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua +++ b/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua @@ -121,12 +121,12 @@ end -- class Lens3DTarget : public cc.Node -- public: --- virtual void setPosition(const cc.p& var) +-- virtual void setPosition(const CCPoint& var) -- m_pLens3D:setPosition(var) -- end --- virtual const cc.p& getPosition() +-- virtual const CCPoint& getPosition() -- return m_pLens3D:getPosition() -- end diff --git a/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua b/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua index 21a54ec163..32649cbdba 100644 --- a/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua +++ b/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua @@ -320,8 +320,8 @@ end function Atlas4.draw() local s = cc.Director:getInstance():getWinSize() - cc.DrawPrimitives.ccDrawLine( cc.p(0, s.height/2), cc.p(s.width, s.height/2) ) - cc.DrawPrimitives.ccDrawLine( cc.p(s.width/2, 0), cc.p(s.width/2, s.height) ) + cc.DrawPrimitives.drawLine( cc.p(0, s.height/2), cc.p(s.width, s.height/2) ) + cc.DrawPrimitives.drawLine( cc.p(s.width/2, 0), cc.p(s.width/2, s.height) ) end function Atlas4.step(dt) diff --git a/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua b/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua index 96e6073d9e..c53801e734 100644 --- a/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua +++ b/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua @@ -684,10 +684,10 @@ local function draw() glLineWidth(3) - cc.DrawPrimitives.ccDrawLine( cc.p(x, y), cc.p((x+width), y) ) - cc.DrawPrimitives.ccDrawLine( cc.p((x+width), y), cc.p((x+width), (y+height)) ) - cc.DrawPrimitives.ccDrawLine( cc.p((x+width), (y+height)), cc.p(x, (y+height)) ) - cc.DrawPrimitives.ccDrawLine( cc.p(x, (y+height)), cc.p(x, y) ) + cc.DrawPrimitives.drawLine( cc.p(x, y), cc.p((x+width), y) ) + cc.DrawPrimitives.drawLine( cc.p((x+width), y), cc.p((x+width), (y+height)) ) + cc.DrawPrimitives.drawLine( cc.p((x+width), (y+height)), cc.p(x, (y+height)) ) + cc.DrawPrimitives.drawLine( cc.p(x, (y+height)), cc.p(x, y) ) glLineWidth(1) end @@ -753,10 +753,10 @@ local function draw() glLineWidth(3) - cc.DrawPrimitives.ccDrawLine( cc.p(x,y), cc.p(x+width,y) ) - cc.DrawPrimitives.ccDrawLine( cc.p(x+width,y), cc.p(x+width,y+height) ) - cc.DrawPrimitives.ccDrawLine( cc.p(x+width,y+height), cc.p(x,y+height) ) - cc.DrawPrimitives.ccDrawLine( cc.p(x,y+height), cc.p(x,y) ) + cc.DrawPrimitives.drawLine( cc.p(x,y), cc.p(x+width,y) ) + cc.DrawPrimitives.drawLine( cc.p(x+width,y), cc.p(x+width,y+height) ) + cc.DrawPrimitives.drawLine( cc.p(x+width,y+height), cc.p(x,y+height) ) + cc.DrawPrimitives.drawLine( cc.p(x,y+height), cc.p(x,y) ) glLineWidth(1) end diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj index b0c68e4a86..58bdbdf82a 100644 --- a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj +++ b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj @@ -120,8 +120,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O MultiThreadedDLL - - + ProgramDatabase WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true @@ -131,6 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O MachineX86 $(OutDir);%(AdditionalLibraryDirectories) libcocos2d.lib;libExtensions.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) + true 0x0409 diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id index 5d2b4e025f..ef847642e4 100644 --- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -2a2eccdbed6181f80d4c2fec86d963653615627b \ No newline at end of file +a9fdccd58c6cf8ce3cb5d00ea294ef9ff216d439 \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/CCLuaEngine.cpp b/scripting/lua/cocos2dx_support/CCLuaEngine.cpp index 3ef4419865..2241bf9071 100644 --- a/scripting/lua/cocos2dx_support/CCLuaEngine.cpp +++ b/scripting/lua/cocos2dx_support/CCLuaEngine.cpp @@ -55,6 +55,8 @@ bool LuaEngine::init(void) _stack = LuaStack::create(); _stack->retain(); extendLuaObject(); + executeScriptFile("DeprecatedEnum.lua"); + executeScriptFile("DeprecatedClass.lua"); executeScriptFile("Deprecated.lua"); return true; } @@ -608,102 +610,12 @@ void LuaEngine::extendLuaObject() return; lua_State* lua_S = _stack->getLuaState(); - extendNode(lua_S); - extendMenuItem(lua_S); - extendLayer(lua_S); - extendControl(lua_S); extendWebsocket(lua_S); extendGLNode(lua_S); - extendScrollView(lua_S); - extendDrawNode(lua_S); _stack->clean(); } -void LuaEngine::extendNode(lua_State* lua_S) -{ - if(NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCNode"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"registerScriptHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_registerScriptHandler00); - lua_rawset(lua_S,-3); - lua_pushstring(lua_S,"unregisterScriptHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_unregisterScriptHandler00); - lua_rawset(lua_S, -3); - } -} - -void LuaEngine::extendMenuItem(lua_State* lua_S) -{ - if (NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCMenuItem"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"registerScriptTapHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_registerScriptTapHandler00); - lua_rawset(lua_S,-3); - lua_pushstring(lua_S, "unregisterScriptTapHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_unregisterScriptTapHandler00); - lua_rawset(lua_S, -3); - } -} - -void LuaEngine::extendLayer(lua_State* lua_S) -{ - if (NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCLayer"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"registerScriptTouchHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_registerScriptTouchHandler00); - lua_rawset(lua_S,-3); - lua_pushstring(lua_S, "unregisterScriptTouchHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_unregisterScriptTouchHandler00); - lua_rawset(lua_S, -3); - lua_pushstring(lua_S, "registerScriptKeypadHandler"); - lua_pushcfunction(lua_S, tolua_Cocos2d_registerScriptKeypadHandler00); - lua_rawset(lua_S, -3); - lua_pushstring(lua_S, "unregisterScriptKeypadHandler"); - lua_pushcfunction(lua_S, tolua_Cocos2d_unregisterScriptKeypadHandler00); - lua_rawset(lua_S, -3); - lua_pushstring(lua_S, "registerScriptAccelerateHandler"); - lua_pushcfunction(lua_S, tolua_Cocos2d_registerScriptAccelerateHandler00); - lua_rawset(lua_S, -3); - lua_pushstring(lua_S, "unregisterScriptAccelerateHandler"); - lua_pushcfunction(lua_S, tolua_Cocos2d_unregisterScriptAccelerateHandler00); - lua_rawset(lua_S, -3); - } -} - -void LuaEngine::extendControl(lua_State* lua_S) -{ - if (NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCControl"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"registerControlEventHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_registerControlEventHandler00); - lua_rawset(lua_S,-3); - lua_pushstring(lua_S,"unregisterControlEventHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_unregisterControlEventHandler00); - lua_rawset(lua_S,-3); - } -} - void LuaEngine::extendWebsocket(lua_State* lua_S) { #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) @@ -741,38 +653,4 @@ void LuaEngine::extendGLNode(lua_State* lua_S) lua_rawset(lua_S,-3); } } - -void LuaEngine::extendScrollView(lua_State* lua_S) -{ - if (NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCScrollView"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"registerScriptHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_ScrollView_registerScriptHandler00); - lua_rawset(lua_S,-3); - lua_pushstring(lua_S,"unregisterScriptHandler"); - lua_pushcfunction(lua_S,tolua_Cocos2d_ScrollView_unregisterScriptHandler00); - lua_rawset(lua_S,-3); - } -} - -void LuaEngine::extendDrawNode(lua_State* lua_S) -{ - if (NULL == lua_S) - return; - - lua_pushstring(lua_S,"CCDrawNode"); - lua_rawget(lua_S,LUA_REGISTRYINDEX); - if (lua_istable(lua_S,-1)) - { - lua_pushstring(lua_S,"drawPolygon"); - lua_pushcfunction(lua_S,tolua_Cocos2d_CCDrawNode_drawPolygon00); - lua_rawset(lua_S,-3); - } - -} NS_CC_END diff --git a/scripting/lua/cocos2dx_support/CCLuaEngine.h b/scripting/lua/cocos2dx_support/CCLuaEngine.h index 6a9c56d8f4..9b84f27d63 100644 --- a/scripting/lua/cocos2dx_support/CCLuaEngine.h +++ b/scripting/lua/cocos2dx_support/CCLuaEngine.h @@ -138,14 +138,8 @@ private: int handleTouchEvent(void* data); int handleTouchesEvent(void* data); int handlerControlEvent(void* data); - void extendNode(lua_State* lua_S); - void extendMenuItem(lua_State* lua_S); - void extendLayer(lua_State* lua_S); - void extendControl(lua_State* lua_S); void extendWebsocket(lua_State* lua_S); void extendGLNode(lua_State* lua_S); - void extendScrollView(lua_State* lua_S); - void extendDrawNode(lua_State* lua_S); private: static LuaEngine* _defaultEngine; LuaStack *_stack; diff --git a/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp b/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp index 73d2e811ea..1914d3a930 100644 --- a/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp +++ b/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp @@ -63,6 +63,25 @@ void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) } #endif +#ifdef __cplusplus +extern "C" { +#endif +extern int lua_isusertype (lua_State* L, int lo, const char* type); +#ifdef __cplusplus +} +#endif + +bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def) +{ + if (def && lua_gettop(L)=1 + tolua_Error tolua_err; if (!tolua_isnumber(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -93,14 +113,15 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_isnumber(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -116,14 +137,15 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_isnumber(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -139,14 +161,15 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_isboolean(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -162,14 +185,15 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_isnumber(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -185,14 +209,15 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_isnumber(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -208,14 +233,15 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_iscppstring(L,lo,0,&tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -231,14 +257,16 @@ bool luaval_to_point(lua_State* L,int lo,Point* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif + if (ok) { @@ -261,14 +289,15 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -292,14 +321,15 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -333,14 +363,15 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if(ok) { @@ -374,14 +405,15 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -415,14 +447,15 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -451,14 +484,15 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -501,14 +535,15 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); ok = false; - } #endif + } if (ok) { @@ -641,14 +676,15 @@ bool luaval_to_array(lua_State* L,int lo, Array** outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -740,14 +776,15 @@ bool luaval_to_dictionary(lua_State* L,int lo, Dictionary** outValue) return false; bool ok = true; -#if COCOS2D_DEBUG >=1 + tolua_Error tolua_err; if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -843,14 +880,15 @@ bool luaval_to_array_of_Point(lua_State* L,int lo,Point **points, int *numPoints bool ok = true; -#if COCOS2D_DEBUG >=1 tolua_Error tolua_err; + if (!tolua_istable(L, lo, 0, &tolua_err) ) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif ok = false; } -#endif if (ok) { @@ -866,7 +904,9 @@ bool luaval_to_array_of_Point(lua_State* L,int lo,Point **points, int *numPoints lua_gettable(L,lo); if (!tolua_istable(L,-1, 0, &tolua_err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&tolua_err); +#endif lua_pop(L, 1); free(array); return false; @@ -918,7 +958,9 @@ bool luavals_variadic_to_array(lua_State* L,int argc, Array** ret) tolua_Error err; if (!tolua_isusertype(L, i + 2, "Object", 0, &err)) { +#if COCOS2D_DEBUG >=1 luaval_to_native_err(L,"#ferror:",&err); +#endif ok = false; break; } diff --git a/scripting/lua/cocos2dx_support/LuaBasicConversions.h b/scripting/lua/cocos2dx_support/LuaBasicConversions.h index 87171e0782..20167170df 100644 --- a/scripting/lua/cocos2dx_support/LuaBasicConversions.h +++ b/scripting/lua/cocos2dx_support/LuaBasicConversions.h @@ -16,6 +16,12 @@ extern std::map g_luaType; void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err); #endif +#define LUA_PRECONDITION( condition, ...) if( ! (condition) ) { \ +cocos2d::log("lua: ERROR: File %s: Line: %d, Function: %s", __FILE__, __LINE__, __FUNCTION__ ); \ +cocos2d::log(__VA_ARGS__); \ +} \ + +extern bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def); // to native extern bool luaval_to_int32(lua_State* L,int lo,int* outValue); extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue); diff --git a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id index 59e1eb54ca..69096bc408 100644 --- a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id @@ -1 +1 @@ -e2ec824824096631a51472eab29643b0f55ef6f3 \ No newline at end of file +82873a7bab5c684b380655f714ef4627c2cc597c \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id index 8209aca090..3c896211b1 100644 --- a/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id @@ -1 +1 @@ -8b050405631c049752c3abcbbdf1175624cc1d2a \ No newline at end of file +9b2a5b3fafa8e400f433eb3cd1875a43374df67e \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp b/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp index 275f08edf0..0f4becdbfe 100644 --- a/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp +++ b/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp @@ -251,11 +251,10 @@ static int tolua_cocos2d_Menu_create(lua_State* tolua_S) uint32_t i = 1; while (i <= argc) { +#if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S, 1 + i, "MenuItem", 0, &tolua_err)) - { goto tolua_lerror; - return 0; - } +#endif cocos2d::Object* item = static_cast(tolua_tousertype(tolua_S, 1 + i, NULL)); if (NULL != item) @@ -660,6 +659,8 @@ static int tolua_cocos2d_Layer_registerScriptKeypadHandler(lua_State* tolua_S) } #endif + argc = lua_gettop(tolua_S) - 1; + if (1 == argc) { #if COCOS2D_DEBUG >= 1 @@ -705,6 +706,8 @@ static int tolua_cocos2d_Layer_unregisterScriptKeypadHandler(lua_State* tolua_S) } #endif + argc = lua_gettop(tolua_S) - 1; + if (0 == argc) { ScriptHandlerMgr::getInstance()->removeObjectHandler(self, ScriptHandlerMgr::kKeypadHandler); @@ -927,11 +930,10 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) uint32_t i = 1; while (i <= argc) { +#if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err)) - { goto tolua_lerror; - return 0; - } +#endif cocos2d::Object* item = static_cast(tolua_tousertype(tolua_S, 1 + i, NULL)); if (NULL != item) @@ -1248,11 +1250,10 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) uint32_t i = 1; while (i <= argc) { +#if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err)) - { goto tolua_lerror; - return 0; - } +#endif cocos2d::Object* item = static_cast(tolua_tousertype(tolua_S, 1 + i, NULL)); if (NULL != item) @@ -1603,9 +1604,9 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) int argc = 0; DrawNode* self = nullptr; - -#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S,1,"DrawNode",0,&tolua_err)) goto tolua_lerror; #endif @@ -1645,7 +1646,9 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) if (!tolua_istable(tolua_S,-1, 0, &tolua_err)) { CC_SAFE_DELETE_ARRAY(points); +#if COCOS2D_DEBUG >= 1 goto tolua_lerror; +#endif } if(!luaval_to_point(tolua_S, lua_gettop(tolua_S), &points[i])) diff --git a/scripting/lua/script/Cocos2d.lua b/scripting/lua/script/Cocos2d.lua index 12e853c043..c364c7f32a 100644 --- a/scripting/lua/script/Cocos2d.lua +++ b/scripting/lua/script/Cocos2d.lua @@ -3,6 +3,24 @@ cc = cc or {} cc.DIRECTOR_PROJECTION_2D = 0 cc.DIRECTOR_PROJECTION_3D = 1 +function cc.clampf(value, min_inclusive, max_inclusive) + -- body + local temp = 0 + if min_inclusive > max_inclusive then + temp = min_inclusive + min_inclusive = max_inclusive + max_inclusive = temp + end + + if value < min_inclusive then + return min_inclusive + elseif value < max_inclusive then + return value + else + return max_inclusive + end +end + --Point function cc.p(_x,_y) if nil == _y then @@ -24,6 +42,10 @@ function cc.pMul(pt1,factor) return { x = pt1.x * factor , y = pt1.y * factor } end +function cc.pMidpoint(pt1,pt2) + return { x = (pt1.x + pt2.x) / 2.0 , y = ( pt1.y + pt2.y) / 2.0 } +end + function cc.pForAngle(a) return { x = math.cos(a), y = math.sin(a) } end @@ -33,7 +55,7 @@ function cc.pGetLength(pt) end function cc.pNormalize(pt) - local length = cc.getPointLength(pt) + local length = cc.pGetLength(pt) if 0 == length then return { x = 1.0,y = 0.0 } end @@ -53,7 +75,7 @@ function cc.pToAngleSelf(self) return math.atan2(self.y, self.x) end -function cc.pToAngle(self,other) +function cc.pGetAngle(self,other) local a2 = cc.pNormalize(self) local b2 = cc.pNormalize(other) local angle = math.atan2(cc.pCross(a2, b2), cc.pDot(a2, b2) ) @@ -98,6 +120,78 @@ function cc.pIsLineIntersect(A, B, C, D, s, t) return true,s,t end +function cc.pPerp(pt) + return { x = -pt.y, y = pt.x } +end + +function cc.RPerp(pt) + return { x = pt.y, y = -pt.x } +end + +function cc.pProject(pt1, pt2) + return { x = pt2.x * (cc.pDot(pt1,pt2) / cc.pDot(pt2,pt2)) , y = pt2.y * (cc.pDot(pt1,pt2) / cc.pDot(pt2,pt2)) } +end + +function cc.pRotate(pt1, pt2) + return { x = pt1.x * pt2.x - pt1.y * pt2.y, y = pt1.x * pt2.y + pt1.y * pt2.x } +end + +function cc.pUnrotate(pt1, pt2) + return { x = pt1.x * pt2.x + pt1.y * pt2.y, pt1.y * pt2.x - pt1.x * pt2.y } +end + +function cc.pLengthSQ(pt) + return cc.pDot(pt) +end + +function cc.pDistanceSQ(pt1,pt2) + return cc.pLengthSQ(cc.pSub(pt1,pt2)) +end + +function cc.pGetClampPoint(pt1,pt2,pt3) + return { x = cc.clampf(pt1.x, pt2.x, pt3.x), y = cc.clampf(pt1.y, pt2.y, pt3.y) } +end + +function cc.pFromSize(sz) + return { x = sz.width, y = sz.height } +end + +function cc.pLerp(pt1,pt2,alpha) + return cc.pAdd(cc.pMul(pt1, 1.0 - alpha), cc.pMul(pt2,alpha) ) +end + +function cc.pFuzzyEqual(pt1,pt2,variance) + if (pt1.x - variance <= pt2.x) and (pt2.x <= pt1.x + variance) and (pt1.y - variance <= pt2.y) and (pt2.y <= pt1.y + variance) then + return true + else + return false + end +end + +function cc.pRotateByAngle(pt1, pt2, angle) + return cc.pAdd(pt2, cc.pRotate( cc.pSub(pt1, pt2),cc.pForAngle(angle))) +end + +function cc.pIsSegmentIntersect(pt1,pt2,pt3,pt4) + local s,t,ret = 0,0,false + ret,s,t =cc.pIsLineIntersect(pt1, pt2, pt3, pt4,s,t) + + if ret and s >= 0.0 and s <= 1.0 and t >= 0.0 and t <= 0.0 then + return true; + end + + return false +end + +function cc.pGetIntersectPoint(pt1,pt2,pt3,pt4) + local s,t, ret = 0,0,false + ret,s,t = cc.pIsLineIntersect(pt1,pt2,pt3,pt4,s,t) + if ret then + return cc.p(pt1.x + s * (pt2.x - pt1.x), pt1.y + s * (pt2.y - pt1.y)) + else + return cc.p(0,0) + end +end --Size function cc.size( _width,_height ) return { width = _width, height = _height } diff --git a/scripting/lua/script/Cocos2dConstants.lua b/scripting/lua/script/Cocos2dConstants.lua index 870f7bad5d..aff994025b 100644 --- a/scripting/lua/script/Cocos2dConstants.lua +++ b/scripting/lua/script/Cocos2dConstants.lua @@ -242,3 +242,14 @@ cc.LANGUAGE_JAPANESE = 8 cc.LANGUAGE_HUNGARIAN = 9 cc.LANGUAGE_PORTUGUESE = 10 cc.LANGUAGE_ARABIC = 11 + +cc.NODE_ON_ENTER = 0 +cc.NODE_ON_EXIT = 1 +cc.NODE_ON_ENTER_TRANSITION_DID_FINISH = 2 +cc.NODE_ON_EXIT_TRANSITION_DID_START = 3 +cc.NODE_ON_CLEAN_UP = 4 + +cc.CONTROL_STEPPER_PART_MINUS = 0 +cc.CONTROL_STEPPER_PART_PLUS = 1 +cc.CONTROL_STEPPER_PART_NONE = 2 + diff --git a/scripting/lua/script/Deprecated.lua b/scripting/lua/script/Deprecated.lua index 1e41223323..75587fb4e9 100644 --- a/scripting/lua/script/Deprecated.lua +++ b/scripting/lua/script/Deprecated.lua @@ -4,13 +4,6 @@ local function deprecatedTip(old_name,new_name) print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") end ---CCDirector class will be Deprecated,begin -local function CCDirectorClassDeprecated( ) - deprecatedTip("CCDirector","cc.Director") - return cc.Director -end -_G["CCDirector"] = CCDirectorClassDeprecated() - --functions of CCDirector will be deprecated,begin local CCDirectorDeprecated = { } @@ -19,18 +12,9 @@ function CCDirectorDeprecated.sharedDirector() return cc.Director:getInstance() end rawset(CCDirector,"sharedDirector",CCDirectorDeprecated.sharedDirector) - --functions of CCDirector will be deprecated,end ---CCDirector class will be Deprecated,end ---CCTextureCache class will be Deprecated,begin -local function CCTextureCacheClassDeprecated( ) - deprecatedTip("CCTextureCache ","cc.TextureCache") - return cc.TextureCache -end -_G["CCTextureCache"] = CCTextureCacheClassDeprecated() - --functions of CCTextureCache will be deprecated begin local CCTextureCacheDeprecated = { } function CCTextureCacheDeprecated.sharedTextureCache() @@ -45,75 +29,49 @@ function CCTextureCacheDeprecated.purgeSharedTextureCache() end rawset(CCTextureCache,"purgeSharedTextureCache",CCTextureCacheDeprecated.purgeSharedTextureCache) --functions of CCTextureCache will be deprecated end ---CCTextureCache class will be Deprecated,end ---CCSpriteFrame class will be Deprecated,begin -local function CCSpriteFrameClassDeprecated( ) - deprecatedTip("CCSpriteFrame ","cc.SpriteFrame") - return cc.SpriteFrame +--functions of CCAnimation will be deprecated begin +local CCAnimationDeprecated = {} +function CCAnimationDeprecated.addSpriteFrameWithFileName(self,...) + deprecatedTip("CCAnimationDeprecated:addSpriteFrameWithFileName","cc.Animation:addSpriteFrameWithFile") + return self:addSpriteFrameWithFile(...) end -_G["CCSpriteFrame"] = CCSpriteFrameClassDeprecated() +rawset(CCAnimation,"addSpriteFrameWithFileName",CCAnimationDeprecated.addSpriteFrameWithFileName) +--functions of CCAnimation will be deprecated end ---CCSpriteFrame class will be Deprecated,end ---CCSprite class will be Deprecated,begin -local function CCSpriteClassDeprecated( ) - deprecatedTip("CCSprite ","cc.Sprite") - return cc.Sprite +--functions of CCAnimationCache will be deprecated begin +local CCAnimationCacheDeprecated = { } +function CCAnimationCacheDeprecated.sharedAnimationCache() + deprecatedTip("CCAnimationCache:sharedAnimationCache","CCAnimationCache:getInstance") + return CCAnimationCache:getInstance() end -_G["CCSprite"] = CCSpriteClassDeprecated() +rawset(CCAnimationCache,"sharedAnimationCache",CCAnimationCacheDeprecated.sharedAnimationCache) ---CCSprite class will be Deprecated,end - ---CCAnimation class will be Deprecated,begin -local function CCAnimationClassDeprecated( ) - deprecatedTip("CCAnimation ","cc.Animation") - return cc.Animation +function CCAnimationCacheDeprecated.purgeSharedAnimationCache() + deprecatedTip("CCAnimationCache:purgeSharedAnimationCache","CCAnimationCache:destroyInstance") + return CCAnimationCache:destroyInstance() end -_G["CCAnimation"] = CCAnimationClassDeprecated() +rawset(CCAnimationCache,"purgeSharedAnimationCache",CCAnimationCacheDeprecated.purgeSharedAnimationCache) ---CCAnimation class will be Deprecated,end - ---CCAnimate class will be Deprecated,begin -local function CCAnimateClassDeprecated( ) - deprecatedTip("CCAnimate ","cc.Animate") - return cc.Animate +function CCAnimationCacheDeprecated.addAnimationsWithFile(self,...) + deprecatedTip("CCAnimationCache:addAnimationsWithFile","cc.AnimationCache:addAnimations") + return self:addAnimations(...) end -_G["CCAnimate"] = CCAnimateClassDeprecated() +rawset(CCAnimationCache,"addAnimationsWithFile",CCAnimationCacheDeprecated.addAnimationsWithFile) ---CCAnimate class will be Deprecated,end - ---CCRepeatForever class will be Deprecated,begin -local function CCRepeatForeverClassDeprecated( ) - deprecatedTip("CCRepeatForever ","cc.RepeatForever") - return cc.RepeatForever +function CCAnimationCacheDeprecated.animationByName(self,...) + deprecatedTip("CCAnimationCache:animationByName","cc.AnimationCache:getAnimation") + return self:getAnimation(...) end -_G["CCRepeatForever"] = CCRepeatForeverClassDeprecated() +rawset(CCAnimationCache,"animationByName",CCAnimationCacheDeprecated.animationByName) ---CCRepeatForever class will be Deprecated,end - ---CCLayer class will be Deprecated,begin -local function CCLayerClassDeprecated( ) - deprecatedTip("CCLayer ","cc.Layer") - return cc.Layer +function CCAnimationCacheDeprecated.removeAnimationByName(self) + deprecatedTip("CCAnimationCache:removeAnimationByName","cc.AnimationCache:removeAnimation") + return self:removeAnimation() end -_G["CCLayer"] = CCLayerClassDeprecated() ---CCLayer class will be Deprecated,end - ---CCScene class will be Deprecated,begin -local function CCSceneClassDeprecated( ) - deprecatedTip("CCScene ","cc.Scene") - return cc.Scene -end -_G["CCScene"] = CCSceneClassDeprecated() ---CCScene class will be Deprecated,end - ---CCFileUtils class will be Deprecated,begin -local function CCFileUtilsClassDeprecated( ) - deprecatedTip("CCFileUtils ","cc.FileUtils") - return cc.FileUtils -end -_G["CCFileUtils"] = CCFileUtilsClassDeprecated() +rawset(CCAnimationCache,"removeAnimationByName",CCAnimationCacheDeprecated.removeAnimationByName) +--functions of CCAnimationCache will be deprecated end --functions of CCFileUtils will be deprecated end local CCFileUtilsDeprecated = { } @@ -129,17 +87,9 @@ function CCFileUtilsDeprecated.purgeFileUtils() end rawset(CCFileUtils,"purgeFileUtils",CCFileUtilsDeprecated.purgeFileUtils) --functions of CCFileUtils will be deprecated end ---CCFileUtils class will be Deprecated,end ---SimpleAudioEngine will be deprecated begin -local function SimpleAudioEngineClassDeprecated( ) - deprecatedTip("SimpleAudioEngine ","cc.SimpleAudioEngine") - return cc.SimpleAudioEngine -end -_G["SimpleAudioEngine"] = SimpleAudioEngineClassDeprecated() --functions of SimpleAudioEngine will be deprecated begin - local SimpleAudioEngineDeprecated = { } function SimpleAudioEngineDeprecated.sharedEngine() deprecatedTip("SimpleAudioEngine:sharedEngine","SimpleAudioEngine:getInstance") @@ -152,276 +102,267 @@ function SimpleAudioEngineDeprecated.playBackgroundMusic(self,...) return self:playMusic(...) end rawset(SimpleAudioEngine,"playBackgroundMusic",SimpleAudioEngineDeprecated.playBackgroundMusic) - --functions of SimpleAudioEngine will be deprecated end ---SimpleAudioEngine class will be Deprecated,end - ---CCMenuItemImage will be deprecated begin -local function CCMenuItemImageClassDeprecated( ) - deprecatedTip("CCMenuItemImage ","cc.MenuItemImage") - return cc.MenuItemImage -end -_G["CCMenuItemImage"] = CCMenuItemImageClassDeprecated( ) - ---CCMenu will be deprecated end - ---CCMenu will be deprecated begin -local function CCMenuClassDeprecated( ) - deprecatedTip("CCMenu ","cc.Menu") - return cc.Menu -end -_G["CCMenu"] = cc.Menu - ---functions of SimpleAudioEngine will be deprecated begin - +--functions of CCMenu will be deprecated begin local CCMenuDeprecated = { } function CCMenuDeprecated.createWithItem(self,...) - deprecatedTip("CCMenuDeprecated:createWithItem","cc.Menu:create") + deprecatedTip("CCMenuDeprecated:createWithItem","cc.Menu:createWithItem") return self:create(...) end rawset(CCMenu,"createWithItem",CCMenuDeprecated.createWithItem) ---functions of SimpleAudioEngine will be deprecated end +--functions of CCMenu will be deprecated end ---CCMenu will be deprecated end +--functions of CCNode will be deprecated begin +local CCNodeDeprecated = { } +function CCNodeDeprecated.boundingBox(self) + deprecatedTip("CCNode:boundingBox","cc.Node:getBoundingBox") + return self:getBoundingBox() +end +rawset(CCNode,"boundingBox",CCNodeDeprecated.boundingBox) + + +function CCNodeDeprecated.numberOfRunningActions(self) + deprecatedTip("CCNode:numberOfRunningActions","cc.Node:getNumberOfRunningActions") + return self:getNumberOfRunningActions() +end +rawset(CCNode,"numberOfRunningActions",CCNodeDeprecated.numberOfRunningActions) + + +function CCNodeDeprecated.removeFromParentAndCleanup(self,...) + deprecatedTip("CCNode:removeFromParentAndCleanup","cc.Node:removeFromParent") + return self:removeFromParent(...) +end +rawset(CCNode,"removeFromParentAndCleanup",CCNodeDeprecated.removeFromParentAndCleanup) +--functions of CCNode will be deprecated end + +--CCDrawPrimitives will be deprecated begin +local function CCDrawPrimitivesClassDeprecated() + deprecatedTip("CCDrawPrimitives","cc.DrawPrimitives") + return cc.DrawPrimitives +end +_G["CCDrawPrimitives"] = CCDrawPrimitivesClassDeprecated() +--functions of CCDrawPrimitives will be deprecated begin +local CCDrawPrimitivesDeprecated = { } +function CCDrawPrimitivesDeprecated.ccDrawPoint(pt) + deprecatedTip("ccDrawPoint","cc.DrawPrimitives.drawPoint") + return cc.DrawPrimitives.drawPoint(pt) +end +rawset(_G, "ccDrawPoint", CCDrawPrimitivesDeprecated.ccDrawPoint) + +function CCDrawPrimitivesDeprecated.ccDrawLine(origin,destination) + deprecatedTip("ccDrawLine","cc.DrawPrimitives.drawLine") + return cc.DrawPrimitives.drawLine(origin,destination) +end +rawset(_G, "ccDrawLine", CCDrawPrimitivesDeprecated.ccDrawLine) + +function CCDrawPrimitivesDeprecated.ccDrawRect(origin,destination) + deprecatedTip("ccDrawRect","cc.DrawPrimitives.drawRect") + return cc.DrawPrimitives.drawRect(origin,destination) +end +rawset(_G, "ccDrawRect", CCDrawPrimitivesDeprecated.ccDrawRect) + +function CCDrawPrimitivesDeprecated.ccDrawSolidRect(origin,destination,color) + deprecatedTip("ccDrawSolidRect","cc.DrawPrimitives.drawSolidRect") + return cc.DrawPrimitives.drawSolidRect(origin,destination,color) +end +rawset(_G, "ccDrawSolidRect", CCDrawPrimitivesDeprecated.ccDrawSolidRect) + +-- params:... may represent two param(xScale,yScale) or nil +function CCDrawPrimitivesDeprecated.ccDrawCircle(center,radius,angle,segments,drawLineToCenter,...) + deprecatedTip("ccDrawCircle","cc.DrawPrimitives.drawCircle") + return cc.DrawPrimitives.drawCircle(center,radius,angle,segments,drawLineToCenter,...) +end +rawset(_G, "ccDrawCircle", CCDrawPrimitivesDeprecated.ccDrawCircle) + +-- params:... may represent two param(xScale,yScale) or nil +function CCDrawPrimitivesDeprecated.ccDrawSolidCircle(center,radius,angle,segments,...) + deprecatedTip("ccDrawSolidCircle","cc.DrawPrimitives.drawSolidCircle") + return cc.DrawPrimitives.drawSolidCircle(center,radius,angle,segments,...) +end +rawset(_G, "ccDrawSolidCircle", CCDrawPrimitivesDeprecated.ccDrawSolidCircle) + +function CCDrawPrimitivesDeprecated.ccDrawQuadBezier(origin,control,destination,segments) + deprecatedTip("ccDrawQuadBezier","cc.DrawPrimitives.drawQuadBezier") + return cc.DrawPrimitives.drawQuadBezier(origin,control,destination,segments) +end +rawset(_G, "ccDrawQuadBezier", CCDrawPrimitivesDeprecated.ccDrawQuadBezier) + +function CCDrawPrimitivesDeprecated.ccDrawCubicBezier(origin,control1,control2,destination,segments) + deprecatedTip("ccDrawCubicBezier","cc.DrawPrimitives.drawCubicBezier") + return cc.DrawPrimitives.drawCubicBezier(origin,control1,control2,destination,segments) +end +rawset(_G, "ccDrawCubicBezier", CCDrawPrimitivesDeprecated.ccDrawCubicBezier) + +function CCDrawPrimitivesDeprecated.ccDrawCatmullRom(arrayOfControlPoints,segments) + deprecatedTip("ccDrawCatmullRom","cc.DrawPrimitives.drawCatmullRom") + return cc.DrawPrimitives.drawCatmullRom(arrayOfControlPoints,segments) +end +rawset(_G, "ccDrawCatmullRom", CCDrawPrimitivesDeprecated.ccDrawCatmullRom) + +function CCDrawPrimitivesDeprecated.ccDrawCardinalSpline(config,tension,segments) + deprecatedTip("ccDrawCardinalSpline","cc.DrawPrimitives.drawCardinalSpline") + return cc.DrawPrimitives.drawCardinalSpline(config,tension,segments) +end +rawset(_G, "ccDrawCardinalSpline", CCDrawPrimitivesDeprecated.ccDrawCardinalSpline) + +function CCDrawPrimitivesDeprecated.ccDrawColor4B(r,g,b,a) + deprecatedTip("ccDrawColor4B","cc.DrawPrimitives.drawColor4B") + return cc.DrawPrimitives.drawColor4B(r,g,b,a) +end +rawset(_G, "ccDrawColor4B", CCDrawPrimitivesDeprecated.ccDrawColor4B) + +function CCDrawPrimitivesDeprecated.ccDrawColor4F(r,g,b,a) + deprecatedTip("ccDrawColor4F","cc.DrawPrimitives.drawColor4F") + return cc.DrawPrimitives.drawColor4F(r,g,b,a) +end +rawset(_G, "ccDrawColor4F", CCDrawPrimitivesDeprecated.ccDrawColor4F) + +function CCDrawPrimitivesDeprecated.ccPointSize(pointSize) + deprecatedTip("ccPointSize","cc.DrawPrimitives.setPointSize") + return cc.DrawPrimitives.setPointSize(pointSize) +end +rawset(_G, "ccPointSize", CCDrawPrimitivesDeprecated.ccPointSize) +--functions of CCDrawPrimitives will be deprecated end +--CCDrawPrimitives will be deprecated end + +local CCProgressTimerDeprecated = {} +function CCProgressTimerDeprecated.setReverseProgress(self,...) + deprecatedTip("CCProgressTimer","CCProgressTimer:setReverseDirection") + return self:setReverseDirection(...) +end +rawset(CCProgressTimer,"setReverseProgress",CCProgressTimerDeprecated.setReverseProgress) + +--functions of CCSpriteFrameCache will be deprecated begin +local CCSpriteFrameCacheDeprecated = { } +function CCSpriteFrameCacheDeprecated.spriteFrameByName(self,szName) + deprecatedTip("CCSpriteFrameCache:spriteFrameByName","CCSpriteFrameCache:getSpriteFrameByName") + return self:getSpriteFrameByName(szName) +end +rawset(CCSpriteFrameCache,"spriteFrameByName",CCSpriteFrameCacheDeprecated.spriteFrameByName) + +function CCSpriteFrameCacheDeprecated.sharedSpriteFrameCache() + deprecatedTip("CCSpriteFrameCache:sharedSpriteFrameCache","CCSpriteFrameCache:getInstance") + return CCSpriteFrameCache:getInstance() +end +rawset(CCSpriteFrameCache,"sharedSpriteFrameCache",CCSpriteFrameCacheDeprecated.sharedSpriteFrameCache) + +function CCSpriteFrameCacheDeprecated.purgeSharedSpriteFrameCache() + deprecatedTip("CCSpriteFrameCache:purgeSharedSpriteFrameCache","CCSpriteFrameCache:destroyInstance") + return CCSpriteFrameCache:destroyInstance() +end +rawset(CCSpriteFrameCache,"purgeSharedSpriteFrameCache",CCSpriteFrameCacheDeprecated.purgeSharedSpriteFrameCache) + +function CCSpriteFrameCacheDeprecated.addSpriteFramesWithFile(self,...) + deprecatedTip("CCSpriteFrameCache:addSpriteFramesWithFile","CCSpriteFrameCache:addSpriteFrames") + return self:addSpriteFrames(...) +end +rawset(CCSpriteFrameCache,"addSpriteFramesWithFile",CCSpriteFrameCacheDeprecated.addSpriteFramesWithFile) + +function CCSpriteFrameCacheDeprecated.getSpriteFrameByName(self,...) + deprecatedTip("CCSpriteFrameCache:getSpriteFrameByName","CCSpriteFrameCache:getSpriteFrame") + return self:getSpriteFrame(...) +end +rawset(CCSpriteFrameCache,"getSpriteFrameByName",CCSpriteFrameCacheDeprecated.getSpriteFrameByName) +--functions of CCSpriteFrameCache will be deprecated end + +--functions of CCLabelAtlas will be deprecated begin +local CCLabelAtlasDeprecated = {} +function CCLabelAtlasDeprecated.create(self,...) + deprecatedTip("CCLabelAtlas:create","CCLabelAtlas:_create") + return self:_create(...) +end +rawset(CCLabelAtlas,"create",CCLabelAtlasDeprecated.create) +--functions of CCLabelAtlas will be deprecated end + +--functions of CCCamera will be deprecated begin +local CCCameraDeprecated = {} +function CCCameraDeprecated.setUpXYZ(self,...) + deprecatedTip("CCCameraDeprecated:setUpXYZ","CCCameraDeprecated:setUp") + return self:setUp(...) +end +rawset(CCCamera,"setUpXYZ",CCCameraDeprecated.setUpXYZ) + +function CCCameraDeprecated.getUpXYZ(self) + deprecatedTip("CCCameraDeprecated:getUpXYZ","CCCameraDeprecated:getUp") + return self:getUp() +end +rawset(CCCamera,"getUpXYZ",CCCameraDeprecated.getUpXYZ) + +function CCCameraDeprecated.setEyeXYZ(self,...) + deprecatedTip("CCCameraDeprecated:setEyeXYZ","CCCameraDeprecated:setEye") + return self:setEye(...) +end +rawset(CCCamera,"setEyeXYZ",CCCameraDeprecated.setEyeXYZ) + +function CCCameraDeprecated.getEyeXYZ(self) + deprecatedTip("CCCameraDeprecated:getEyeXYZ","CCCameraDeprecated:getEye") + return self:getEye() +end +rawset(CCCamera,"getEyeXYZ",CCCameraDeprecated.getEyeXYZ) + +function CCCameraDeprecated.setCenterXYZ(self,...) + deprecatedTip("CCCameraDeprecated:setCenterXYZ","CCCameraDeprecated:setCenter") + return self:setCenter(...) +end +rawset(CCCamera,"setCenterXYZ",CCCameraDeprecated.setCenterXYZ) + +function CCCameraDeprecated.getCenterXYZ(self) + deprecatedTip("CCCameraDeprecated:getCenterXYZ","CCCameraDeprecated:getCenter") + return self:getCenter() +end +rawset(CCCamera,"getCenterXYZ",CCCameraDeprecated.getCenterXYZ) +--functions of CCCamera will be deprecated end + + +--------------------------- --global functions wil be deprecated, begin local function CCRectMake(x,y,width,height) - deprecatedTip("CCRectMake(x,y,width,height)","CCRect(x,y,width,height) in lua") - return CCRect(x,y,width,height) + deprecatedTip("CCRectMake(x,y,width,height)","cc.rect(x,y,width,height) in lua") + return cc.rect(x,y,width,height) end rawset(_G,"CCRectMake",CCRectMake) ---global functions wil be deprecated, end - ---functions of _G will be deprecated begin -local function ccpLineIntersect(a,b,c,d,s,t) - deprecatedTip("ccpLineIntersect","CCPoint:isLineIntersect") - return CCPoint:isLineIntersect(a,b,c,d,s,t) +local function ccc3(r,g,b) + deprecatedTip("ccc3(r,g,b)","cc.c3b(r,g,b)") + return cc.c3b(r,g,b) end -rawset(_G,"ccpLineIntersect",ccpLineIntersect) - - -local function CCPointMake(x,y) - deprecatedTip("CCPointMake(x,y)","CCPoint(x,y)") - return CCPoint(x,y) -end -rawset(_G,"CCPointMake",CCPointMake) +rawset(_G,"ccc3",ccc3) local function ccp(x,y) - deprecatedTip("ccp(x,y)","CCPoint(x,y)") - return CCPoint(x,y) + deprecatedTip("ccp(x,y)","cc.p(x,y)") + return cc.p(x,y) end rawset(_G,"ccp",ccp) local function CCSizeMake(width,height) - deprecatedTip("CCSizeMake(width,height)","CCSize(width,height)") - return CCSize(width,height) + deprecatedTip("CCSizeMake(width,height)","cc.size(width,height)") + return cc.size(width,height) end rawset(_G,"CCSizeMake",CCSizeMake) -local function ccpNeg(pt) - deprecatedTip("ccpNeg","CCPoint.__sub") - return CCPoint.__sub(CCPoint:new_local(0,0),pt) -end -rawset(_G,"ccpNeg",ccpNeg) - -local function ccpAdd(pt1,pt2) - deprecatedTip("ccpAdd","CCPoint.__add") - return CCPoint.__add(pt1,pt2) -end -rawset(_G,"ccpAdd",ccpAdd) - -local function ccpSub(pt1,pt2) - deprecatedTip("ccpSub","CCPoint.__sub") - return CCPoint.__sub(pt1,pt2) -end -rawset(_G,"ccpSub",ccpSub) - -local function ccpMult(pt,factor) - deprecatedTip("ccpMult","CCPoint.__mul") - return CCPoint.__mul(pt,factor) -end -rawset(_G,"ccpMult",ccpMult) - -local function ccpMidpoint(pt1,pt2) - deprecatedTip("ccpMidpoint","CCPoint:getMidpoint") - return pt1:getMidpoint(pt2) -end -rawset(_G,"ccpMidpoint",ccpMidpoint) - -local function ccpDot(pt1,pt2) - deprecatedTip("ccpDot","CCPoint:dot") - return pt1:dot(pt2) -end -rawset(_G,"ccpDot",ccpDot) - -local function ccpCross(pt1,pt2) - deprecatedTip("ccpCross","CCPoint:cross") - return pt1:cross(pt2) -end -rawset(_G,"ccpCross",ccpCross) - -local function ccpPerp(pt) - deprecatedTip("ccpPerp","CCPoint:getPerp") - return pt:getPerp() -end -rawset(_G,"ccpPerp",ccpPerp) - -local function ccpRPerp(pt) - deprecatedTip("ccpRPerp","CCPoint:getRPerp") - return pt:getRPerp() -end -rawset(_G,"ccpRPerp",ccpRPerp) - -local function ccpProject(pt1,pt2) - deprecatedTip("ccpProject","CCPoint:project") - return pt1:project(pt2) -end -rawset(_G,"ccpProject",ccpProject) - -local function ccpRotate(pt1,pt2) - deprecatedTip("ccpRotate","CCPoint:rotate") - return pt1:rotate(pt2) -end -rawset(_G,"ccpRotate",ccpRotate) - -local function ccpUnrotate(pt1,pt2) - deprecatedTip("ccpUnrotate","CCPoint:unrotate") - return pt1:unrotate(pt2) -end -rawset(_G,"ccpUnrotate",ccpUnrotate) - -local function ccpLengthSQ(pt) - deprecatedTip("ccpLengthSQ","CCPoint:getLengthSq") - return pt:getLengthSq(pt) -end -rawset(_G,"ccpLengthSQ",ccpLengthSQ) - -local function ccpDistanceSQ(pt1,pt2) - deprecatedTip("ccpDistanceSQ","CCPoint:__sub(pt1,pt2):getLengthSq") - return (CCPoint.__sub(pt1,pt2)):getLengthSq() -end -rawset(_G,"ccpDistanceSQ",ccpDistanceSQ) - -local function ccpLength(pt) - deprecatedTip("ccpLength","CCPoint:getLength") - return pt:getLength() -end -rawset(_G,"ccpLength",ccpLength) - -local function ccpDistance(pt1,pt2) - deprecatedTip("ccpDistance","CCPoint:getDistance") - return pt1:getDistance(pt2) -end -rawset(_G,"ccpDistance",ccpDistance) - -local function ccpNormalize(pt) - deprecatedTip("ccpNormalize","CCPoint:normalize") - return pt:normalize() -end -rawset(_G,"ccpNormalize",ccpNormalize) - -local function ccpForAngle(angle) - deprecatedTip("ccpForAngle","CCPoint:forAngle") - return CCPoint:forAngle(angle) -end -rawset(_G,"ccpForAngle",ccpForAngle) - -local function ccpToAngle(pt) - deprecatedTip("ccpToAngle","CCPoint:getAngle") - return pt:getAngle() -end -rawset(_G,"ccpToAngle",ccpToAngle) - -local function ccpClamp(pt1,pt2,pt3) - deprecatedTip("ccpClamp","CCPoint:getClampPoint") - return pt1:getClampPoint(pt2, pt3) -end -rawset(_G,"ccpClamp",ccpClamp) - - -local function ccpFromSize(sz) - deprecatedTip("ccpFromSize(sz)","CCPoint(sz)") - return CCPoint(sz) -end -rawset(_G,"ccpFromSize",ccpFromSize) - -local function ccpLerp(pt1,pt2,alpha) - deprecatedTip("ccpLerp","CCPoint:lerp") - return pt1:lerp(pt2,alpha) -end -rawset(_G,"ccpLerp",ccpLerp) - -local function ccpFuzzyEqual(pt1,pt2,variance) - deprecatedTip("ccpFuzzyEqual","CCPoint:fuzzyEquals") - return pt1:fuzzyEquals(pt2,variance) -end -rawset(_G,"ccpFuzzyEqual",ccpFuzzyEqual) - -local function ccpCompMult(pt1,pt2) - deprecatedTip("ccpCompMult","CCPoint") - return CCPoint(pt1.x * pt2.x , pt1.y * pt2.y) -end -rawset(_G,"ccpCompMult",ccpCompMult) - -local function ccpAngleSigned(pt1,pt2) - deprecatedTip("ccpAngleSigned","CCPoint:getAngle") - return pt1:getAngle(pt2) -end -rawset(_G,"ccpAngleSigned",ccpAngleSigned) - -local function ccpAngle(pt1,pt2) - deprecatedTip("ccpAngle","CCPoint:getAngle") - return pt1:getAngle(pt2) -end -rawset(_G,"ccpAngle",ccpAngle) - -local function ccpRotateByAngle(pt1,pt2,angle) - deprecatedTip("ccpRotateByAngle","CCPoint:rotateByAngle") - return pt1:rotateByAngle(pt2, angle) -end -rawset(_G,"ccpRotateByAngle",ccpRotateByAngle) - -local function ccpSegmentIntersect(pt1,pt2,pt3,pt4) - deprecatedTip("ccpSegmentIntersect","CCPoint:isSegmentIntersect") - return CCPoint:isSegmentIntersect(pt1,pt2,pt3,pt4) -end -rawset(_G,"ccpSegmentIntersect",ccpSegmentIntersect) - -local function ccpIntersectPoint(pt1,pt2,pt3,pt4) - deprecatedTip("ccpIntersectPoint","CCPoint:getIntersectPoint") - return CCPoint:getIntersectPoint(pt1,pt2,pt3,pt4) -end -rawset(_G,"ccpIntersectPoint",ccpIntersectPoint) - -local function ccc3(r,g,b) - deprecatedTip("ccc3(r,g,b)","ccColor3B(r,g,b)") - return ccColor3B(r,g,b) -end -rawset(_G,"ccc3",ccc3) - local function ccc4(r,g,b,a) - deprecatedTip("ccc4(r,g,b,a)","Color4B(r,g,b,a)") - return Color4B(r,g,b,a) + deprecatedTip("ccc4(r,g,b,a)","cc.c4b(r,g,b,a)") + return cc.c4b(r,g,b,a) end rawset(_G,"ccc4",ccc4) local function ccc4FFromccc3B(color3B) - deprecatedTip("ccc4FFromccc3B(color3B)","Color4F(color3B.r / 255.0,color3B.g / 255.0,color3B.b / 255.0,1.0)") - return Color4F(color3B.r/255.0, color3B.g/255.0, color3B.b/255.0, 1.0) + deprecatedTip("ccc4FFromccc3B(color3B)","cc.c4f(color3B.r / 255.0,color3B.g / 255.0,color3B.b / 255.0,1.0)") + return cc.c4f(color3B.r/255.0, color3B.g/255.0, color3B.b/255.0, 1.0) end rawset(_G,"ccc4FFromccc3B",ccc4FFromccc3B) local function ccc4f(r,g,b,a) - deprecatedTip("ccc4f(r,g,b,a)","Color4F(r,g,b,a)") - return Color4F(r,g,b,a) + deprecatedTip("ccc4f(r,g,b,a)","cc.c4f(r,g,b,a)") + return cc.c4f(r,g,b,a) end rawset(_G,"ccc4f",ccc4f) local function ccc4FFromccc4B(color4B) - deprecatedTip("ccc4FFromccc4B(color4B)","Color4F(color4B.r/255.0, color4B.g/255.0, color4B.b/255.0, color4B.a/255.0)") - return Color4F(color4B.r/255.0, color4B.g/255.0, color4B.b/255.0, color4B.a/255.0) + deprecatedTip("ccc4FFromccc4B(color4B)","cc.c4f(color4B.r/255.0, color4B.g/255.0, color4B.b/255.0, color4B.a/255.0)") + return cc.c4f(color4B.r/255.0, color4B.g/255.0, color4B.b/255.0, color4B.a/255.0) end rawset(_G,"ccc4FFromccc4B",ccc4FFromccc4B) @@ -430,6 +371,200 @@ local function ccc4FEqual(a,b) return a:equals(b) end rawset(_G,"ccc4FEqual",ccc4FEqual) +--global functions wil be deprecated, end + + +--functions of _G will be deprecated begin +local function ccpLineIntersect(a,b,c,d,s,t) + deprecatedTip("ccpLineIntersect","cc.pIsLineIntersect") + return cc.pIsLineIntersect(a,b,c,d,s,t) +end +rawset(_G,"ccpLineIntersect",ccpLineIntersect) + + +local function CCPointMake(x,y) + deprecatedTip("CCPointMake(x,y)","cc.p(x,y)") + return cc.p(x,y) +end +rawset(_G,"CCPointMake",CCPointMake) + + + +local function ccpNeg(pt) + deprecatedTip("ccpNeg","cc.pSub") + return cc.pSub({x = 0,y = 0}, pt) +end +rawset(_G,"ccpNeg",ccpNeg) + +local function ccpAdd(pt1,pt2) + deprecatedTip("ccpAdd","cc.pAdd") + return cc.pAdd(pt1,pt2) +end +rawset(_G,"ccpAdd",ccpAdd) + +local function ccpSub(pt1,pt2) + deprecatedTip("ccpSub","cc.pSub") + return cc.pSub(pt1,pt2) +end +rawset(_G,"ccpSub",ccpSub) + +local function ccpMult(pt,factor) + deprecatedTip("ccpMult","cc.pMul") + return cc.pMul(pt,factor) +end +rawset(_G,"ccpMult",ccpMult) + +local function ccpMidpoint(pt1,pt2) + deprecatedTip("ccpMidpoint","cc.pMidpoint") + return cc.pMidpoint(pt1,pt2) +end +rawset(_G,"ccpMidpoint",ccpMidpoint) + +local function ccpDot(pt1,pt2) + deprecatedTip("ccpDot","cc.pDot") + return cc.pDot(pt1,pt2) +end +rawset(_G,"ccpDot",ccpDot) + +local function ccpCross(pt1,pt2) + deprecatedTip("ccpCross","cc.pCross") + return cc.pCross(pt1, pt2) +end +rawset(_G,"ccpCross",ccpCross) + +local function ccpPerp(pt) + deprecatedTip("ccpPerp","cc.pPerp") + return cc.pPerp(pt) +end +rawset(_G,"ccpPerp",ccpPerp) + +local function ccpRPerp(pt) + deprecatedTip("ccpRPerp","cc.RPerp") + return cc.RPerp(pt) +end +rawset(_G,"ccpRPerp",ccpRPerp) + +local function ccpProject(pt1,pt2) + deprecatedTip("ccpProject","cc.pProject") + return cc.pProject(pt1,pt2) +end +rawset(_G,"ccpProject",ccpProject) + +local function ccpRotate(pt1,pt2) + deprecatedTip("ccpRotate","cc.pRotate") + return cc.pRotate(pt1,pt2) +end +rawset(_G,"ccpRotate",ccpRotate) + +local function ccpUnrotate(pt1,pt2) + deprecatedTip("ccpUnrotate","cc.pUnrotate") + return cc.pUnrotate(pt1,pt2) +end +rawset(_G,"ccpUnrotate",ccpUnrotate) + +local function ccpLengthSQ(pt) + deprecatedTip("ccpLengthSQ","cc.pLengthSQ") + return cc.pLengthSQ(pt) +end +rawset(_G,"ccpLengthSQ",ccpLengthSQ) + +local function ccpDistanceSQ(pt1,pt2) + deprecatedTip("ccpDistanceSQ","cc.pDistanceSQ") + return cc.pDistanceSQ(pt1,pt2) +end +rawset(_G,"ccpDistanceSQ",ccpDistanceSQ) + +local function ccpLength(pt) + deprecatedTip("ccpLength","cc.pGetLength") + return cc.pGetLength(pt) +end +rawset(_G,"ccpLength",ccpLength) + +local function ccpDistance(pt1,pt2) + deprecatedTip("ccpDistance","cc.pGetDistance") + return cc.pGetDistance(pt1, pt2) +end +rawset(_G,"ccpDistance",ccpDistance) + +local function ccpNormalize(pt) + deprecatedTip("ccpNormalize","cc.pNormalize") + return cc.pNormalize(pt) +end +rawset(_G,"ccpNormalize",ccpNormalize) + +local function ccpForAngle(angle) + deprecatedTip("ccpForAngle","cc.pForAngle") + return cc.pForAngle(angle) +end +rawset(_G,"ccpForAngle",ccpForAngle) + +local function ccpToAngle(pt) + deprecatedTip("ccpToAngle","cc.pToAngleSelf") + return cc.pToAngleSelf(pt) +end +rawset(_G,"ccpToAngle",ccpToAngle) + +local function ccpClamp(pt1,pt2,pt3) + deprecatedTip("ccpClamp","cc.pGetClampPoint") + return cc.pGetClampPoint(pt1,pt2,pt3) +end +rawset(_G,"ccpClamp",ccpClamp) + + +local function ccpFromSize(sz) + deprecatedTip("ccpFromSize(sz)","cc.pFromSize") + return cc.pFromSize(sz) +end +rawset(_G,"ccpFromSize",ccpFromSize) + +local function ccpLerp(pt1,pt2,alpha) + deprecatedTip("ccpLerp","cc.pLerp") + return cc.pLerp(pt1,pt2,alpha) +end +rawset(_G,"ccpLerp",ccpLerp) + +local function ccpFuzzyEqual(pt1,pt2,variance) + deprecatedTip("ccpFuzzyEqual","cc.pFuzzyEqual") + return cc.pFuzzyEqual(pt1,pt2,variance) +end +rawset(_G,"ccpFuzzyEqual",ccpFuzzyEqual) + +local function ccpCompMult(pt1,pt2) + deprecatedTip("ccpCompMult","cc.p") + return cc.p(pt1.x * pt2.x , pt1.y * pt2.y) +end +rawset(_G,"ccpCompMult",ccpCompMult) + +local function ccpAngleSigned(pt1,pt2) + deprecatedTip("ccpAngleSigned","cc.pGetAngle") + return cc.pGetAngle(pt1, pt2) +end +rawset(_G,"ccpAngleSigned",ccpAngleSigned) + +local function ccpAngle(pt1,pt2) + deprecatedTip("ccpAngle","cc.pGetAngle") + return cc.pGetAngle(pt1,ptw) +end +rawset(_G,"ccpAngle",ccpAngle) + +local function ccpRotateByAngle(pt1,pt2,angle) + deprecatedTip("ccpRotateByAngle","cc.pRotateByAngle") + return cc.pRotateByAngle(pt1, pt2, angle) +end +rawset(_G,"ccpRotateByAngle",ccpRotateByAngle) + +local function ccpSegmentIntersect(pt1,pt2,pt3,pt4) + deprecatedTip("ccpSegmentIntersect","cc.pIsSegmentIntersect") + return cc.pIsSegmentIntersect(pt1,pt2,pt3,pt4) +end +rawset(_G,"ccpSegmentIntersect",ccpSegmentIntersect) + +local function ccpIntersectPoint(pt1,pt2,pt3,pt4) + deprecatedTip("ccpIntersectPoint","cc.pGetIntersectPoint") + return cc.pGetIntersectPoint(pt1,pt2,pt3,pt4) +end +rawset(_G,"ccpIntersectPoint",ccpIntersectPoint) + local function vertex2(x,y) deprecatedTip("vertex2(x,y)","Vertex2F(x,y)") @@ -546,12 +681,6 @@ local function ccV2FC4FT2FQuadDeprecated() end _G["ccV2F_C4F_T2F_Quad"] = ccV2FC4FT2FQuadDeprecated() -local function ccBlendFuncDeprecated() - deprecatedTip("ccBlendFunc","BlendFunc") - return BlendFunc -end -_G["ccBlendFunc"] = ccBlendFuncDeprecated() - local function ccT2FQuadDeprecated() deprecatedTip("ccT2F_Quad","T2F_Quad") return T2F_Quad @@ -564,13 +693,6 @@ local function ccAnimationFrameDataDeprecated() end _G["ccAnimationFrameData"] = ccAnimationFrameDataDeprecated() -local function CCCallFuncNDeprecated( ) - deprecatedTip("CCCallFuncN","CCCallFunc") - return CCCallFunc -end -_G["CCCallFuncN"] = CCCallFuncNDeprecated() ---functions of _G will be deprecated end - --functions of CCControl will be deprecated end local CCControlDeprecated = { } @@ -628,23 +750,6 @@ end rawset(CCUserDefault,"purgeSharedUserDefault",CCUserDefaultDeprecated.purgeSharedUserDefault) --functions of CCUserDefault will be deprecated end - ---functions of CCNotificationCenter will be deprecated end -local CCNotificationCenterDeprecated = { } -function CCNotificationCenterDeprecated.sharedNotificationCenter() - deprecatedTip("CCNotificationCenter:sharedNotificationCenter","CCNotificationCenter:getInstance") - return CCNotificationCenter:getInstance() -end -rawset(CCNotificationCenter,"sharedNotificationCenter",CCNotificationCenterDeprecated.sharedNotificationCenter) - -function CCNotificationCenterDeprecated.purgeNotificationCenter() - deprecatedTip("CCNotificationCenter:purgeNotificationCenter","CCNotificationCenter:destroyInstance") - return CCNotificationCenter:destroyInstance() -end -rawset(CCNotificationCenter,"purgeNotificationCenter",CCNotificationCenterDeprecated.purgeNotificationCenter) ---functions of CCNotificationCenter will be deprecated end - - --functions of CCGrid3DAction will be deprecated begin local CCGrid3DActionDeprecated = { } function CCGrid3DActionDeprecated.vertex(self,pt) @@ -677,38 +782,6 @@ rawset(CCTiledGrid3DAction,"originalTile",CCTiledGrid3DActionDeprecated.original --functions of CCTiledGrid3DAction will be deprecated end ---functions of CCAnimationCache will be deprecated begin -local CCAnimationCacheDeprecated = { } -function CCAnimationCacheDeprecated.sharedAnimationCache() - deprecatedTip("CCAnimationCache:sharedAnimationCache","CCAnimationCache:getInstance") - return CCAnimationCache:getInstance() -end -rawset(CCAnimationCache,"sharedAnimationCache",CCAnimationCacheDeprecated.sharedAnimationCache) - -function CCAnimationCacheDeprecated.purgeSharedAnimationCache() - deprecatedTip("CCAnimationCache:purgeSharedAnimationCache","CCAnimationCache:destroyInstance") - return CCAnimationCache:destroyInstance() -end -rawset(CCAnimationCache,"purgeSharedAnimationCache",CCAnimationCacheDeprecated.purgeSharedAnimationCache) ---functions of CCAnimationCache will be deprecated end - - ---functions of CCNode will be deprecated begin -local CCNodeDeprecated = { } -function CCNodeDeprecated.boundingBox(self) - deprecatedTip("CCNode:boundingBox","CCNode:getBoundingBox") - return self:getBoundingBox() -end -rawset(CCNode,"boundingBox",CCNodeDeprecated.boundingBox) - -function CCNodeDeprecated.numberOfRunningActions(self) - deprecatedTip("CCNode:numberOfRunningActions","CCNode:getNumberOfRunningActions") - return self:getNumberOfRunningActions() -end -rawset(CCNode,"numberOfRunningActions",CCNodeDeprecated.numberOfRunningActions) ---functions of CCNode will be deprecated end - - --functions of CCTexture2D will be deprecated begin local CCTexture2DDeprecated = { } function CCTexture2DDeprecated.stringForFormat(self) @@ -737,28 +810,6 @@ rawset(CCTexture2D,"defaultAlphaPixelFormat",CCTexture2DDeprecated.defaultAlphaP --functions of CCTexture2D will be deprecated end ---functions of CCSpriteFrameCache will be deprecated begin -local CCSpriteFrameCacheDeprecated = { } -function CCSpriteFrameCacheDeprecated.spriteFrameByName(self,szName) - deprecatedTip("CCSpriteFrameCache:spriteFrameByName","CCSpriteFrameCache:getSpriteFrameByName") - return self:getSpriteFrameByName(szName) -end -rawset(CCSpriteFrameCache,"spriteFrameByName",CCSpriteFrameCacheDeprecated.spriteFrameByName) - -function CCSpriteFrameCacheDeprecated.sharedSpriteFrameCache() - deprecatedTip("CCSpriteFrameCache:sharedSpriteFrameCache","CCSpriteFrameCache:getInstance") - return CCSpriteFrameCache:getInstance() -end -rawset(CCSpriteFrameCache,"sharedSpriteFrameCache",CCSpriteFrameCacheDeprecated.sharedSpriteFrameCache) - -function CCSpriteFrameCacheDeprecated.purgeSharedSpriteFrameCache() - deprecatedTip("CCSpriteFrameCache:purgeSharedSpriteFrameCache","CCSpriteFrameCache:destroyInstance") - return CCSpriteFrameCache:destroyInstance() -end -rawset(CCSpriteFrameCache,"purgeSharedSpriteFrameCache",CCSpriteFrameCacheDeprecated.purgeSharedSpriteFrameCache) ---functions of CCSpriteFrameCache will be deprecated end - - --functions of CCTimer will be deprecated begin local CCTimerDeprecated = { } function CCTimerDeprecated.timerWithScriptHandler(handler,seconds) @@ -935,95 +986,6 @@ if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTar end --functions of WebSocket will be deprecated end - ---functions of CCDrawPrimitives will be deprecated begin -local CCDrawPrimitivesDeprecated = { } -function CCDrawPrimitivesDeprecated.ccDrawPoint(pt) - deprecatedTip("ccDrawPoint","CCDrawPrimitives.ccDrawPoint") - return CCDrawPrimitives.ccDrawPoint(pt) -end -rawset(_G, "ccDrawPoint", CCDrawPrimitivesDeprecated.ccDrawPoint) - -function CCDrawPrimitivesDeprecated.ccDrawLine(origin,destination) - deprecatedTip("ccDrawLine","CCDrawPrimitives.ccDrawLine") - return CCDrawPrimitives.ccDrawLine(origin,destination) -end -rawset(_G, "ccDrawLine", CCDrawPrimitivesDeprecated.ccDrawLine) - -function CCDrawPrimitivesDeprecated.ccDrawRect(origin,destination) - deprecatedTip("ccDrawRect","CCDrawPrimitives.ccDrawRect") - return CCDrawPrimitives.ccDrawRect(origin,destination) -end -rawset(_G, "ccDrawRect", CCDrawPrimitivesDeprecated.ccDrawRect) - -function CCDrawPrimitivesDeprecated.ccDrawSolidRect(origin,destination,color) - deprecatedTip("ccDrawSolidRect","CCDrawPrimitives.ccDrawSolidRect") - return CCDrawPrimitives.ccDrawSolidRect(origin,destination,color) -end -rawset(_G, "ccDrawSolidRect", CCDrawPrimitivesDeprecated.ccDrawSolidRect) - --- params:... may represent two param(xScale,yScale) or nil -function CCDrawPrimitivesDeprecated.ccDrawCircle(center,radius,angle,segments,drawLineToCenter,...) - deprecatedTip("ccDrawCircle","CCDrawPrimitives.ccDrawCircle") - return CCDrawPrimitives.ccDrawCircle(center,radius,angle,segments,drawLineToCenter,...) -end -rawset(_G, "ccDrawCircle", CCDrawPrimitivesDeprecated.ccDrawCircle) - --- params:... may represent two param(xScale,yScale) or nil -function CCDrawPrimitivesDeprecated.ccDrawSolidCircle(center,radius,angle,segments,...) - deprecatedTip("ccDrawSolidCircle","CCDrawPrimitives.ccDrawSolidCircle") - return CCDrawPrimitives.ccDrawSolidCircle(center,radius,angle,segments,...) -end -rawset(_G, "ccDrawSolidCircle", CCDrawPrimitivesDeprecated.ccDrawSolidCircle) - -function CCDrawPrimitivesDeprecated.ccDrawQuadBezier(origin,control,destination,segments) - deprecatedTip("ccDrawQuadBezier","CCDrawPrimitives.ccDrawQuadBezier") - return CCDrawPrimitives.ccDrawQuadBezier(origin,control,destination,segments) -end -rawset(_G, "ccDrawQuadBezier", CCDrawPrimitivesDeprecated.ccDrawQuadBezier) - -function CCDrawPrimitivesDeprecated.ccDrawCubicBezier(origin,control1,control2,destination,segments) - deprecatedTip("ccDrawCubicBezier","CCDrawPrimitives.ccDrawCubicBezier") - return CCDrawPrimitives.ccDrawCubicBezier(origin,control1,control2,destination,segments) -end -rawset(_G, "ccDrawCubicBezier", CCDrawPrimitivesDeprecated.ccDrawCubicBezier) - -function CCDrawPrimitivesDeprecated.ccDrawCatmullRom(arrayOfControlPoints,segments) - deprecatedTip("ccDrawCatmullRom","CCDrawPrimitives.ccDrawCatmullRom") - return CCDrawPrimitives.ccDrawCatmullRom(arrayOfControlPoints,segments) -end -rawset(_G, "ccDrawCatmullRom", CCDrawPrimitivesDeprecated.ccDrawCatmullRom) - -function CCDrawPrimitivesDeprecated.ccDrawCardinalSpline(config,tension,segments) - deprecatedTip("ccDrawCardinalSpline","CCDrawPrimitives.ccDrawCardinalSpline") - return CCDrawPrimitives.ccDrawCardinalSpline(config,tension,segments) -end -rawset(_G, "ccDrawCardinalSpline", CCDrawPrimitivesDeprecated.ccDrawCardinalSpline) - -function CCDrawPrimitivesDeprecated.ccDrawColor4B(r,g,b,a) - deprecatedTip("ccDrawColor4B","CCDrawPrimitives.ccDrawColor4B") - return CCDrawPrimitives.ccDrawColor4B(r,g,b,a) -end -rawset(_G, "ccDrawColor4B", CCDrawPrimitivesDeprecated.ccDrawColor4B) - -function CCDrawPrimitivesDeprecated.ccDrawColor4F(r,g,b,a) - deprecatedTip("ccDrawColor4F","CCDrawPrimitives.ccDrawColor4F") - return CCDrawPrimitives.ccDrawColor4F(r,g,b,a) -end -rawset(_G, "ccDrawColor4F", CCDrawPrimitivesDeprecated.ccDrawColor4F) - -function CCDrawPrimitivesDeprecated.ccPointSize(pointSize) - deprecatedTip("ccPointSize","CCDrawPrimitives.ccPointSize") - return CCDrawPrimitives.ccPointSize(pointSize) -end -rawset(_G, "ccPointSize", CCDrawPrimitivesDeprecated.ccPointSize) ---functions of CCDrawPrimitives will be deprecated end - ---enums of CCParticleSystem will be deprecated begin -_G["kParticleStartSizeEqualToEndSize"] = _G["kCCParticleStartSizeEqualToEndSize"] -_G["kParticleDurationInfinity"] = _G["kCCParticleDurationInfinity"] ---enums of CCParticleSystem will be deprecated end - --enums of CCRenderTexture will be deprecated begin local CCRenderTextureDeprecated = { } function CCRenderTextureDeprecated.newCCImage(self) diff --git a/scripting/lua/script/DeprecatedClass.lua b/scripting/lua/script/DeprecatedClass.lua new file mode 100644 index 0000000000..dbd7dfff02 --- /dev/null +++ b/scripting/lua/script/DeprecatedClass.lua @@ -0,0 +1,1827 @@ +-- This is the DeprecatedClass + +DeprecatedClass = {} or DeprecatedClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCProgressTo class will be Deprecated,begin +function DeprecatedClass.CCProgressTo() + deprecatedTip("CCProgressTo","cc.ProgressTo") + return cc.ProgressTo +end +_G["CCProgressTo"] = DeprecatedClass.CCProgressTo() +--CCProgressTo class will be Deprecated,end + +--CCHide class will be Deprecated,begin +function DeprecatedClass.CCHide() + deprecatedTip("CCHide","cc.Hide") + return cc.Hide +end +_G["CCHide"] = DeprecatedClass.CCHide() +--CCHide class will be Deprecated,end + +--CCTransitionMoveInB class will be Deprecated,begin +function DeprecatedClass.CCTransitionMoveInB() + deprecatedTip("CCTransitionMoveInB","cc.TransitionMoveInB") + return cc.TransitionMoveInB +end +_G["CCTransitionMoveInB"] = DeprecatedClass.CCTransitionMoveInB() +--CCTransitionMoveInB class will be Deprecated,end + +--CCEaseSineIn class will be Deprecated,begin +function DeprecatedClass.CCEaseSineIn() + deprecatedTip("CCEaseSineIn","cc.EaseSineIn") + return cc.EaseSineIn +end +_G["CCEaseSineIn"] = DeprecatedClass.CCEaseSineIn() +--CCEaseSineIn class will be Deprecated,end + +--CCTransitionMoveInL class will be Deprecated,begin +function DeprecatedClass.CCTransitionMoveInL() + deprecatedTip("CCTransitionMoveInL","cc.TransitionMoveInL") + return cc.TransitionMoveInL +end +_G["CCTransitionMoveInL"] = DeprecatedClass.CCTransitionMoveInL() +--CCTransitionMoveInL class will be Deprecated,end + +--CCEaseInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseInOut() + deprecatedTip("CCEaseInOut","cc.EaseInOut") + return cc.EaseInOut +end +_G["CCEaseInOut"] = DeprecatedClass.CCEaseInOut() +--CCEaseInOut class will be Deprecated,end + +--SimpleAudioEngine class will be Deprecated,begin +function DeprecatedClass.SimpleAudioEngine() + deprecatedTip("SimpleAudioEngine","cc.SimpleAudioEngine") + return cc.SimpleAudioEngine +end +_G["SimpleAudioEngine"] = DeprecatedClass.SimpleAudioEngine() +--SimpleAudioEngine class will be Deprecated,end + +--CCTransitionMoveInT class will be Deprecated,begin +function DeprecatedClass.CCTransitionMoveInT() + deprecatedTip("CCTransitionMoveInT","cc.TransitionMoveInT") + return cc.TransitionMoveInT +end +_G["CCTransitionMoveInT"] = DeprecatedClass.CCTransitionMoveInT() +--CCTransitionMoveInT class will be Deprecated,end + +--CCTransitionMoveInR class will be Deprecated,begin +function DeprecatedClass.CCTransitionMoveInR() + deprecatedTip("CCTransitionMoveInR","cc.TransitionMoveInR") + return cc.TransitionMoveInR +end +_G["CCTransitionMoveInR"] = DeprecatedClass.CCTransitionMoveInR() +--CCTransitionMoveInR class will be Deprecated,end + +--CCControlHuePicker class will be Deprecated,begin +function DeprecatedClass.CCControlHuePicker() + deprecatedTip("CCControlHuePicker","cc.ControlHuePicker") + return cc.ControlHuePicker +end +_G["CCControlHuePicker"] = DeprecatedClass.CCControlHuePicker() +--CCControlHuePicker class will be Deprecated,end + +--CCParticleSnow class will be Deprecated,begin +function DeprecatedClass.CCParticleSnow() + deprecatedTip("CCParticleSnow","cc.ParticleSnow") + return cc.ParticleSnow +end +_G["CCParticleSnow"] = DeprecatedClass.CCParticleSnow() +--CCParticleSnow class will be Deprecated,end + +--CCActionCamera class will be Deprecated,begin +function DeprecatedClass.CCActionCamera() + deprecatedTip("CCActionCamera","cc.ActionCamera") + return cc.ActionCamera +end +_G["CCActionCamera"] = DeprecatedClass.CCActionCamera() +--CCActionCamera class will be Deprecated,end + +--CCProgressFromTo class will be Deprecated,begin +function DeprecatedClass.CCProgressFromTo() + deprecatedTip("CCProgressFromTo","cc.ProgressFromTo") + return cc.ProgressFromTo +end +_G["CCProgressFromTo"] = DeprecatedClass.CCProgressFromTo() +--CCProgressFromTo class will be Deprecated,end + +--CCMoveTo class will be Deprecated,begin +function DeprecatedClass.CCMoveTo() + deprecatedTip("CCMoveTo","cc.MoveTo") + return cc.MoveTo +end +_G["CCMoveTo"] = DeprecatedClass.CCMoveTo() +--CCMoveTo class will be Deprecated,end + +--CCJumpBy class will be Deprecated,begin +function DeprecatedClass.CCJumpBy() + deprecatedTip("CCJumpBy","cc.JumpBy") + return cc.JumpBy +end +_G["CCJumpBy"] = DeprecatedClass.CCJumpBy() +--CCJumpBy class will be Deprecated,end + +--CCObject class will be Deprecated,begin +function DeprecatedClass.CCObject() + deprecatedTip("CCObject","cc.Object") + return cc.Object +end +_G["CCObject"] = DeprecatedClass.CCObject() +--CCObject class will be Deprecated,end + +--CCTransitionRotoZoom class will be Deprecated,begin +function DeprecatedClass.CCTransitionRotoZoom() + deprecatedTip("CCTransitionRotoZoom","cc.TransitionRotoZoom") + return cc.TransitionRotoZoom +end +_G["CCTransitionRotoZoom"] = DeprecatedClass.CCTransitionRotoZoom() +--CCTransitionRotoZoom class will be Deprecated,end + +--CCControlColourPicker class will be Deprecated,begin +function DeprecatedClass.CCControlColourPicker() + deprecatedTip("CCControlColourPicker","cc.ControlColourPicker") + return cc.ControlColourPicker +end +_G["CCControlColourPicker"] = DeprecatedClass.CCControlColourPicker() +--CCControlColourPicker class will be Deprecated,end + +--CCDirector class will be Deprecated,begin +function DeprecatedClass.CCDirector() + deprecatedTip("CCDirector","cc.Director") + return cc.Director +end +_G["CCDirector"] = DeprecatedClass.CCDirector() +--CCDirector class will be Deprecated,end + +--CCScheduler class will be Deprecated,begin +function DeprecatedClass.CCScheduler() + deprecatedTip("CCScheduler","cc.Scheduler") + return cc.Scheduler +end +_G["CCScheduler"] = DeprecatedClass.CCScheduler() +--CCScheduler class will be Deprecated,end + +--CCEaseElasticOut class will be Deprecated,begin +function DeprecatedClass.CCEaseElasticOut() + deprecatedTip("CCEaseElasticOut","cc.EaseElasticOut") + return cc.EaseElasticOut +end +_G["CCEaseElasticOut"] = DeprecatedClass.CCEaseElasticOut() +--CCEaseElasticOut class will be Deprecated,end + +--CCTableViewCell class will be Deprecated,begin +function DeprecatedClass.CCTableViewCell() + deprecatedTip("CCTableViewCell","cc.TableViewCell") + return cc.TableViewCell +end +_G["CCTableViewCell"] = DeprecatedClass.CCTableViewCell() +--CCTableViewCell class will be Deprecated,end + +--CCEaseBackOut class will be Deprecated,begin +function DeprecatedClass.CCEaseBackOut() + deprecatedTip("CCEaseBackOut","cc.EaseBackOut") + return cc.EaseBackOut +end +_G["CCEaseBackOut"] = DeprecatedClass.CCEaseBackOut() +--CCEaseBackOut class will be Deprecated,end + +--CCParticleSystemQuad class will be Deprecated,begin +function DeprecatedClass.CCParticleSystemQuad() + deprecatedTip("CCParticleSystemQuad","cc.ParticleSystemQuad") + return cc.ParticleSystemQuad +end +_G["CCParticleSystemQuad"] = DeprecatedClass.CCParticleSystemQuad() +--CCParticleSystemQuad class will be Deprecated,end + +--CCMenuItemToggle class will be Deprecated,begin +function DeprecatedClass.CCMenuItemToggle() + deprecatedTip("CCMenuItemToggle","cc.MenuItemToggle") + return cc.MenuItemToggle +end +_G["CCMenuItemToggle"] = DeprecatedClass.CCMenuItemToggle() +--CCMenuItemToggle class will be Deprecated,end + +--CCStopGrid class will be Deprecated,begin +function DeprecatedClass.CCStopGrid() + deprecatedTip("CCStopGrid","cc.StopGrid") + return cc.StopGrid +end +_G["CCStopGrid"] = DeprecatedClass.CCStopGrid() +--CCStopGrid class will be Deprecated,end + +--CCTransitionScene class will be Deprecated,begin +function DeprecatedClass.CCTransitionScene() + deprecatedTip("CCTransitionScene","cc.TransitionScene") + return cc.TransitionScene +end +_G["CCTransitionScene"] = DeprecatedClass.CCTransitionScene() +--CCTransitionScene class will be Deprecated,end + +--CCSkewBy class will be Deprecated,begin +function DeprecatedClass.CCSkewBy() + deprecatedTip("CCSkewBy","cc.SkewBy") + return cc.SkewBy +end +_G["CCSkewBy"] = DeprecatedClass.CCSkewBy() +--CCSkewBy class will be Deprecated,end + +--CCLayer class will be Deprecated,begin +function DeprecatedClass.CCLayer() + deprecatedTip("CCLayer","cc.Layer") + return cc.Layer +end +_G["CCLayer"] = DeprecatedClass.CCLayer() +--CCLayer class will be Deprecated,end + +--CCEaseElastic class will be Deprecated,begin +function DeprecatedClass.CCEaseElastic() + deprecatedTip("CCEaseElastic","cc.EaseElastic") + return cc.EaseElastic +end +_G["CCEaseElastic"] = DeprecatedClass.CCEaseElastic() +--CCEaseElastic class will be Deprecated,end + +--CCTMXTiledMap class will be Deprecated,begin +function DeprecatedClass.CCTMXTiledMap() + deprecatedTip("CCTMXTiledMap","cc.TMXTiledMap") + return cc.TMXTiledMap +end +_G["CCTMXTiledMap"] = DeprecatedClass.CCTMXTiledMap() +--CCTMXTiledMap class will be Deprecated,end + +--CCGrid3DAction class will be Deprecated,begin +function DeprecatedClass.CCGrid3DAction() + deprecatedTip("CCGrid3DAction","cc.Grid3DAction") + return cc.Grid3DAction +end +_G["CCGrid3DAction"] = DeprecatedClass.CCGrid3DAction() +--CCGrid3DAction class will be Deprecated,end + +--CCFadeIn class will be Deprecated,begin +function DeprecatedClass.CCFadeIn() + deprecatedTip("CCFadeIn","cc.FadeIn") + return cc.FadeIn +end +_G["CCFadeIn"] = DeprecatedClass.CCFadeIn() +--CCFadeIn class will be Deprecated,end + +--CCNodeRGBA class will be Deprecated,begin +function DeprecatedClass.CCNodeRGBA() + deprecatedTip("CCNodeRGBA","cc.NodeRGBA") + return cc.NodeRGBA +end +_G["CCNodeRGBA"] = DeprecatedClass.CCNodeRGBA() +--CCNodeRGBA class will be Deprecated,end + +--CCAnimationCache class will be Deprecated,begin +function DeprecatedClass.CCAnimationCache() + deprecatedTip("CCAnimationCache","cc.AnimationCache") + return cc.AnimationCache +end +_G["CCAnimationCache"] = DeprecatedClass.CCAnimationCache() +--CCAnimationCache class will be Deprecated,end + +--CCFlipY3D class will be Deprecated,begin +function DeprecatedClass.CCFlipY3D() + deprecatedTip("CCFlipY3D","cc.FlipY3D") + return cc.FlipY3D +end +_G["CCFlipY3D"] = DeprecatedClass.CCFlipY3D() +--CCFlipY3D class will be Deprecated,end + +--CCEaseSineInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseSineInOut() + deprecatedTip("CCEaseSineInOut","cc.EaseSineInOut") + return cc.EaseSineInOut +end +_G["CCEaseSineInOut"] = DeprecatedClass.CCEaseSineInOut() +--CCEaseSineInOut class will be Deprecated,end + +--CCTransitionFlipAngular class will be Deprecated,begin +function DeprecatedClass.CCTransitionFlipAngular() + deprecatedTip("CCTransitionFlipAngular","cc.TransitionFlipAngular") + return cc.TransitionFlipAngular +end +_G["CCTransitionFlipAngular"] = DeprecatedClass.CCTransitionFlipAngular() +--CCTransitionFlipAngular class will be Deprecated,end + +--CCControl class will be Deprecated,begin +function DeprecatedClass.CCControl() + deprecatedTip("CCControl","cc.Control") + return cc.Control +end +_G["CCControl"] = DeprecatedClass.CCControl() +--CCControl class will be Deprecated,end + +--CCEaseElasticInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseElasticInOut() + deprecatedTip("CCEaseElasticInOut","cc.EaseElasticInOut") + return cc.EaseElasticInOut +end +_G["CCEaseElasticInOut"] = DeprecatedClass.CCEaseElasticInOut() +--CCEaseElasticInOut class will be Deprecated,end + +--CCEaseBounce class will be Deprecated,begin +function DeprecatedClass.CCEaseBounce() + deprecatedTip("CCEaseBounce","cc.EaseBounce") + return cc.EaseBounce +end +_G["CCEaseBounce"] = DeprecatedClass.CCEaseBounce() +--CCEaseBounce class will be Deprecated,end + +--CCShow class will be Deprecated,begin +function DeprecatedClass.CCShow() + deprecatedTip("CCShow","cc.Show") + return cc.Show +end +_G["CCShow"] = DeprecatedClass.CCShow() +--CCShow class will be Deprecated,end + +--CCEditBox class will be Deprecated,begin +function DeprecatedClass.CCEditBox() + deprecatedTip("CCEditBox","cc.EditBox") + return cc.EditBox +end +_G["CCEditBox"] = DeprecatedClass.CCEditBox() +--CCEditBox class will be Deprecated,end + +--CCFadeOut class will be Deprecated,begin +function DeprecatedClass.CCFadeOut() + deprecatedTip("CCFadeOut","cc.FadeOut") + return cc.FadeOut +end +_G["CCFadeOut"] = DeprecatedClass.CCFadeOut() +--CCFadeOut class will be Deprecated,end + +--CCCallFunc class will be Deprecated,begin +function DeprecatedClass.CCCallFunc() + deprecatedTip("CCCallFunc","cc.CallFunc") + return cc.CallFunc +end +_G["CCCallFunc"] = DeprecatedClass.CCCallFunc() +--CCCallFunc class will be Deprecated,end + +--CCWaves3D class will be Deprecated,begin +function DeprecatedClass.CCWaves3D() + deprecatedTip("CCWaves3D","cc.Waves3D") + return cc.Waves3D +end +_G["CCWaves3D"] = DeprecatedClass.CCWaves3D() +--CCWaves3D class will be Deprecated,end + +--CCFlipX3D class will be Deprecated,begin +function DeprecatedClass.CCFlipX3D() + deprecatedTip("CCFlipX3D","cc.FlipX3D") + return cc.FlipX3D +end +_G["CCFlipX3D"] = DeprecatedClass.CCFlipX3D() +--CCFlipX3D class will be Deprecated,end + +--CCParticleFireworks class will be Deprecated,begin +function DeprecatedClass.CCParticleFireworks() + deprecatedTip("CCParticleFireworks","cc.ParticleFireworks") + return cc.ParticleFireworks +end +_G["CCParticleFireworks"] = DeprecatedClass.CCParticleFireworks() +--CCParticleFireworks class will be Deprecated,end + +--CCMenuItemImage class will be Deprecated,begin +function DeprecatedClass.CCMenuItemImage() + deprecatedTip("CCMenuItemImage","cc.MenuItemImage") + return cc.MenuItemImage +end +_G["CCMenuItemImage"] = DeprecatedClass.CCMenuItemImage() +--CCMenuItemImage class will be Deprecated,end + +--CCParticleFire class will be Deprecated,begin +function DeprecatedClass.CCParticleFire() + deprecatedTip("CCParticleFire","cc.ParticleFire") + return cc.ParticleFire +end +_G["CCParticleFire"] = DeprecatedClass.CCParticleFire() +--CCParticleFire class will be Deprecated,end + +--CCMenuItem class will be Deprecated,begin +function DeprecatedClass.CCMenuItem() + deprecatedTip("CCMenuItem","cc.MenuItem") + return cc.MenuItem +end +_G["CCMenuItem"] = DeprecatedClass.CCMenuItem() +--CCMenuItem class will be Deprecated,end + +--CCActionEase class will be Deprecated,begin +function DeprecatedClass.CCActionEase() + deprecatedTip("CCActionEase","cc.ActionEase") + return cc.ActionEase +end +_G["CCActionEase"] = DeprecatedClass.CCActionEase() +--CCActionEase class will be Deprecated,end + +--CCTransitionSceneOriented class will be Deprecated,begin +function DeprecatedClass.CCTransitionSceneOriented() + deprecatedTip("CCTransitionSceneOriented","cc.TransitionSceneOriented") + return cc.TransitionSceneOriented +end +_G["CCTransitionSceneOriented"] = DeprecatedClass.CCTransitionSceneOriented() +--CCTransitionSceneOriented class will be Deprecated,end + +--CCTransitionZoomFlipAngular class will be Deprecated,begin +function DeprecatedClass.CCTransitionZoomFlipAngular() + deprecatedTip("CCTransitionZoomFlipAngular","cc.TransitionZoomFlipAngular") + return cc.TransitionZoomFlipAngular +end +_G["CCTransitionZoomFlipAngular"] = DeprecatedClass.CCTransitionZoomFlipAngular() +--CCTransitionZoomFlipAngular class will be Deprecated,end + +--CCEaseIn class will be Deprecated,begin +function DeprecatedClass.CCEaseIn() + deprecatedTip("CCEaseIn","cc.EaseIn") + return cc.EaseIn +end +_G["CCEaseIn"] = DeprecatedClass.CCEaseIn() +--CCEaseIn class will be Deprecated,end + +--CCEaseExponentialInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseExponentialInOut() + deprecatedTip("CCEaseExponentialInOut","cc.EaseExponentialInOut") + return cc.EaseExponentialInOut +end +_G["CCEaseExponentialInOut"] = DeprecatedClass.CCEaseExponentialInOut() +--CCEaseExponentialInOut class will be Deprecated,end + +--CCTransitionFlipX class will be Deprecated,begin +function DeprecatedClass.CCTransitionFlipX() + deprecatedTip("CCTransitionFlipX","cc.TransitionFlipX") + return cc.TransitionFlipX +end +_G["CCTransitionFlipX"] = DeprecatedClass.CCTransitionFlipX() +--CCTransitionFlipX class will be Deprecated,end + +--CCEaseExponentialOut class will be Deprecated,begin +function DeprecatedClass.CCEaseExponentialOut() + deprecatedTip("CCEaseExponentialOut","cc.EaseExponentialOut") + return cc.EaseExponentialOut +end +_G["CCEaseExponentialOut"] = DeprecatedClass.CCEaseExponentialOut() +--CCEaseExponentialOut class will be Deprecated,end + +--CCLabel class will be Deprecated,begin +function DeprecatedClass.CCLabel() + deprecatedTip("CCLabel","cc.Label") + return cc.Label +end +_G["CCLabel"] = DeprecatedClass.CCLabel() +--CCLabel class will be Deprecated,end + +--CCApplication class will be Deprecated,begin +function DeprecatedClass.CCApplication() + deprecatedTip("CCApplication","cc.Application") + return cc.Application +end +_G["CCApplication"] = DeprecatedClass.CCApplication() +--CCApplication class will be Deprecated,end + +--CCControlSlider class will be Deprecated,begin +function DeprecatedClass.CCControlSlider() + deprecatedTip("CCControlSlider","cc.ControlSlider") + return cc.ControlSlider +end +_G["CCControlSlider"] = DeprecatedClass.CCControlSlider() +--CCControlSlider class will be Deprecated,end + +--CCDelayTime class will be Deprecated,begin +function DeprecatedClass.CCDelayTime() + deprecatedTip("CCDelayTime","cc.DelayTime") + return cc.DelayTime +end +_G["CCDelayTime"] = DeprecatedClass.CCDelayTime() +--CCDelayTime class will be Deprecated,end + +--CCLabelAtlas class will be Deprecated,begin +function DeprecatedClass.CCLabelAtlas() + deprecatedTip("CCLabelAtlas","cc.LabelAtlas") + return cc.LabelAtlas +end +_G["CCLabelAtlas"] = DeprecatedClass.CCLabelAtlas() +--CCLabelAtlas class will be Deprecated,end + +--CCLabelBMFont class will be Deprecated,begin +function DeprecatedClass.CCLabelBMFont() + deprecatedTip("CCLabelBMFont","cc.LabelBMFont") + return cc.LabelBMFont +end +_G["CCLabelBMFont"] = DeprecatedClass.CCLabelBMFont() +--CCLabelBMFont class will be Deprecated,end + +--CCScale9Sprite class will be Deprecated,begin +function DeprecatedClass.CCScale9Sprite() + deprecatedTip("CCScale9Sprite","cc.Scale9Sprite") + return cc.Scale9Sprite +end +_G["CCScale9Sprite"] = DeprecatedClass.CCScale9Sprite() +--CCScale9Sprite class will be Deprecated,end + +--CCFadeOutTRTiles class will be Deprecated,begin +function DeprecatedClass.CCFadeOutTRTiles() + deprecatedTip("CCFadeOutTRTiles","cc.FadeOutTRTiles") + return cc.FadeOutTRTiles +end +_G["CCFadeOutTRTiles"] = DeprecatedClass.CCFadeOutTRTiles() +--CCFadeOutTRTiles class will be Deprecated,end + +--CCEaseElasticIn class will be Deprecated,begin +function DeprecatedClass.CCEaseElasticIn() + deprecatedTip("CCEaseElasticIn","cc.EaseElasticIn") + return cc.EaseElasticIn +end +_G["CCEaseElasticIn"] = DeprecatedClass.CCEaseElasticIn() +--CCEaseElasticIn class will be Deprecated,end + +--CCParticleSpiral class will be Deprecated,begin +function DeprecatedClass.CCParticleSpiral() + deprecatedTip("CCParticleSpiral","cc.ParticleSpiral") + return cc.ParticleSpiral +end +_G["CCParticleSpiral"] = DeprecatedClass.CCParticleSpiral() +--CCParticleSpiral class will be Deprecated,end + +--CCBReader class will be Deprecated,begin +function DeprecatedClass.CCBReader() + deprecatedTip("CCBReader","cc.BReader") + return cc.BReader +end +_G["CCBReader"] = DeprecatedClass.CCBReader() +--CCBReader class will be Deprecated,end + +--CCFiniteTimeAction class will be Deprecated,begin +function DeprecatedClass.CCFiniteTimeAction() + deprecatedTip("CCFiniteTimeAction","cc.FiniteTimeAction") + return cc.FiniteTimeAction +end +_G["CCFiniteTimeAction"] = DeprecatedClass.CCFiniteTimeAction() +--CCFiniteTimeAction class will be Deprecated,end + +--CCFadeOutDownTiles class will be Deprecated,begin +function DeprecatedClass.CCFadeOutDownTiles() + deprecatedTip("CCFadeOutDownTiles","cc.FadeOutDownTiles") + return cc.FadeOutDownTiles +end +_G["CCFadeOutDownTiles"] = DeprecatedClass.CCFadeOutDownTiles() +--CCFadeOutDownTiles class will be Deprecated,end + +--CCJumpTiles3D class will be Deprecated,begin +function DeprecatedClass.CCJumpTiles3D() + deprecatedTip("CCJumpTiles3D","cc.JumpTiles3D") + return cc.JumpTiles3D +end +_G["CCJumpTiles3D"] = DeprecatedClass.CCJumpTiles3D() +--CCJumpTiles3D class will be Deprecated,end + +--CCEaseBackIn class will be Deprecated,begin +function DeprecatedClass.CCEaseBackIn() + deprecatedTip("CCEaseBackIn","cc.EaseBackIn") + return cc.EaseBackIn +end +_G["CCEaseBackIn"] = DeprecatedClass.CCEaseBackIn() +--CCEaseBackIn class will be Deprecated,end + +--CCSpriteBatchNode class will be Deprecated,begin +function DeprecatedClass.CCSpriteBatchNode() + deprecatedTip("CCSpriteBatchNode","cc.SpriteBatchNode") + return cc.SpriteBatchNode +end +_G["CCSpriteBatchNode"] = DeprecatedClass.CCSpriteBatchNode() +--CCSpriteBatchNode class will be Deprecated,end + +--CCParticleSystem class will be Deprecated,begin +function DeprecatedClass.CCParticleSystem() + deprecatedTip("CCParticleSystem","cc.ParticleSystem") + return cc.ParticleSystem +end +_G["CCParticleSystem"] = DeprecatedClass.CCParticleSystem() +--CCParticleSystem class will be Deprecated,end + +--CCActionTween class will be Deprecated,begin +function DeprecatedClass.CCActionTween() + deprecatedTip("CCActionTween","cc.ActionTween") + return cc.ActionTween +end +_G["CCActionTween"] = DeprecatedClass.CCActionTween() +--CCActionTween class will be Deprecated,end + +--CCTransitionFadeDown class will be Deprecated,begin +function DeprecatedClass.CCTransitionFadeDown() + deprecatedTip("CCTransitionFadeDown","cc.TransitionFadeDown") + return cc.TransitionFadeDown +end +_G["CCTransitionFadeDown"] = DeprecatedClass.CCTransitionFadeDown() +--CCTransitionFadeDown class will be Deprecated,end + +--CCParticleSun class will be Deprecated,begin +function DeprecatedClass.CCParticleSun() + deprecatedTip("CCParticleSun","cc.ParticleSun") + return cc.ParticleSun +end +_G["CCParticleSun"] = DeprecatedClass.CCParticleSun() +--CCParticleSun class will be Deprecated,end + +--CCTransitionProgressHorizontal class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressHorizontal() + deprecatedTip("CCTransitionProgressHorizontal","cc.TransitionProgressHorizontal") + return cc.TransitionProgressHorizontal +end +_G["CCTransitionProgressHorizontal"] = DeprecatedClass.CCTransitionProgressHorizontal() +--CCTransitionProgressHorizontal class will be Deprecated,end + +--CCRipple3D class will be Deprecated,begin +function DeprecatedClass.CCRipple3D() + deprecatedTip("CCRipple3D","cc.Ripple3D") + return cc.Ripple3D +end +_G["CCRipple3D"] = DeprecatedClass.CCRipple3D() +--CCRipple3D class will be Deprecated,end + +--CCTMXLayer class will be Deprecated,begin +function DeprecatedClass.CCTMXLayer() + deprecatedTip("CCTMXLayer","cc.TMXLayer") + return cc.TMXLayer +end +_G["CCTMXLayer"] = DeprecatedClass.CCTMXLayer() +--CCTMXLayer class will be Deprecated,end + +--CCFlipX class will be Deprecated,begin +function DeprecatedClass.CCFlipX() + deprecatedTip("CCFlipX","cc.FlipX") + return cc.FlipX +end +_G["CCFlipX"] = DeprecatedClass.CCFlipX() +--CCFlipX class will be Deprecated,end + +--CCFlipY class will be Deprecated,begin +function DeprecatedClass.CCFlipY() + deprecatedTip("CCFlipY","cc.FlipY") + return cc.FlipY +end +_G["CCFlipY"] = DeprecatedClass.CCFlipY() +--CCFlipY class will be Deprecated,end + +--CCTransitionSplitCols class will be Deprecated,begin +function DeprecatedClass.CCTransitionSplitCols() + deprecatedTip("CCTransitionSplitCols","cc.TransitionSplitCols") + return cc.TransitionSplitCols +end +_G["CCTransitionSplitCols"] = DeprecatedClass.CCTransitionSplitCols() +--CCTransitionSplitCols class will be Deprecated,end + +--CCTimer class will be Deprecated,begin +function DeprecatedClass.CCTimer() + deprecatedTip("CCTimer","cc.Timer") + return cc.Timer +end +_G["CCTimer"] = DeprecatedClass.CCTimer() +--CCTimer class will be Deprecated,end + +--CCFadeTo class will be Deprecated,begin +function DeprecatedClass.CCFadeTo() + deprecatedTip("CCFadeTo","cc.FadeTo") + return cc.FadeTo +end +_G["CCFadeTo"] = DeprecatedClass.CCFadeTo() +--CCFadeTo class will be Deprecated,end + +--CCBAnimationManager class will be Deprecated,begin +function DeprecatedClass.CCBAnimationManager() + deprecatedTip("CCBAnimationManager","cc.BAnimationManager") + return cc.BAnimationManager +end +_G["CCBAnimationManager"] = DeprecatedClass.CCBAnimationManager() +--CCBAnimationManager class will be Deprecated,end + +--CCRepeatForever class will be Deprecated,begin +function DeprecatedClass.CCRepeatForever() + deprecatedTip("CCRepeatForever","cc.RepeatForever") + return cc.RepeatForever +end +_G["CCRepeatForever"] = DeprecatedClass.CCRepeatForever() +--CCRepeatForever class will be Deprecated,end + +--CCPlace class will be Deprecated,begin +function DeprecatedClass.CCPlace() + deprecatedTip("CCPlace","cc.Place") + return cc.Place +end +_G["CCPlace"] = DeprecatedClass.CCPlace() +--CCPlace class will be Deprecated,end + +--CCScrollView class will be Deprecated,begin +function DeprecatedClass.CCScrollView() + deprecatedTip("CCScrollView","cc.ScrollView") + return cc.ScrollView +end +_G["CCScrollView"] = DeprecatedClass.CCScrollView() +--CCScrollView class will be Deprecated,end + +--CCGLProgram class will be Deprecated,begin +function DeprecatedClass.CCGLProgram() + deprecatedTip("CCGLProgram","cc.GLProgram") + return cc.GLProgram +end +_G["CCGLProgram"] = DeprecatedClass.CCGLProgram() +--CCGLProgram class will be Deprecated,end + +--CCEaseBounceOut class will be Deprecated,begin +function DeprecatedClass.CCEaseBounceOut() + deprecatedTip("CCEaseBounceOut","cc.EaseBounceOut") + return cc.EaseBounceOut +end +_G["CCEaseBounceOut"] = DeprecatedClass.CCEaseBounceOut() +--CCEaseBounceOut class will be Deprecated,end + +--CCCardinalSplineBy class will be Deprecated,begin +function DeprecatedClass.CCCardinalSplineBy() + deprecatedTip("CCCardinalSplineBy","cc.CardinalSplineBy") + return cc.CardinalSplineBy +end +_G["CCCardinalSplineBy"] = DeprecatedClass.CCCardinalSplineBy() +--CCCardinalSplineBy class will be Deprecated,end + +--CCSpriteFrameCache class will be Deprecated,begin +function DeprecatedClass.CCSpriteFrameCache() + deprecatedTip("CCSpriteFrameCache","cc.SpriteFrameCache") + return cc.SpriteFrameCache +end +_G["CCSpriteFrameCache"] = DeprecatedClass.CCSpriteFrameCache() +--CCSpriteFrameCache class will be Deprecated,end + +--CCTransitionShrinkGrow class will be Deprecated,begin +function DeprecatedClass.CCTransitionShrinkGrow() + deprecatedTip("CCTransitionShrinkGrow","cc.TransitionShrinkGrow") + return cc.TransitionShrinkGrow +end +_G["CCTransitionShrinkGrow"] = DeprecatedClass.CCTransitionShrinkGrow() +--CCTransitionShrinkGrow class will be Deprecated,end + +--CCSplitCols class will be Deprecated,begin +function DeprecatedClass.CCSplitCols() + deprecatedTip("CCSplitCols","cc.SplitCols") + return cc.SplitCols +end +_G["CCSplitCols"] = DeprecatedClass.CCSplitCols() +--CCSplitCols class will be Deprecated,end + +--CCClippingNode class will be Deprecated,begin +function DeprecatedClass.CCClippingNode() + deprecatedTip("CCClippingNode","cc.ClippingNode") + return cc.ClippingNode +end +_G["CCClippingNode"] = DeprecatedClass.CCClippingNode() +--CCClippingNode class will be Deprecated,end + +--CCEaseBounceInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseBounceInOut() + deprecatedTip("CCEaseBounceInOut","cc.EaseBounceInOut") + return cc.EaseBounceInOut +end +_G["CCEaseBounceInOut"] = DeprecatedClass.CCEaseBounceInOut() +--CCEaseBounceInOut class will be Deprecated,end + +--CCLiquid class will be Deprecated,begin +function DeprecatedClass.CCLiquid() + deprecatedTip("CCLiquid","cc.Liquid") + return cc.Liquid +end +_G["CCLiquid"] = DeprecatedClass.CCLiquid() +--CCLiquid class will be Deprecated,end + +--CCParticleFlower class will be Deprecated,begin +function DeprecatedClass.CCParticleFlower() + deprecatedTip("CCParticleFlower","cc.ParticleFlower") + return cc.ParticleFlower +end +_G["CCParticleFlower"] = DeprecatedClass.CCParticleFlower() +--CCParticleFlower class will be Deprecated,end + +--CCTableView class will be Deprecated,begin +function DeprecatedClass.CCTableView() + deprecatedTip("CCTableView","cc.TableView") + return cc.TableView +end +_G["CCTableView"] = DeprecatedClass.CCTableView() +--CCTableView class will be Deprecated,end + +--CCParticleSmoke class will be Deprecated,begin +function DeprecatedClass.CCParticleSmoke() + deprecatedTip("CCParticleSmoke","cc.ParticleSmoke") + return cc.ParticleSmoke +end +_G["CCParticleSmoke"] = DeprecatedClass.CCParticleSmoke() +--CCParticleSmoke class will be Deprecated,end + +--CCImage class will be Deprecated,begin +function DeprecatedClass.CCImage() + deprecatedTip("CCImage","cc.Image") + return cc.Image +end +_G["CCImage"] = DeprecatedClass.CCImage() +--CCImage class will be Deprecated,end + +--CCTurnOffTiles class will be Deprecated,begin +function DeprecatedClass.CCTurnOffTiles() + deprecatedTip("CCTurnOffTiles","cc.TurnOffTiles") + return cc.TurnOffTiles +end +_G["CCTurnOffTiles"] = DeprecatedClass.CCTurnOffTiles() +--CCTurnOffTiles class will be Deprecated,end + +--CCBlink class will be Deprecated,begin +function DeprecatedClass.CCBlink() + deprecatedTip("CCBlink","cc.Blink") + return cc.Blink +end +_G["CCBlink"] = DeprecatedClass.CCBlink() +--CCBlink class will be Deprecated,end + +--CCShaderCache class will be Deprecated,begin +function DeprecatedClass.CCShaderCache() + deprecatedTip("CCShaderCache","cc.ShaderCache") + return cc.ShaderCache +end +_G["CCShaderCache"] = DeprecatedClass.CCShaderCache() +--CCShaderCache class will be Deprecated,end + +--CCJumpTo class will be Deprecated,begin +function DeprecatedClass.CCJumpTo() + deprecatedTip("CCJumpTo","cc.JumpTo") + return cc.JumpTo +end +_G["CCJumpTo"] = DeprecatedClass.CCJumpTo() +--CCJumpTo class will be Deprecated,end + +--CCAtlasNode class will be Deprecated,begin +function DeprecatedClass.CCAtlasNode() + deprecatedTip("CCAtlasNode","cc.AtlasNode") + return cc.AtlasNode +end +_G["CCAtlasNode"] = DeprecatedClass.CCAtlasNode() +--CCAtlasNode class will be Deprecated,end + +--CCTransitionJumpZoom class will be Deprecated,begin +function DeprecatedClass.CCTransitionJumpZoom() + deprecatedTip("CCTransitionJumpZoom","cc.TransitionJumpZoom") + return cc.TransitionJumpZoom +end +_G["CCTransitionJumpZoom"] = DeprecatedClass.CCTransitionJumpZoom() +--CCTransitionJumpZoom class will be Deprecated,end + +--CCTransitionProgressVertical class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressVertical() + deprecatedTip("CCTransitionProgressVertical","cc.TransitionProgressVertical") + return cc.TransitionProgressVertical +end +_G["CCTransitionProgressVertical"] = DeprecatedClass.CCTransitionProgressVertical() +--CCTransitionProgressVertical class will be Deprecated,end + +--CCAnimationFrame class will be Deprecated,begin +function DeprecatedClass.CCAnimationFrame() + deprecatedTip("CCAnimationFrame","cc.AnimationFrame") + return cc.AnimationFrame +end +_G["CCAnimationFrame"] = DeprecatedClass.CCAnimationFrame() +--CCAnimationFrame class will be Deprecated,end + +--CCTintTo class will be Deprecated,begin +function DeprecatedClass.CCTintTo() + deprecatedTip("CCTintTo","cc.TintTo") + return cc.TintTo +end +_G["CCTintTo"] = DeprecatedClass.CCTintTo() +--CCTintTo class will be Deprecated,end + +--CCTiledGrid3DAction class will be Deprecated,begin +function DeprecatedClass.CCTiledGrid3DAction() + deprecatedTip("CCTiledGrid3DAction","cc.TiledGrid3DAction") + return cc.TiledGrid3DAction +end +_G["CCTiledGrid3DAction"] = DeprecatedClass.CCTiledGrid3DAction() +--CCTiledGrid3DAction class will be Deprecated,end + +--CCTMXTilesetInfo class will be Deprecated,begin +function DeprecatedClass.CCTMXTilesetInfo() + deprecatedTip("CCTMXTilesetInfo","cc.TMXTilesetInfo") + return cc.TMXTilesetInfo +end +_G["CCTMXTilesetInfo"] = DeprecatedClass.CCTMXTilesetInfo() +--CCTMXTilesetInfo class will be Deprecated,end + +--CCTMXObjectGroup class will be Deprecated,begin +function DeprecatedClass.CCTMXObjectGroup() + deprecatedTip("CCTMXObjectGroup","cc.TMXObjectGroup") + return cc.TMXObjectGroup +end +_G["CCTMXObjectGroup"] = DeprecatedClass.CCTMXObjectGroup() +--CCTMXObjectGroup class will be Deprecated,end + +--CCParticleGalaxy class will be Deprecated,begin +function DeprecatedClass.CCParticleGalaxy() + deprecatedTip("CCParticleGalaxy","cc.ParticleGalaxy") + return cc.ParticleGalaxy +end +_G["CCParticleGalaxy"] = DeprecatedClass.CCParticleGalaxy() +--CCParticleGalaxy class will be Deprecated,end + +--CCTwirl class will be Deprecated,begin +function DeprecatedClass.CCTwirl() + deprecatedTip("CCTwirl","cc.Twirl") + return cc.Twirl +end +_G["CCTwirl"] = DeprecatedClass.CCTwirl() +--CCTwirl class will be Deprecated,end + +--CCMenuItemLabel class will be Deprecated,begin +function DeprecatedClass.CCMenuItemLabel() + deprecatedTip("CCMenuItemLabel","cc.MenuItemLabel") + return cc.MenuItemLabel +end +_G["CCMenuItemLabel"] = DeprecatedClass.CCMenuItemLabel() +--CCMenuItemLabel class will be Deprecated,end + +--CCLayerColor class will be Deprecated,begin +function DeprecatedClass.CCLayerColor() + deprecatedTip("CCLayerColor","cc.LayerColor") + return cc.LayerColor +end +_G["CCLayerColor"] = DeprecatedClass.CCLayerColor() +--CCLayerColor class will be Deprecated,end + +--CCFadeOutBLTiles class will be Deprecated,begin +function DeprecatedClass.CCFadeOutBLTiles() + deprecatedTip("CCFadeOutBLTiles","cc.FadeOutBLTiles") + return cc.FadeOutBLTiles +end +_G["CCFadeOutBLTiles"] = DeprecatedClass.CCFadeOutBLTiles() +--CCFadeOutBLTiles class will be Deprecated,end + +--CCTransitionProgress class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgress() + deprecatedTip("CCTransitionProgress","cc.TransitionProgress") + return cc.TransitionProgress +end +_G["CCTransitionProgress"] = DeprecatedClass.CCTransitionProgress() +--CCTransitionProgress class will be Deprecated,end + +--CCEaseRateAction class will be Deprecated,begin +function DeprecatedClass.CCEaseRateAction() + deprecatedTip("CCEaseRateAction","cc.EaseRateAction") + return cc.EaseRateAction +end +_G["CCEaseRateAction"] = DeprecatedClass.CCEaseRateAction() +--CCEaseRateAction class will be Deprecated,end + +--CCLayerGradient class will be Deprecated,begin +function DeprecatedClass.CCLayerGradient() + deprecatedTip("CCLayerGradient","cc.LayerGradient") + return cc.LayerGradient +end +_G["CCLayerGradient"] = DeprecatedClass.CCLayerGradient() +--CCLayerGradient class will be Deprecated,end + +--CCMenuItemSprite class will be Deprecated,begin +function DeprecatedClass.CCMenuItemSprite() + deprecatedTip("CCMenuItemSprite","cc.MenuItemSprite") + return cc.MenuItemSprite +end +_G["CCMenuItemSprite"] = DeprecatedClass.CCMenuItemSprite() +--CCMenuItemSprite class will be Deprecated,end + +--CCNode class will be Deprecated,begin +function DeprecatedClass.CCNode() + deprecatedTip("CCNode","cc.Node") + return cc.Node +end +_G["CCNode"] = DeprecatedClass.CCNode() +--CCNode class will be Deprecated,end + +--CCToggleVisibility class will be Deprecated,begin +function DeprecatedClass.CCToggleVisibility() + deprecatedTip("CCToggleVisibility","cc.ToggleVisibility") + return cc.ToggleVisibility +end +_G["CCToggleVisibility"] = DeprecatedClass.CCToggleVisibility() +--CCToggleVisibility class will be Deprecated,end + +--CCRepeat class will be Deprecated,begin +function DeprecatedClass.CCRepeat() + deprecatedTip("CCRepeat","cc.Repeat") + return cc.Repeat +end +_G["CCRepeat"] = DeprecatedClass.CCRepeat() +--CCRepeat class will be Deprecated,end + +--CCRenderTexture class will be Deprecated,begin +function DeprecatedClass.CCRenderTexture() + deprecatedTip("CCRenderTexture","cc.RenderTexture") + return cc.RenderTexture +end +_G["CCRenderTexture"] = DeprecatedClass.CCRenderTexture() +--CCRenderTexture class will be Deprecated,end + +--CCTransitionFlipY class will be Deprecated,begin +function DeprecatedClass.CCTransitionFlipY() + deprecatedTip("CCTransitionFlipY","cc.TransitionFlipY") + return cc.TransitionFlipY +end +_G["CCTransitionFlipY"] = DeprecatedClass.CCTransitionFlipY() +--CCTransitionFlipY class will be Deprecated,end + +--CCLayerMultiplex class will be Deprecated,begin +function DeprecatedClass.CCLayerMultiplex() + deprecatedTip("CCLayerMultiplex","cc.LayerMultiplex") + return cc.LayerMultiplex +end +_G["CCLayerMultiplex"] = DeprecatedClass.CCLayerMultiplex() +--CCLayerMultiplex class will be Deprecated,end + +--CCTMXLayerInfo class will be Deprecated,begin +function DeprecatedClass.CCTMXLayerInfo() + deprecatedTip("CCTMXLayerInfo","cc.TMXLayerInfo") + return cc.TMXLayerInfo +end +_G["CCTMXLayerInfo"] = DeprecatedClass.CCTMXLayerInfo() +--CCTMXLayerInfo class will be Deprecated,end + +--CCEaseBackInOut class will be Deprecated,begin +function DeprecatedClass.CCEaseBackInOut() + deprecatedTip("CCEaseBackInOut","cc.EaseBackInOut") + return cc.EaseBackInOut +end +_G["CCEaseBackInOut"] = DeprecatedClass.CCEaseBackInOut() +--CCEaseBackInOut class will be Deprecated,end + +--CCActionInstant class will be Deprecated,begin +function DeprecatedClass.CCActionInstant() + deprecatedTip("CCActionInstant","cc.ActionInstant") + return cc.ActionInstant +end +_G["CCActionInstant"] = DeprecatedClass.CCActionInstant() +--CCActionInstant class will be Deprecated,end + +--CCTargetedAction class will be Deprecated,begin +function DeprecatedClass.CCTargetedAction() + deprecatedTip("CCTargetedAction","cc.TargetedAction") + return cc.TargetedAction +end +_G["CCTargetedAction"] = DeprecatedClass.CCTargetedAction() +--CCTargetedAction class will be Deprecated,end + +--CCDrawNode class will be Deprecated,begin +function DeprecatedClass.CCDrawNode() + deprecatedTip("CCDrawNode","cc.DrawNode") + return cc.DrawNode +end +_G["CCDrawNode"] = DeprecatedClass.CCDrawNode() +--CCDrawNode class will be Deprecated,end + +--CCTransitionTurnOffTiles class will be Deprecated,begin +function DeprecatedClass.CCTransitionTurnOffTiles() + deprecatedTip("CCTransitionTurnOffTiles","cc.TransitionTurnOffTiles") + return cc.TransitionTurnOffTiles +end +_G["CCTransitionTurnOffTiles"] = DeprecatedClass.CCTransitionTurnOffTiles() +--CCTransitionTurnOffTiles class will be Deprecated,end + +--CCRotateTo class will be Deprecated,begin +function DeprecatedClass.CCRotateTo() + deprecatedTip("CCRotateTo","cc.RotateTo") + return cc.RotateTo +end +_G["CCRotateTo"] = DeprecatedClass.CCRotateTo() +--CCRotateTo class will be Deprecated,end + +--CCTransitionSplitRows class will be Deprecated,begin +function DeprecatedClass.CCTransitionSplitRows() + deprecatedTip("CCTransitionSplitRows","cc.TransitionSplitRows") + return cc.TransitionSplitRows +end +_G["CCTransitionSplitRows"] = DeprecatedClass.CCTransitionSplitRows() +--CCTransitionSplitRows class will be Deprecated,end + +--CCTransitionProgressRadialCCW class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressRadialCCW() + deprecatedTip("CCTransitionProgressRadialCCW","cc.TransitionProgressRadialCCW") + return cc.TransitionProgressRadialCCW +end +_G["CCTransitionProgressRadialCCW"] = DeprecatedClass.CCTransitionProgressRadialCCW() +--CCTransitionProgressRadialCCW class will be Deprecated,end + +--CCScaleTo class will be Deprecated,begin +function DeprecatedClass.CCScaleTo() + deprecatedTip("CCScaleTo","cc.ScaleTo") + return cc.ScaleTo +end +_G["CCScaleTo"] = DeprecatedClass.CCScaleTo() +--CCScaleTo class will be Deprecated,end + +--CCTransitionPageTurn class will be Deprecated,begin +function DeprecatedClass.CCTransitionPageTurn() + deprecatedTip("CCTransitionPageTurn","cc.TransitionPageTurn") + return cc.TransitionPageTurn +end +_G["CCTransitionPageTurn"] = DeprecatedClass.CCTransitionPageTurn() +--CCTransitionPageTurn class will be Deprecated,end + +--CCParticleExplosion class will be Deprecated,begin +function DeprecatedClass.CCParticleExplosion() + deprecatedTip("CCParticleExplosion","cc.ParticleExplosion") + return cc.ParticleExplosion +end +_G["CCParticleExplosion"] = DeprecatedClass.CCParticleExplosion() +--CCParticleExplosion class will be Deprecated,end + +--CCMenu class will be Deprecated,begin +function DeprecatedClass.CCMenu() + deprecatedTip("CCMenu","cc.Menu") + return cc.Menu +end +_G["CCMenu"] = DeprecatedClass.CCMenu() +--CCMenu class will be Deprecated,end + +--CCTexture2D class will be Deprecated,begin +function DeprecatedClass.CCTexture2D() + deprecatedTip("CCTexture2D","cc.Texture2D") + return cc.Texture2D +end +_G["CCTexture2D"] = DeprecatedClass.CCTexture2D() +--CCTexture2D class will be Deprecated,end + +--CCActionManager class will be Deprecated,begin +function DeprecatedClass.CCActionManager() + deprecatedTip("CCActionManager","cc.ActionManager") + return cc.ActionManager +end +_G["CCActionManager"] = DeprecatedClass.CCActionManager() +--CCActionManager class will be Deprecated,end + +--CCParticleBatchNode class will be Deprecated,begin +function DeprecatedClass.CCParticleBatchNode() + deprecatedTip("CCParticleBatchNode","cc.ParticleBatchNode") + return cc.ParticleBatchNode +end +_G["CCParticleBatchNode"] = DeprecatedClass.CCParticleBatchNode() +--CCParticleBatchNode class will be Deprecated,end + +--CCTransitionZoomFlipX class will be Deprecated,begin +function DeprecatedClass.CCTransitionZoomFlipX() + deprecatedTip("CCTransitionZoomFlipX","cc.TransitionZoomFlipX") + return cc.TransitionZoomFlipX +end +_G["CCTransitionZoomFlipX"] = DeprecatedClass.CCTransitionZoomFlipX() +--CCTransitionZoomFlipX class will be Deprecated,end + +--CCControlPotentiometer class will be Deprecated,begin +function DeprecatedClass.CCControlPotentiometer() + deprecatedTip("CCControlPotentiometer","cc.ControlPotentiometer") + return cc.ControlPotentiometer +end +_G["CCControlPotentiometer"] = DeprecatedClass.CCControlPotentiometer() +--CCControlPotentiometer class will be Deprecated,end + +--CCScaleBy class will be Deprecated,begin +function DeprecatedClass.CCScaleBy() + deprecatedTip("CCScaleBy","cc.ScaleBy") + return cc.ScaleBy +end +_G["CCScaleBy"] = DeprecatedClass.CCScaleBy() +--CCScaleBy class will be Deprecated,end + +--CCTileMapAtlas class will be Deprecated,begin +function DeprecatedClass.CCTileMapAtlas() + deprecatedTip("CCTileMapAtlas","cc.TileMapAtlas") + return cc.TileMapAtlas +end +_G["CCTileMapAtlas"] = DeprecatedClass.CCTileMapAtlas() +--CCTileMapAtlas class will be Deprecated,end + +--CCAction class will be Deprecated,begin +function DeprecatedClass.CCAction() + deprecatedTip("CCAction","cc.Action") + return cc.Action +end +_G["CCAction"] = DeprecatedClass.CCAction() +--CCAction class will be Deprecated,end + +--CCLens3D class will be Deprecated,begin +function DeprecatedClass.CCLens3D() + deprecatedTip("CCLens3D","cc.Lens3D") + return cc.Lens3D +end +_G["CCLens3D"] = DeprecatedClass.CCLens3D() +--CCLens3D class will be Deprecated,end + +--CCAnimation class will be Deprecated,begin +function DeprecatedClass.CCAnimation() + deprecatedTip("CCAnimation","cc.Animation") + return cc.Animation +end +_G["CCAnimation"] = DeprecatedClass.CCAnimation() +--CCAnimation class will be Deprecated,end + +--CCTransitionSlideInT class will be Deprecated,begin +function DeprecatedClass.CCTransitionSlideInT() + deprecatedTip("CCTransitionSlideInT","cc.TransitionSlideInT") + return cc.TransitionSlideInT +end +_G["CCTransitionSlideInT"] = DeprecatedClass.CCTransitionSlideInT() +--CCTransitionSlideInT class will be Deprecated,end + +--CCSpawn class will be Deprecated,begin +function DeprecatedClass.CCSpawn() + deprecatedTip("CCSpawn","cc.Spawn") + return cc.Spawn +end +_G["CCSpawn"] = DeprecatedClass.CCSpawn() +--CCSpawn class will be Deprecated,end + +--CCSet class will be Deprecated,begin +function DeprecatedClass.CCSet() + deprecatedTip("CCSet","cc.Set") + return cc.Set +end +_G["CCSet"] = DeprecatedClass.CCSet() +--CCSet class will be Deprecated,end + +--CCShakyTiles3D class will be Deprecated,begin +function DeprecatedClass.CCShakyTiles3D() + deprecatedTip("CCShakyTiles3D","cc.ShakyTiles3D") + return cc.ShakyTiles3D +end +_G["CCShakyTiles3D"] = DeprecatedClass.CCShakyTiles3D() +--CCShakyTiles3D class will be Deprecated,end + +--CCPageTurn3D class will be Deprecated,begin +function DeprecatedClass.CCPageTurn3D() + deprecatedTip("CCPageTurn3D","cc.PageTurn3D") + return cc.PageTurn3D +end +_G["CCPageTurn3D"] = DeprecatedClass.CCPageTurn3D() +--CCPageTurn3D class will be Deprecated,end + +--CCGrid3D class will be Deprecated,begin +function DeprecatedClass.CCGrid3D() + deprecatedTip("CCGrid3D","cc.Grid3D") + return cc.Grid3D +end +_G["CCGrid3D"] = DeprecatedClass.CCGrid3D() +--CCGrid3D class will be Deprecated,end + +--CCTransitionProgressInOut class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressInOut() + deprecatedTip("CCTransitionProgressInOut","cc.TransitionProgressInOut") + return cc.TransitionProgressInOut +end +_G["CCTransitionProgressInOut"] = DeprecatedClass.CCTransitionProgressInOut() +--CCTransitionProgressInOut class will be Deprecated,end + +--CCTransitionFadeBL class will be Deprecated,begin +function DeprecatedClass.CCTransitionFadeBL() + deprecatedTip("CCTransitionFadeBL","cc.TransitionFadeBL") + return cc.TransitionFadeBL +end +_G["CCTransitionFadeBL"] = DeprecatedClass.CCTransitionFadeBL() +--CCTransitionFadeBL class will be Deprecated,end + +--CCCamera class will be Deprecated,begin +function DeprecatedClass.CCCamera() + deprecatedTip("CCCamera","cc.Camera") + return cc.Camera +end +_G["CCCamera"] = DeprecatedClass.CCCamera() +--CCCamera class will be Deprecated,end + +--CCLayerRGBA class will be Deprecated,begin +function DeprecatedClass.CCLayerRGBA() + deprecatedTip("CCLayerRGBA","cc.LayerRGBA") + return cc.LayerRGBA +end +_G["CCLayerRGBA"] = DeprecatedClass.CCLayerRGBA() +--CCLayerRGBA class will be Deprecated,end + +--CCBezierTo class will be Deprecated,begin +function DeprecatedClass.CCBezierTo() + deprecatedTip("CCBezierTo","cc.BezierTo") + return cc.BezierTo +end +_G["CCBezierTo"] = DeprecatedClass.CCBezierTo() +--CCBezierTo class will be Deprecated,end + +--CCControlButton class will be Deprecated,begin +function DeprecatedClass.CCControlButton() + deprecatedTip("CCControlButton","cc.ControlButton") + return cc.ControlButton +end +_G["CCControlButton"] = DeprecatedClass.CCControlButton() +--CCControlButton class will be Deprecated,end + +--CCFollow class will be Deprecated,begin +function DeprecatedClass.CCFollow() + deprecatedTip("CCFollow","cc.Follow") + return cc.Follow +end +_G["CCFollow"] = DeprecatedClass.CCFollow() +--CCFollow class will be Deprecated,end + +--CCTintBy class will be Deprecated,begin +function DeprecatedClass.CCTintBy() + deprecatedTip("CCTintBy","cc.TintBy") + return cc.TintBy +end +_G["CCTintBy"] = DeprecatedClass.CCTintBy() +--CCTintBy class will be Deprecated,end + +--CCActionInterval class will be Deprecated,begin +function DeprecatedClass.CCActionInterval() + deprecatedTip("CCActionInterval","cc.ActionInterval") + return cc.ActionInterval +end +_G["CCActionInterval"] = DeprecatedClass.CCActionInterval() +--CCActionInterval class will be Deprecated,end + +--CCAnimate class will be Deprecated,begin +function DeprecatedClass.CCAnimate() + deprecatedTip("CCAnimate","cc.Animate") + return cc.Animate +end +_G["CCAnimate"] = DeprecatedClass.CCAnimate() +--CCAnimate class will be Deprecated,end + +--CCProgressTimer class will be Deprecated,begin +function DeprecatedClass.CCProgressTimer() + deprecatedTip("CCProgressTimer","cc.ProgressTimer") + return cc.ProgressTimer +end +_G["CCProgressTimer"] = DeprecatedClass.CCProgressTimer() +--CCProgressTimer class will be Deprecated,end + +--CCParticleMeteor class will be Deprecated,begin +function DeprecatedClass.CCParticleMeteor() + deprecatedTip("CCParticleMeteor","cc.ParticleMeteor") + return cc.ParticleMeteor +end +_G["CCParticleMeteor"] = DeprecatedClass.CCParticleMeteor() +--CCParticleMeteor class will be Deprecated,end + +--CCTransitionFadeTR class will be Deprecated,begin +function DeprecatedClass.CCTransitionFadeTR() + deprecatedTip("CCTransitionFadeTR","cc.TransitionFadeTR") + return cc.TransitionFadeTR +end +_G["CCTransitionFadeTR"] = DeprecatedClass.CCTransitionFadeTR() +--CCTransitionFadeTR class will be Deprecated,end + +--CCCatmullRomTo class will be Deprecated,begin +function DeprecatedClass.CCCatmullRomTo() + deprecatedTip("CCCatmullRomTo","cc.CatmullRomTo") + return cc.CatmullRomTo +end +_G["CCCatmullRomTo"] = DeprecatedClass.CCCatmullRomTo() +--CCCatmullRomTo class will be Deprecated,end + +--CCTransitionZoomFlipY class will be Deprecated,begin +function DeprecatedClass.CCTransitionZoomFlipY() + deprecatedTip("CCTransitionZoomFlipY","cc.TransitionZoomFlipY") + return cc.TransitionZoomFlipY +end +_G["CCTransitionZoomFlipY"] = DeprecatedClass.CCTransitionZoomFlipY() +--CCTransitionZoomFlipY class will be Deprecated,end + +--CCTransitionCrossFade class will be Deprecated,begin +function DeprecatedClass.CCTransitionCrossFade() + deprecatedTip("CCTransitionCrossFade","cc.TransitionCrossFade") + return cc.TransitionCrossFade +end +_G["CCTransitionCrossFade"] = DeprecatedClass.CCTransitionCrossFade() +--CCTransitionCrossFade class will be Deprecated,end + +--CCGridBase class will be Deprecated,begin +function DeprecatedClass.CCGridBase() + deprecatedTip("CCGridBase","cc.GridBase") + return cc.GridBase +end +_G["CCGridBase"] = DeprecatedClass.CCGridBase() +--CCGridBase class will be Deprecated,end + +--CCSkewTo class will be Deprecated,begin +function DeprecatedClass.CCSkewTo() + deprecatedTip("CCSkewTo","cc.SkewTo") + return cc.SkewTo +end +_G["CCSkewTo"] = DeprecatedClass.CCSkewTo() +--CCSkewTo class will be Deprecated,end + +--CCCardinalSplineTo class will be Deprecated,begin +function DeprecatedClass.CCCardinalSplineTo() + deprecatedTip("CCCardinalSplineTo","cc.CardinalSplineTo") + return cc.CardinalSplineTo +end +_G["CCCardinalSplineTo"] = DeprecatedClass.CCCardinalSplineTo() +--CCCardinalSplineTo class will be Deprecated,end + +--CCTMXMapInfo class will be Deprecated,begin +function DeprecatedClass.CCTMXMapInfo() + deprecatedTip("CCTMXMapInfo","cc.TMXMapInfo") + return cc.TMXMapInfo +end +_G["CCTMXMapInfo"] = DeprecatedClass.CCTMXMapInfo() +--CCTMXMapInfo class will be Deprecated,end + +--CCEaseExponentialIn class will be Deprecated,begin +function DeprecatedClass.CCEaseExponentialIn() + deprecatedTip("CCEaseExponentialIn","cc.EaseExponentialIn") + return cc.EaseExponentialIn +end +_G["CCEaseExponentialIn"] = DeprecatedClass.CCEaseExponentialIn() +--CCEaseExponentialIn class will be Deprecated,end + +--CCReuseGrid class will be Deprecated,begin +function DeprecatedClass.CCReuseGrid() + deprecatedTip("CCReuseGrid","cc.ReuseGrid") + return cc.ReuseGrid +end +_G["CCReuseGrid"] = DeprecatedClass.CCReuseGrid() +--CCReuseGrid class will be Deprecated,end + +--CCMenuItemAtlasFont class will be Deprecated,begin +function DeprecatedClass.CCMenuItemAtlasFont() + deprecatedTip("CCMenuItemAtlasFont","cc.MenuItemAtlasFont") + return cc.MenuItemAtlasFont +end +_G["CCMenuItemAtlasFont"] = DeprecatedClass.CCMenuItemAtlasFont() +--CCMenuItemAtlasFont class will be Deprecated,end + +--CCSpriteFrame class will be Deprecated,begin +function DeprecatedClass.CCSpriteFrame() + deprecatedTip("CCSpriteFrame","cc.SpriteFrame") + return cc.SpriteFrame +end +_G["CCSpriteFrame"] = DeprecatedClass.CCSpriteFrame() +--CCSpriteFrame class will be Deprecated,end + +--CCSplitRows class will be Deprecated,begin +function DeprecatedClass.CCSplitRows() + deprecatedTip("CCSplitRows","cc.SplitRows") + return cc.SplitRows +end +_G["CCSplitRows"] = DeprecatedClass.CCSplitRows() +--CCSplitRows class will be Deprecated,end + +--CCControlStepper class will be Deprecated,begin +function DeprecatedClass.CCControlStepper() + deprecatedTip("CCControlStepper","cc.ControlStepper") + return cc.ControlStepper +end +_G["CCControlStepper"] = DeprecatedClass.CCControlStepper() +--CCControlStepper class will be Deprecated,end + +--CCSprite class will be Deprecated,begin +function DeprecatedClass.CCSprite() + deprecatedTip("CCSprite","cc.Sprite") + return cc.Sprite +end +_G["CCSprite"] = DeprecatedClass.CCSprite() +--CCSprite class will be Deprecated,end + +--CCOrbitCamera class will be Deprecated,begin +function DeprecatedClass.CCOrbitCamera() + deprecatedTip("CCOrbitCamera","cc.OrbitCamera") + return cc.OrbitCamera +end +_G["CCOrbitCamera"] = DeprecatedClass.CCOrbitCamera() +--CCOrbitCamera class will be Deprecated,end + +--CCUserDefault class will be Deprecated,begin +function DeprecatedClass.CCUserDefault() + deprecatedTip("CCUserDefault","cc.UserDefault") + return cc.UserDefault +end +_G["CCUserDefault"] = DeprecatedClass.CCUserDefault() +--CCUserDefault class will be Deprecated,end + +--CCFadeOutUpTiles class will be Deprecated,begin +function DeprecatedClass.CCFadeOutUpTiles() + deprecatedTip("CCFadeOutUpTiles","cc.FadeOutUpTiles") + return cc.FadeOutUpTiles +end +_G["CCFadeOutUpTiles"] = DeprecatedClass.CCFadeOutUpTiles() +--CCFadeOutUpTiles class will be Deprecated,end + +--CCParticleRain class will be Deprecated,begin +function DeprecatedClass.CCParticleRain() + deprecatedTip("CCParticleRain","cc.ParticleRain") + return cc.ParticleRain +end +_G["CCParticleRain"] = DeprecatedClass.CCParticleRain() +--CCParticleRain class will be Deprecated,end + +--CCWaves class will be Deprecated,begin +function DeprecatedClass.CCWaves() + deprecatedTip("CCWaves","cc.Waves") + return cc.Waves +end +_G["CCWaves"] = DeprecatedClass.CCWaves() +--CCWaves class will be Deprecated,end + +--CCEaseOut class will be Deprecated,begin +function DeprecatedClass.CCEaseOut() + deprecatedTip("CCEaseOut","cc.EaseOut") + return cc.EaseOut +end +_G["CCEaseOut"] = DeprecatedClass.CCEaseOut() +--CCEaseOut class will be Deprecated,end + +--CCEaseBounceIn class will be Deprecated,begin +function DeprecatedClass.CCEaseBounceIn() + deprecatedTip("CCEaseBounceIn","cc.EaseBounceIn") + return cc.EaseBounceIn +end +_G["CCEaseBounceIn"] = DeprecatedClass.CCEaseBounceIn() +--CCEaseBounceIn class will be Deprecated,end + +--CCMenuItemFont class will be Deprecated,begin +function DeprecatedClass.CCMenuItemFont() + deprecatedTip("CCMenuItemFont","cc.MenuItemFont") + return cc.MenuItemFont +end +_G["CCMenuItemFont"] = DeprecatedClass.CCMenuItemFont() +--CCMenuItemFont class will be Deprecated,end + +--CCEaseSineOut class will be Deprecated,begin +function DeprecatedClass.CCEaseSineOut() + deprecatedTip("CCEaseSineOut","cc.EaseSineOut") + return cc.EaseSineOut +end +_G["CCEaseSineOut"] = DeprecatedClass.CCEaseSineOut() +--CCEaseSineOut class will be Deprecated,end + +--CCTextureCache class will be Deprecated,begin +function DeprecatedClass.CCTextureCache() + deprecatedTip("CCTextureCache","cc.TextureCache") + return cc.TextureCache +end +_G["CCTextureCache"] = DeprecatedClass.CCTextureCache() +--CCTextureCache class will be Deprecated,end + +--CCTiledGrid3D class will be Deprecated,begin +function DeprecatedClass.CCTiledGrid3D() + deprecatedTip("CCTiledGrid3D","cc.TiledGrid3D") + return cc.TiledGrid3D +end +_G["CCTiledGrid3D"] = DeprecatedClass.CCTiledGrid3D() +--CCTiledGrid3D class will be Deprecated,end + +--CCRemoveSelf class will be Deprecated,begin +function DeprecatedClass.CCRemoveSelf() + deprecatedTip("CCRemoveSelf","cc.RemoveSelf") + return cc.RemoveSelf +end +_G["CCRemoveSelf"] = DeprecatedClass.CCRemoveSelf() +--CCRemoveSelf class will be Deprecated,end + +--CCControlSaturationBrightnessPicker class will be Deprecated,begin +function DeprecatedClass.CCControlSaturationBrightnessPicker() + deprecatedTip("CCControlSaturationBrightnessPicker","cc.ControlSaturationBrightnessPicker") + return cc.ControlSaturationBrightnessPicker +end +_G["CCControlSaturationBrightnessPicker"] = DeprecatedClass.CCControlSaturationBrightnessPicker() +--CCControlSaturationBrightnessPicker class will be Deprecated,end + +--CCLabelTTF class will be Deprecated,begin +function DeprecatedClass.CCLabelTTF() + deprecatedTip("CCLabelTTF","cc.LabelTTF") + return cc.LabelTTF +end +_G["CCLabelTTF"] = DeprecatedClass.CCLabelTTF() +--CCLabelTTF class will be Deprecated,end + +--CCTouch class will be Deprecated,begin +function DeprecatedClass.CCTouch() + deprecatedTip("CCTouch","cc.Touch") + return cc.Touch +end +_G["CCTouch"] = DeprecatedClass.CCTouch() +--CCTouch class will be Deprecated,end + +--CCMoveBy class will be Deprecated,begin +function DeprecatedClass.CCMoveBy() + deprecatedTip("CCMoveBy","cc.MoveBy") + return cc.MoveBy +end +_G["CCMoveBy"] = DeprecatedClass.CCMoveBy() +--CCMoveBy class will be Deprecated,end + +--CCMotionStreak class will be Deprecated,begin +function DeprecatedClass.CCMotionStreak() + deprecatedTip("CCMotionStreak","cc.MotionStreak") + return cc.MotionStreak +end +_G["CCMotionStreak"] = DeprecatedClass.CCMotionStreak() +--CCMotionStreak class will be Deprecated,end + +--CCRotateBy class will be Deprecated,begin +function DeprecatedClass.CCRotateBy() + deprecatedTip("CCRotateBy","cc.RotateBy") + return cc.RotateBy +end +_G["CCRotateBy"] = DeprecatedClass.CCRotateBy() +--CCRotateBy class will be Deprecated,end + +--CCFileUtils class will be Deprecated,begin +function DeprecatedClass.CCFileUtils() + deprecatedTip("CCFileUtils","cc.FileUtils") + return cc.FileUtils +end +_G["CCFileUtils"] = DeprecatedClass.CCFileUtils() +--CCFileUtils class will be Deprecated,end + +--CCBezierBy class will be Deprecated,begin +function DeprecatedClass.CCBezierBy() + deprecatedTip("CCBezierBy","cc.BezierBy") + return cc.BezierBy +end +_G["CCBezierBy"] = DeprecatedClass.CCBezierBy() +--CCBezierBy class will be Deprecated,end + +--CCTransitionFade class will be Deprecated,begin +function DeprecatedClass.CCTransitionFade() + deprecatedTip("CCTransitionFade","cc.TransitionFade") + return cc.TransitionFade +end +_G["CCTransitionFade"] = DeprecatedClass.CCTransitionFade() +--CCTransitionFade class will be Deprecated,end + +--CCTransitionProgressOutIn class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressOutIn() + deprecatedTip("CCTransitionProgressOutIn","cc.TransitionProgressOutIn") + return cc.TransitionProgressOutIn +end +_G["CCTransitionProgressOutIn"] = DeprecatedClass.CCTransitionProgressOutIn() +--CCTransitionProgressOutIn class will be Deprecated,end + +--CCCatmullRomBy class will be Deprecated,begin +function DeprecatedClass.CCCatmullRomBy() + deprecatedTip("CCCatmullRomBy","cc.CatmullRomBy") + return cc.CatmullRomBy +end +_G["CCCatmullRomBy"] = DeprecatedClass.CCCatmullRomBy() +--CCCatmullRomBy class will be Deprecated,end + +--CCGridAction class will be Deprecated,begin +function DeprecatedClass.CCGridAction() + deprecatedTip("CCGridAction","cc.GridAction") + return cc.GridAction +end +_G["CCGridAction"] = DeprecatedClass.CCGridAction() +--CCGridAction class will be Deprecated,end + +--CCShaky3D class will be Deprecated,begin +function DeprecatedClass.CCShaky3D() + deprecatedTip("CCShaky3D","cc.Shaky3D") + return cc.Shaky3D +end +_G["CCShaky3D"] = DeprecatedClass.CCShaky3D() +--CCShaky3D class will be Deprecated,end + +--CCTransitionEaseScene class will be Deprecated,begin +function DeprecatedClass.CCTransitionEaseScene() + deprecatedTip("CCTransitionEaseScene","cc.TransitionEaseScene") + return cc.TransitionEaseScene +end +_G["CCTransitionEaseScene"] = DeprecatedClass.CCTransitionEaseScene() +--CCTransitionEaseScene class will be Deprecated,end + +--CCSequence class will be Deprecated,begin +function DeprecatedClass.CCSequence() + deprecatedTip("CCSequence","cc.Sequence") + return cc.Sequence +end +_G["CCSequence"] = DeprecatedClass.CCSequence() +--CCSequence class will be Deprecated,end + +--CCTransitionFadeUp class will be Deprecated,begin +function DeprecatedClass.CCTransitionFadeUp() + deprecatedTip("CCTransitionFadeUp","cc.TransitionFadeUp") + return cc.TransitionFadeUp +end +_G["CCTransitionFadeUp"] = DeprecatedClass.CCTransitionFadeUp() +--CCTransitionFadeUp class will be Deprecated,end + +--CCTransitionProgressRadialCW class will be Deprecated,begin +function DeprecatedClass.CCTransitionProgressRadialCW() + deprecatedTip("CCTransitionProgressRadialCW","cc.TransitionProgressRadialCW") + return cc.TransitionProgressRadialCW +end +_G["CCTransitionProgressRadialCW"] = DeprecatedClass.CCTransitionProgressRadialCW() +--CCTransitionProgressRadialCW class will be Deprecated,end + +--CCShuffleTiles class will be Deprecated,begin +function DeprecatedClass.CCShuffleTiles() + deprecatedTip("CCShuffleTiles","cc.ShuffleTiles") + return cc.ShuffleTiles +end +_G["CCShuffleTiles"] = DeprecatedClass.CCShuffleTiles() +--CCShuffleTiles class will be Deprecated,end + +--CCTransitionSlideInR class will be Deprecated,begin +function DeprecatedClass.CCTransitionSlideInR() + deprecatedTip("CCTransitionSlideInR","cc.TransitionSlideInR") + return cc.TransitionSlideInR +end +_G["CCTransitionSlideInR"] = DeprecatedClass.CCTransitionSlideInR() +--CCTransitionSlideInR class will be Deprecated,end + +--CCScene class will be Deprecated,begin +function DeprecatedClass.CCScene() + deprecatedTip("CCScene","cc.Scene") + return cc.Scene +end +_G["CCScene"] = DeprecatedClass.CCScene() +--CCScene class will be Deprecated,end + +--CCParallaxNode class will be Deprecated,begin +function DeprecatedClass.CCParallaxNode() + deprecatedTip("CCParallaxNode","cc.ParallaxNode") + return cc.ParallaxNode +end +_G["CCParallaxNode"] = DeprecatedClass.CCParallaxNode() +--CCParallaxNode class will be Deprecated,end + +--CCTransitionSlideInL class will be Deprecated,begin +function DeprecatedClass.CCTransitionSlideInL() + deprecatedTip("CCTransitionSlideInL","cc.TransitionSlideInL") + return cc.TransitionSlideInL +end +_G["CCTransitionSlideInL"] = DeprecatedClass.CCTransitionSlideInL() +--CCTransitionSlideInL class will be Deprecated,end + +--CCControlSwitch class will be Deprecated,begin +function DeprecatedClass.CCControlSwitch() + deprecatedTip("CCControlSwitch","cc.ControlSwitch") + return cc.ControlSwitch +end +_G["CCControlSwitch"] = DeprecatedClass.CCControlSwitch() +--CCControlSwitch class will be Deprecated,end + +--CCWavesTiles3D class will be Deprecated,begin +function DeprecatedClass.CCWavesTiles3D() + deprecatedTip("CCWavesTiles3D","cc.WavesTiles3D") + return cc.WavesTiles3D +end +_G["CCWavesTiles3D"] = DeprecatedClass.CCWavesTiles3D() +--CCWavesTiles3D class will be Deprecated,end + +--CCTransitionSlideInB class will be Deprecated,begin +function DeprecatedClass.CCTransitionSlideInB() + deprecatedTip("CCTransitionSlideInB","cc.TransitionSlideInB") + return cc.TransitionSlideInB +end +_G["CCTransitionSlideInB"] = DeprecatedClass.CCTransitionSlideInB() +--CCTransitionSlideInB class will be Deprecated,end + +--CCSpeed class will be Deprecated,begin +function DeprecatedClass.CCSpeed() + deprecatedTip("CCSpeed","cc.Speed") + return cc.Speed +end +_G["CCSpeed"] = DeprecatedClass.CCSpeed() +--CCSpeed class will be Deprecated,end + +--CCShatteredTiles3D class will be Deprecated,begin +function DeprecatedClass.CCShatteredTiles3D() + deprecatedTip("CCShatteredTiles3D","cc.ShatteredTiles3D") + return cc.ShatteredTiles3D +end +_G["CCShatteredTiles3D"] = DeprecatedClass.CCShatteredTiles3D() +--CCShatteredTiles3D class will be Deprecated,end + +--CCCallFuncN class will be Deprecated,begin +function DeprecatedClass.CCCallFuncN() + deprecatedTip("CCCallFuncN","cc.CallFunc") + return cc.CallFunc +end +_G["CCCallFuncN"] = DeprecatedClass.CCCallFuncN() +--CCCallFuncN class will be Deprecated,end + +--ccBlendFunc class will be Deprecated,begin +function DeprecatedClass.ccBlendFunc() + deprecatedTip("ccBlendFunc","BlendFunc") + return BlendFunc +end +_G["ccBlendFunc"] = DeprecatedClass.ccBlendFunc() +--ccBlendFunc class will be Deprecated,end + + + diff --git a/scripting/lua/script/DeprecatedEnum.lua b/scripting/lua/script/DeprecatedEnum.lua new file mode 100644 index 0000000000..912ac5e38b --- /dev/null +++ b/scripting/lua/script/DeprecatedEnum.lua @@ -0,0 +1,387 @@ +require "Cocos2dConstants.lua" +require "OpenglConstants.lua" +--Enums will be deprecated,begin +_G.kCCTextAlignmentLeft = cc.TEXT_ALIGNMENT_LEFT +_G.kCCTextAlignmentRight = cc.TEXT_ALIGNMENT_RIGHT +_G.kCCTextAlignmentCenter = cc.TEXT_ALIGNMENT_CENTER +_G.kCCVerticalTextAlignmentTop = cc.VERTICAL_TEXT_ALIGNMENT_TOP +_G.kCCVerticalTextAlignmentCenter = cc.VERTICAL_TEXT_ALIGNMENT_CENTER +_G.kCCVerticalTextAlignmentBottom = cc.VERTICAL_TEXT_ALIGNMENT_BOTTOM +_G.kCCDirectorProjection3D = cc.DIRECTOR_PROJECTION3_D +_G.kCCDirectorProjection2D = cc.DIRECTOR_PROJECTION2_D +_G.kCCDirectorProjectionCustom = cc.DIRECTOR_PROJECTION_CUSTOM +_G.kCCDirectorProjectionDefault = cc.DIRECTOR_PROJECTION_DEFAULT +_G.kCCNodeTagInvalid = cc.NODE_TAG_INVALID +_G.kCCNodeOnEnter = cc.NODE_ON_ENTER +_G.kCCNodeOnExit = cc.NODE_ON_EXIT +_G.kCCTexture2DPixelFormat_RGBA8888 = cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A8888 +_G.kCCTexture2DPixelFormat_RGB888 = cc.TEXTURE2_D_PIXEL_FORMAT_RG_B888 +_G.kCCTexture2DPixelFormat_RGB565 = cc.TEXTURE2_D_PIXEL_FORMAT_RG_B565 +_G.kCCTexture2DPixelFormat_A8 = cc.TEXTURE2_D_PIXEL_FORMAT_A8 +_G.kCCTexture2DPixelFormat_I8 = cc.TEXTURE2_D_PIXEL_FORMAT_I8 +_G.kCCTexture2DPixelFormat_AI88 = cc.TEXTURE2_D_PIXEL_FORMAT_A_I88 +_G.kCCTexture2DPixelFormat_RGBA4444 = cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A4444 +_G.kCCTexture2DPixelFormat_RGB5A1 = cc.TEXTURE2_D_PIXEL_FORMAT_RGB5_A1 +_G.kCCTexture2DPixelFormat_PVRTC4 = cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC4 +_G.kCCTexture2DPixelFormat_PVRTC2 = cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC2 +_G.kCCTexture2DPixelFormat_Default = cc.TEXTURE2_D_PIXEL_FORMAT_DEFAULT +_G.kCCImageFormatPNG = cc.IMAGE_FORMAT_PNG +_G.kCCImageFormatJPEG = cc.IMAGE_FORMAT_JPEG +_G.kCCTouchesOneByOne = cc.TOUCHES_ONE_BY_ONE +_G.kCCTouchesAllAtOnce = cc.TOUCHES_ALL_AT_ONCE +_G.kCCTransitionOrientationLeftOver = cc.TRANSITION_ORIENTATION_LEFT_OVER +_G.kCCTransitionOrientationRightOver = cc.TRANSITION_ORIENTATION_RIGHT_OVER +_G.kCCTransitionOrientationUpOver = cc.TRANSITION_ORIENTATION_UP_OVER +_G.kCCTransitionOrientationDownOver = cc.TRANSITION_ORIENTATION_DOWN_OVER +_G.kCCActionTagInvalid = cc.ACTION_TAG_INVALID +_G.kCCLabelAutomaticWidth = cc.LABEL_AUTOMATIC_WIDTH +_G.kCCMenuStateWaiting = cc.MENU_STATE_WAITING +_G.kCCMenuStateTrackingTouch = cc.MENU_STATE_TRACKING_TOUCH +_G.kCCMenuHandlerPriority = cc.MENU_HANDLER_PRIORITY +_G.kCCParticleDurationInfinity = cc.PARTICLE_DURATION_INFINITY +_G.kCCParticleStartSizeEqualToEndSize = cc.PARTICLE_START_SIZE_EQUAL_TO_END_SIZE +_G.kCCParticleStartRadiusEqualToEndRadius = cc.PARTICLE_START_RADIUS_EQUAL_TO_END_RADIUS +_G.kCCParticleModeGravity = cc.PARTICLE_MODE_GRAVITY +_G.kCCParticleModeRadius = cc.PARTICLE_MODE_RADIUS +_G.kCCPositionTypeFree = cc.POSITION_TYPE_FREE +_G.kCCPositionTypeRelative = cc.POSITION_TYPE_RELATIVE +_G.kCCPositionTypeGrouped = cc.POSITION_TYPE_GROUPED +_G.kCCProgressTimerTypeRadial = cc.PROGRESS_TIMER_TYPE_RADIAL +_G.kCCProgressTimerTypeBar = cc.PROGRESS_TIMER_TYPE_BAR +_G.kCCTMXTileHorizontalFlag = cc.TMX_TILE_HORIZONTAL_FLAG +_G.kCCTMXTileVerticalFlag = cc.TMX_TILE_VERTICAL_FLAG +_G.kCCTMXTileDiagonalFlag = cc.TMX_TILE_DIAGONAL_FLAG +_G.kCCFlipedAll = cc.FLIPED_ALL +_G.kCCFlippedMask = cc.FLIPPED_MASK +_G.kCCControlStepperPartMinus = cc.CONTROL_STEPPER_PART_MINUS +_G.kCCControlStepperPartPlus = cc.CONTROL_STEPPER_PART_PLUS +_G.kCCControlStepperPartNone = cc.CONTROL_STEPPER_PART_NONE + +_G.kLanguageEnglish = cc.LANGUAGE_ENGLISH +_G.kLanguageChinese = cc.LANGUAGE_CHINESE +_G.kLanguageFrench = cc.LANGUAGE_FRENCH +_G.kLanguageItalian = cc.LANGUAGE_ITALIAN +_G.kLanguageGerman = cc.LANGUAGE_GERMAN +_G.kLanguageSpanish = cc.LANGUAGE_SPANISH +_G.kLanguageRussian = cc.LANGUAGE_RUSSIAN +_G.kLanguageKorean = cc.LANGUAGE_KOREAN +_G.kLanguageJapanese = cc.LANGUAGE_JAPANESE +_G.kLanguageHungarian = cc.LANGUAGE_HUNGARIAN +_G.kLanguagePortuguese = cc.LANGUAGE_PORTUGUESE +_G.kLanguageArabic = cc.LANGUAGE_ARABIC +_G.kTargetWindows = cc.PLATFORM_OS_WINDOWS +_G.kTargetLinux = cc.PLATFORM_OS_LINUX +_G.kTargetMacOS = cc.PLATFORM_OS_MAC +_G.kTargetAndroid = cc.PLATFORM_OS_ANDROID +_G.kTargetIphone = cc.PLATFORM_OS_IPHONE +_G.kTargetIpad = cc.PLATFORM_OS_IPAD +_G.kTargetBlackBerry = cc.PLATFORM_OS_BLACKBERRY + +_G.GL_ZERO = gl.ZERO +_G.GL_ONE = gl.ONE +_G.GL_SRC_COLOR = gl.SRC_COLOR +_G.GL_ONE_MINUS_SRC_COLOR = gl.ONE_MINUS_SRC_COLOR +_G.GL_SRC_ALPHA = gl.SRC_ALPHA +_G.GL_ONE_MINUS_SRC_ALPHA = gl.ONE_MINUS_SRC_ALPHA +_G.GL_DST_ALPHA = gl.DST_ALPHA +_G.GL_ONE_MINUS_DST_ALPHA = gl.ONE_MINUS_DST_ALPHA +_G.GL_DST_COLOR = gl.DST_COLOR +_G.GL_ONE_MINUS_DST_COLOR = gl.ONE_MINUS_DST_COLOR +_G.GL_RENDERBUFFER_INTERNAL_FORMAT = gl.RENDERBUFFER_INTERNAL_FORMAT +_G.GL_LINE_WIDTH = gl.LINE_WIDTH +_G.GL_CONSTANT_ALPHA = gl.CONSTANT_ALPHA +_G.GL_BLEND_SRC_ALPHA = gl.BLEND_SRC_ALPHA +_G.GL_GREEN_BITS = gl.GREEN_BITS +_G.GL_STENCIL_REF = gl.STENCIL_REF +_G.GL_ONE_MINUS_SRC_ALPHA = gl.ONE_MINUS_SRC_ALPHA +_G.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE +_G.GL_CCW = gl.CCW +_G.GL_MAX_TEXTURE_IMAGE_UNITS = gl.MAX_TEXTURE_IMAGE_UNITS +_G.GL_BACK = gl.BACK +_G.GL_ACTIVE_ATTRIBUTES = gl.ACTIVE_ATTRIBUTES +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_X = gl.TEXTURE_CUBE_MAP_POSITIVE_X +_G.GL_STENCIL_BACK_VALUE_MASK = gl.STENCIL_BACK_VALUE_MASK +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_Z = gl.TEXTURE_CUBE_MAP_POSITIVE_Z +_G.GL_ONE = gl.ONE +_G.GL_TRUE = gl.TRUE +_G.GL_TEXTURE12 = gl.TEXTURE12 +_G.GL_LINK_STATUS = gl.LINK_STATUS +_G.GL_BLEND = gl.BLEND +_G.GL_LESS = gl.LESS +_G.GL_TEXTURE16 = gl.TEXTURE16 +_G.GL_BOOL_VEC2 = gl.BOOL_VEC2 +_G.GL_KEEP = gl.KEEP +_G.GL_DST_COLOR = gl.DST_COLOR +_G.GL_VERTEX_ATTRIB_ARRAY_ENABLED = gl.VERTEX_ATTRIB_ARRAY_ENABLED +_G.GL_EXTENSIONS = gl.EXTENSIONS +_G.GL_FRONT = gl.FRONT +_G.GL_DST_ALPHA = gl.DST_ALPHA +_G.GL_ATTACHED_SHADERS = gl.ATTACHED_SHADERS +_G.GL_STENCIL_BACK_FUNC = gl.STENCIL_BACK_FUNC +_G.GL_ONE_MINUS_DST_COLOR = gl.ONE_MINUS_DST_COLOR +_G.GL_BLEND_EQUATION = gl.BLEND_EQUATION +_G.GL_RENDERBUFFER_DEPTH_SIZE = gl.RENDERBUFFER_DEPTH_SIZE +_G.GL_PACK_ALIGNMENT = gl.PACK_ALIGNMENT +_G.GL_VENDOR = gl.VENDOR +_G.GL_NEAREST_MIPMAP_LINEAR = gl.NEAREST_MIPMAP_LINEAR +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_Y = gl.TEXTURE_CUBE_MAP_POSITIVE_Y +_G.GL_NEAREST = gl.NEAREST +_G.GL_RENDERBUFFER_WIDTH = gl.RENDERBUFFER_WIDTH +_G.GL_ARRAY_BUFFER_BINDING = gl.ARRAY_BUFFER_BINDING +_G.GL_ARRAY_BUFFER = gl.ARRAY_BUFFER +_G.GL_LEQUAL = gl.LEQUAL +_G.GL_VERSION = gl.VERSION +_G.GL_COLOR_CLEAR_VALUE = gl.COLOR_CLEAR_VALUE +_G.GL_RENDERER = gl.RENDERER +_G.GL_STENCIL_BACK_PASS_DEPTH_PASS = gl.STENCIL_BACK_PASS_DEPTH_PASS +_G.GL_STENCIL_BACK_PASS_DEPTH_FAIL = gl.STENCIL_BACK_PASS_DEPTH_FAIL +_G.GL_STENCIL_BACK_WRITEMASK = gl.STENCIL_BACK_WRITEMASK +_G.GL_BOOL = gl.BOOL +_G.GL_VIEWPORT = gl.VIEWPORT +_G.GL_FRAGMENT_SHADER = gl.FRAGMENT_SHADER +_G.GL_LUMINANCE = gl.LUMINANCE +_G.GL_DECR_WRAP = gl.DECR_WRAP +_G.GL_FUNC_ADD = gl.FUNC_ADD +_G.GL_ONE_MINUS_DST_ALPHA = gl.ONE_MINUS_DST_ALPHA +_G.GL_OUT_OF_MEMORY = gl.OUT_OF_MEMORY +_G.GL_BOOL_VEC4 = gl.BOOL_VEC4 +_G.GL_POLYGON_OFFSET_FACTOR = gl.POLYGON_OFFSET_FACTOR +_G.GL_STATIC_DRAW = gl.STATIC_DRAW +_G.GL_DITHER = gl.DITHER +_G.GL_TEXTURE31 = gl.TEXTURE31 +_G.GL_TEXTURE30 = gl.TEXTURE30 +_G.GL_UNSIGNED_BYTE = gl.UNSIGNED_BYTE +_G.GL_DEPTH_COMPONENT16 = gl.DEPTH_COMPONENT16 +_G.GL_TEXTURE23 = gl.TEXTURE23 +_G.GL_DEPTH_TEST = gl.DEPTH_TEST +_G.GL_STENCIL_PASS_DEPTH_FAIL = gl.STENCIL_PASS_DEPTH_FAIL +_G.GL_BOOL_VEC3 = gl.BOOL_VEC3 +_G.GL_POLYGON_OFFSET_UNITS = gl.POLYGON_OFFSET_UNITS +_G.GL_TEXTURE_BINDING_2D = gl.TEXTURE_BINDING_2D +_G.GL_TEXTURE21 = gl.TEXTURE21 +_G.GL_UNPACK_ALIGNMENT = gl.UNPACK_ALIGNMENT +_G.GL_DONT_CARE = gl.DONT_CARE +_G.GL_BUFFER_SIZE = gl.BUFFER_SIZE +_G.GL_FLOAT_MAT3 = gl.FLOAT_MAT3 +_G.GL_UNSIGNED_SHORT_5_6_5 = gl.UNSIGNED_SHORT_5_6_5 +_G.GL_INT_VEC2 = gl.INT_VEC2 +_G.GL_UNSIGNED_SHORT_4_4_4_4 = gl.UNSIGNED_SHORT_4_4_4_4 +_G.GL_NONE = gl.NONE +_G.GL_BLEND_DST_ALPHA = gl.BLEND_DST_ALPHA +_G.GL_VERTEX_ATTRIB_ARRAY_SIZE = gl.VERTEX_ATTRIB_ARRAY_SIZE +_G.GL_SRC_COLOR = gl.SRC_COLOR +_G.GL_COMPRESSED_TEXTURE_FORMATS = gl.COMPRESSED_TEXTURE_FORMATS +_G.GL_STENCIL_ATTACHMENT = gl.STENCIL_ATTACHMENT +_G.GL_MAX_VERTEX_ATTRIBS = gl.MAX_VERTEX_ATTRIBS +_G.GL_NUM_COMPRESSED_TEXTURE_FORMATS = gl.NUM_COMPRESSED_TEXTURE_FORMATS +_G.GL_BLEND_EQUATION_RGB = gl.BLEND_EQUATION_RGB +_G.GL_TEXTURE = gl.TEXTURE +_G.GL_LINEAR_MIPMAP_LINEAR = gl.LINEAR_MIPMAP_LINEAR +_G.GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING +_G.GL_CURRENT_PROGRAM = gl.CURRENT_PROGRAM +_G.GL_COLOR_BUFFER_BIT = gl.COLOR_BUFFER_BIT +_G.GL_TEXTURE20 = gl.TEXTURE20 +_G.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = gl.ACTIVE_ATTRIBUTE_MAX_LENGTH +_G.GL_TEXTURE28 = gl.TEXTURE28 +_G.GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE +_G.GL_TEXTURE22 = gl.TEXTURE22 +_G.GL_ELEMENT_ARRAY_BUFFER_BINDING = gl.ELEMENT_ARRAY_BUFFER_BINDING +_G.GL_STREAM_DRAW = gl.STREAM_DRAW +_G.GL_SCISSOR_BOX = gl.SCISSOR_BOX +_G.GL_TEXTURE26 = gl.TEXTURE26 +_G.GL_TEXTURE27 = gl.TEXTURE27 +_G.GL_TEXTURE24 = gl.TEXTURE24 +_G.GL_TEXTURE25 = gl.TEXTURE25 +_G.GL_NO_ERROR = gl.NO_ERROR +_G.GL_TEXTURE29 = gl.TEXTURE29 +_G.GL_FLOAT_MAT4 = gl.FLOAT_MAT4 +_G.GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = gl.VERTEX_ATTRIB_ARRAY_NORMALIZED +_G.GL_SAMPLE_COVERAGE_INVERT = gl.SAMPLE_COVERAGE_INVERT +_G.GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL +_G.GL_FLOAT_VEC3 = gl.FLOAT_VEC3 +_G.GL_STENCIL_CLEAR_VALUE = gl.STENCIL_CLEAR_VALUE +_G.GL_UNSIGNED_SHORT_5_5_5_1 = gl.UNSIGNED_SHORT_5_5_5_1 +_G.GL_ACTIVE_UNIFORMS = gl.ACTIVE_UNIFORMS +_G.GL_INVALID_OPERATION = gl.INVALID_OPERATION +_G.GL_DEPTH_ATTACHMENT = gl.DEPTH_ATTACHMENT +_G.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS +_G.GL_FRAMEBUFFER_COMPLETE = gl.FRAMEBUFFER_COMPLETE +_G.GL_ONE_MINUS_CONSTANT_COLOR = gl.ONE_MINUS_CONSTANT_COLOR +_G.GL_TEXTURE2 = gl.TEXTURE2 +_G.GL_TEXTURE1 = gl.TEXTURE1 +_G.GL_GEQUAL = gl.GEQUAL +_G.GL_TEXTURE7 = gl.TEXTURE7 +_G.GL_TEXTURE6 = gl.TEXTURE6 +_G.GL_TEXTURE5 = gl.TEXTURE5 +_G.GL_TEXTURE4 = gl.TEXTURE4 +_G.GL_GENERATE_MIPMAP_HINT = gl.GENERATE_MIPMAP_HINT +_G.GL_ONE_MINUS_SRC_COLOR = gl.ONE_MINUS_SRC_COLOR +_G.GL_TEXTURE9 = gl.TEXTURE9 +_G.GL_STENCIL_TEST = gl.STENCIL_TEST +_G.GL_COLOR_WRITEMASK = gl.COLOR_WRITEMASK +_G.GL_DEPTH_COMPONENT = gl.DEPTH_COMPONENT +_G.GL_STENCIL_INDEX8 = gl.STENCIL_INDEX8 +_G.GL_VERTEX_ATTRIB_ARRAY_TYPE = gl.VERTEX_ATTRIB_ARRAY_TYPE +_G.GL_FLOAT_VEC2 = gl.FLOAT_VEC2 +_G.GL_BLUE_BITS = gl.BLUE_BITS +_G.GL_VERTEX_SHADER = gl.VERTEX_SHADER +_G.GL_SUBPIXEL_BITS = gl.SUBPIXEL_BITS +_G.GL_STENCIL_WRITEMASK = gl.STENCIL_WRITEMASK +_G.GL_FLOAT_VEC4 = gl.FLOAT_VEC4 +_G.GL_TEXTURE17 = gl.TEXTURE17 +_G.GL_ONE_MINUS_CONSTANT_ALPHA = gl.ONE_MINUS_CONSTANT_ALPHA +_G.GL_TEXTURE15 = gl.TEXTURE15 +_G.GL_TEXTURE14 = gl.TEXTURE14 +_G.GL_TEXTURE13 = gl.TEXTURE13 +_G.GL_SAMPLES = gl.SAMPLES +_G.GL_TEXTURE11 = gl.TEXTURE11 +_G.GL_TEXTURE10 = gl.TEXTURE10 +_G.GL_FUNC_SUBTRACT = gl.FUNC_SUBTRACT +_G.GL_STENCIL_BUFFER_BIT = gl.STENCIL_BUFFER_BIT +_G.GL_TEXTURE19 = gl.TEXTURE19 +_G.GL_TEXTURE18 = gl.TEXTURE18 +_G.GL_NEAREST_MIPMAP_NEAREST = gl.NEAREST_MIPMAP_NEAREST +_G.GL_SHORT = gl.SHORT +_G.GL_RENDERBUFFER_BINDING = gl.RENDERBUFFER_BINDING +_G.GL_REPEAT = gl.REPEAT +_G.GL_TEXTURE_MIN_FILTER = gl.TEXTURE_MIN_FILTER +_G.GL_RED_BITS = gl.RED_BITS +_G.GL_FRONT_FACE = gl.FRONT_FACE +_G.GL_BLEND_COLOR = gl.BLEND_COLOR +_G.GL_MIRRORED_REPEAT = gl.MIRRORED_REPEAT +_G.GL_INT_VEC4 = gl.INT_VEC4 +_G.GL_MAX_CUBE_MAP_TEXTURE_SIZE = gl.MAX_CUBE_MAP_TEXTURE_SIZE +_G.GL_RENDERBUFFER_BLUE_SIZE = gl.RENDERBUFFER_BLUE_SIZE +_G.GL_SAMPLE_COVERAGE = gl.SAMPLE_COVERAGE +_G.GL_SRC_ALPHA = gl.SRC_ALPHA +_G.GL_FUNC_REVERSE_SUBTRACT = gl.FUNC_REVERSE_SUBTRACT +_G.GL_DEPTH_WRITEMASK = gl.DEPTH_WRITEMASK +_G.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = gl.FRAMEBUFFER_INCOMPLETE_ATTACHMENT +_G.GL_POLYGON_OFFSET_FILL = gl.POLYGON_OFFSET_FILL +_G.GL_STENCIL_FUNC = gl.STENCIL_FUNC +_G.GL_REPLACE = gl.REPLACE +_G.GL_LUMINANCE_ALPHA = gl.LUMINANCE_ALPHA +_G.GL_DEPTH_RANGE = gl.DEPTH_RANGE +_G.GL_FASTEST = gl.FASTEST +_G.GL_STENCIL_FAIL = gl.STENCIL_FAIL +_G.GL_UNSIGNED_SHORT = gl.UNSIGNED_SHORT +_G.GL_RENDERBUFFER_HEIGHT = gl.RENDERBUFFER_HEIGHT +_G.GL_STENCIL_BACK_FAIL = gl.STENCIL_BACK_FAIL +_G.GL_BLEND_SRC_RGB = gl.BLEND_SRC_RGB +_G.GL_TEXTURE3 = gl.TEXTURE3 +_G.GL_RENDERBUFFER = gl.RENDERBUFFER +_G.GL_RGB5_A1 = gl.RGB5_A1 +_G.GL_RENDERBUFFER_ALPHA_SIZE = gl.RENDERBUFFER_ALPHA_SIZE +_G.GL_RENDERBUFFER_STENCIL_SIZE = gl.RENDERBUFFER_STENCIL_SIZE +_G.GL_NOTEQUAL = gl.NOTEQUAL +_G.GL_BLEND_DST_RGB = gl.BLEND_DST_RGB +_G.GL_FRONT_AND_BACK = gl.FRONT_AND_BACK +_G.GL_TEXTURE_BINDING_CUBE_MAP = gl.TEXTURE_BINDING_CUBE_MAP +_G.GL_MAX_RENDERBUFFER_SIZE = gl.MAX_RENDERBUFFER_SIZE +_G.GL_ZERO = gl.ZERO +_G.GL_TEXTURE0 = gl.TEXTURE0 +_G.GL_SAMPLE_ALPHA_TO_COVERAGE = gl.SAMPLE_ALPHA_TO_COVERAGE +_G.GL_BUFFER_USAGE = gl.BUFFER_USAGE +_G.GL_ACTIVE_TEXTURE = gl.ACTIVE_TEXTURE +_G.GL_BYTE = gl.BYTE +_G.GL_CW = gl.CW +_G.GL_DYNAMIC_DRAW = gl.DYNAMIC_DRAW +_G.GL_RENDERBUFFER_RED_SIZE = gl.RENDERBUFFER_RED_SIZE +_G.GL_FALSE = gl.FALSE +_G.GL_GREATER = gl.GREATER +_G.GL_RGBA4 = gl.RGBA4 +_G.GL_VALIDATE_STATUS = gl.VALIDATE_STATUS +_G.GL_STENCIL_BITS = gl.STENCIL_BITS +_G.GL_RGB = gl.RGB +_G.GL_INT = gl.INT +_G.GL_DEPTH_FUNC = gl.DEPTH_FUNC +_G.GL_SAMPLER_2D = gl.SAMPLER_2D +_G.GL_NICEST = gl.NICEST +_G.GL_MAX_VIEWPORT_DIMS = gl.MAX_VIEWPORT_DIMS +_G.GL_CULL_FACE = gl.CULL_FACE +_G.GL_INT_VEC3 = gl.INT_VEC3 +_G.GL_ALIASED_POINT_SIZE_RANGE = gl.ALIASED_POINT_SIZE_RANGE +_G.GL_INVALID_ENUM = gl.INVALID_ENUM +_G.GL_INVERT = gl.INVERT +_G.GL_CULL_FACE_MODE = gl.CULL_FACE_MODE +_G.GL_TEXTURE8 = gl.TEXTURE8 +_G.GL_VERTEX_ATTRIB_ARRAY_POINTER = gl.VERTEX_ATTRIB_ARRAY_POINTER +_G.GL_TEXTURE_WRAP_S = gl.TEXTURE_WRAP_S +_G.GL_VERTEX_ATTRIB_ARRAY_STRIDE = gl.VERTEX_ATTRIB_ARRAY_STRIDE +_G.GL_LINES = gl.LINES +_G.GL_EQUAL = gl.EQUAL +_G.GL_LINE_LOOP = gl.LINE_LOOP +_G.GL_TEXTURE_WRAP_T = gl.TEXTURE_WRAP_T +_G.GL_DEPTH_BUFFER_BIT = gl.DEPTH_BUFFER_BIT +_G.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS +_G.GL_SHADER_TYPE = gl.SHADER_TYPE +_G.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_X = gl.TEXTURE_CUBE_MAP_NEGATIVE_X +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = gl.TEXTURE_CUBE_MAP_NEGATIVE_Y +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = gl.TEXTURE_CUBE_MAP_NEGATIVE_Z +_G.GL_DECR = gl.DECR +_G.GL_DELETE_STATUS = gl.DELETE_STATUS +_G.GL_DEPTH_BITS = gl.DEPTH_BITS +_G.GL_INCR = gl.INCR +_G.GL_SAMPLE_COVERAGE_VALUE = gl.SAMPLE_COVERAGE_VALUE +_G.GL_ALPHA_BITS = gl.ALPHA_BITS +_G.GL_FLOAT_MAT2 = gl.FLOAT_MAT2 +_G.GL_LINE_STRIP = gl.LINE_STRIP +_G.GL_SHADER_SOURCE_LENGTH = gl.SHADER_SOURCE_LENGTH +_G.GL_INVALID_VALUE = gl.INVALID_VALUE +_G.GL_NEVER = gl.NEVER +_G.GL_INCR_WRAP = gl.INCR_WRAP +_G.GL_BLEND_EQUATION_ALPHA = gl.BLEND_EQUATION_ALPHA +_G.GL_TEXTURE_MAG_FILTER = gl.TEXTURE_MAG_FILTER +_G.GL_POINTS = gl.POINTS +_G.GL_COLOR_ATTACHMENT0 = gl.COLOR_ATTACHMENT0 +_G.GL_RGBA = gl.RGBA +_G.GL_SRC_ALPHA_SATURATE = gl.SRC_ALPHA_SATURATE +_G.GL_SAMPLER_CUBE = gl.SAMPLER_CUBE +_G.GL_FRAMEBUFFER = gl.FRAMEBUFFER +_G.GL_TEXTURE_CUBE_MAP = gl.TEXTURE_CUBE_MAP +_G.GL_SAMPLE_BUFFERS = gl.SAMPLE_BUFFERS +_G.GL_LINEAR = gl.LINEAR +_G.GL_LINEAR_MIPMAP_NEAREST = gl.LINEAR_MIPMAP_NEAREST +_G.GL_ACTIVE_UNIFORM_MAX_LENGTH = gl.ACTIVE_UNIFORM_MAX_LENGTH +_G.GL_STENCIL_BACK_REF = gl.STENCIL_BACK_REF +_G.GL_ELEMENT_ARRAY_BUFFER = gl.ELEMENT_ARRAY_BUFFER +_G.GL_CLAMP_TO_EDGE = gl.CLAMP_TO_EDGE +_G.GL_TRIANGLE_STRIP = gl.TRIANGLE_STRIP +_G.GL_CONSTANT_COLOR = gl.CONSTANT_COLOR +_G.GL_COMPILE_STATUS = gl.COMPILE_STATUS +_G.GL_RENDERBUFFER_GREEN_SIZE = gl.RENDERBUFFER_GREEN_SIZE +_G.GL_UNSIGNED_INT = gl.UNSIGNED_INT +_G.GL_DEPTH_CLEAR_VALUE = gl.DEPTH_CLEAR_VALUE +_G.GL_ALIASED_LINE_WIDTH_RANGE = gl.ALIASED_LINE_WIDTH_RANGE +_G.GL_SHADING_LANGUAGE_VERSION = gl.SHADING_LANGUAGE_VERSION +_G.GL_FRAMEBUFFER_UNSUPPORTED = gl.FRAMEBUFFER_UNSUPPORTED +_G.GL_INFO_LOG_LENGTH = gl.INFO_LOG_LENGTH +_G.GL_STENCIL_PASS_DEPTH_PASS = gl.STENCIL_PASS_DEPTH_PASS +_G.GL_STENCIL_VALUE_MASK = gl.STENCIL_VALUE_MASK +_G.GL_ALWAYS = gl.ALWAYS +_G.GL_MAX_TEXTURE_SIZE = gl.MAX_TEXTURE_SIZE +_G.GL_FLOAT = gl.FLOAT +_G.GL_FRAMEBUFFER_BINDING = gl.FRAMEBUFFER_BINDING +_G.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = gl.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT +_G.GL_TRIANGLE_FAN = gl.TRIANGLE_FAN +_G.GL_INVALID_FRAMEBUFFER_OPERATION = gl.INVALID_FRAMEBUFFER_OPERATION +_G.GL_TEXTURE_2D = gl.TEXTURE_2D +_G.GL_ALPHA = gl.ALPHA +_G.GL_CURRENT_VERTEX_ATTRIB = gl.CURRENT_VERTEX_ATTRIB +_G.GL_SCISSOR_TEST = gl.SCISSOR_TEST +_G.GL_TRIANGLES = gl.TRIANGLES + +_G.CCControlEventTouchDown = cc.CONTROL_EVENTTYPE_TOUCH_DOWN +_G.CCControlEventTouchDragInside = cc.CONTROL_EVENTTYPE_DRAG_INSIDE +_G.CCControlEventTouchDragOutside = cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE +_G.CCControlEventTouchDragEnter = cc.CONTROL_EVENTTYPE_DRAG_ENTER +_G.CCControlEventTouchDragExit = cc.CONTROL_EVENTTYPE_DRAG_EXIT +_G.CCControlEventTouchUpInside = cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE +_G.CCControlEventTouchUpOutside = cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE +_G.CCControlEventTouchCancel = cc.CONTROL_EVENTTYPE_TOUCH_CANCEL +_G.CCControlEventValueChanged = cc.CONTROL_EVENTTYPE_VALUE_CHANGED +_G.CCControlStateNormal = cc.CONTROL_STATE_NORMAL +_G.CCControlStateHighlighted = cc.CONTROL_STATE_HIGH_LIGHTED +_G.CCControlStateDisabled = cc.CONTROL_STATE_DISABLED +_G.CCControlStateSelected = cc.CONTROL_STATE_SELECTED diff --git a/scripting/lua/script/DeprecatedOpenglEnum.lua b/scripting/lua/script/DeprecatedOpenglEnum.lua new file mode 100644 index 0000000000..1235e8dcc3 --- /dev/null +++ b/scripting/lua/script/DeprecatedOpenglEnum.lua @@ -0,0 +1,288 @@ +-- This is the DeprecatedEnum + +DeprecatedClass = {} or DeprecatedClass + +_G.GL_RENDERBUFFER_INTERNAL_FORMAT = gl.RENDERBUFFER_INTERNAL_FORMAT +_G.GL_LINE_WIDTH = gl.LINE_WIDTH +_G.GL_CONSTANT_ALPHA = gl.CONSTANT_ALPHA +_G.GL_BLEND_SRC_ALPHA = gl.BLEND_SRC_ALPHA +_G.GL_GREEN_BITS = gl.GREEN_BITS +_G.GL_STENCIL_REF = gl.STENCIL_REF +_G.GL_ONE_MINUS_SRC_ALPHA = gl.ONE_MINUS_SRC_ALPHA +_G.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE +_G.GL_CCW = gl.CCW +_G.GL_MAX_TEXTURE_IMAGE_UNITS = gl.MAX_TEXTURE_IMAGE_UNITS +_G.GL_BACK = gl.BACK +_G.GL_ACTIVE_ATTRIBUTES = gl.ACTIVE_ATTRIBUTES +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_X = gl.TEXTURE_CUBE_MAP_POSITIVE_X +_G.GL_STENCIL_BACK_VALUE_MASK = gl.STENCIL_BACK_VALUE_MASK +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_Z = gl.TEXTURE_CUBE_MAP_POSITIVE_Z +_G.GL_ONE = gl.ONE +_G.GL_TRUE = gl.TRUE +_G.GL_TEXTURE12 = gl.TEXTURE12 +_G.GL_LINK_STATUS = gl.LINK_STATUS +_G.GL_BLEND = gl.BLEND +_G.GL_LESS = gl.LESS +_G.GL_TEXTURE16 = gl.TEXTURE16 +_G.GL_BOOL_VEC2 = gl.BOOL_VEC2 +_G.GL_KEEP = gl.KEEP +_G.GL_DST_COLOR = gl.DST_COLOR +_G.GL_VERTEX_ATTRIB_ARRAY_ENABLED = gl.VERTEX_ATTRIB_ARRAY_ENABLED +_G.GL_EXTENSIONS = gl.EXTENSIONS +_G.GL_FRONT = gl.FRONT +_G.GL_DST_ALPHA = gl.DST_ALPHA +_G.GL_ATTACHED_SHADERS = gl.ATTACHED_SHADERS +_G.GL_STENCIL_BACK_FUNC = gl.STENCIL_BACK_FUNC +_G.GL_ONE_MINUS_DST_COLOR = gl.ONE_MINUS_DST_COLOR +_G.GL_BLEND_EQUATION = gl.BLEND_EQUATION +_G.GL_RENDERBUFFER_DEPTH_SIZE = gl.RENDERBUFFER_DEPTH_SIZE +_G.GL_PACK_ALIGNMENT = gl.PACK_ALIGNMENT +_G.GL_VENDOR = gl.VENDOR +_G.GL_NEAREST_MIPMAP_LINEAR = gl.NEAREST_MIPMAP_LINEAR +_G.GL_TEXTURE_CUBE_MAP_POSITIVE_Y = gl.TEXTURE_CUBE_MAP_POSITIVE_Y +_G.GL_NEAREST = gl.NEAREST +_G.GL_RENDERBUFFER_WIDTH = gl.RENDERBUFFER_WIDTH +_G.GL_ARRAY_BUFFER_BINDING = gl.ARRAY_BUFFER_BINDING +_G.GL_ARRAY_BUFFER = gl.ARRAY_BUFFER +_G.GL_LEQUAL = gl.LEQUAL +_G.GL_VERSION = gl.VERSION +_G.GL_COLOR_CLEAR_VALUE = gl.COLOR_CLEAR_VALUE +_G.GL_RENDERER = gl.RENDERER +_G.GL_STENCIL_BACK_PASS_DEPTH_PASS = gl.STENCIL_BACK_PASS_DEPTH_PASS +_G.GL_STENCIL_BACK_PASS_DEPTH_FAIL = gl.STENCIL_BACK_PASS_DEPTH_FAIL +_G.GL_STENCIL_BACK_WRITEMASK = gl.STENCIL_BACK_WRITEMASK +_G.GL_BOOL = gl.BOOL +_G.GL_VIEWPORT = gl.VIEWPORT +_G.GL_FRAGMENT_SHADER = gl.FRAGMENT_SHADER +_G.GL_LUMINANCE = gl.LUMINANCE +_G.GL_DECR_WRAP = gl.DECR_WRAP +_G.GL_FUNC_ADD = gl.FUNC_ADD +_G.GL_ONE_MINUS_DST_ALPHA = gl.ONE_MINUS_DST_ALPHA +_G.GL_OUT_OF_MEMORY = gl.OUT_OF_MEMORY +_G.GL_BOOL_VEC4 = gl.BOOL_VEC4 +_G.GL_POLYGON_OFFSET_FACTOR = gl.POLYGON_OFFSET_FACTOR +_G.GL_STATIC_DRAW = gl.STATIC_DRAW +_G.GL_DITHER = gl.DITHER +_G.GL_TEXTURE31 = gl.TEXTURE31 +_G.GL_TEXTURE30 = gl.TEXTURE30 +_G.GL_UNSIGNED_BYTE = gl.UNSIGNED_BYTE +_G.GL_DEPTH_COMPONENT16 = gl.DEPTH_COMPONENT16 +_G.GL_TEXTURE23 = gl.TEXTURE23 +_G.GL_DEPTH_TEST = gl.DEPTH_TEST +_G.GL_STENCIL_PASS_DEPTH_FAIL = gl.STENCIL_PASS_DEPTH_FAIL +_G.GL_BOOL_VEC3 = gl.BOOL_VEC3 +_G.GL_POLYGON_OFFSET_UNITS = gl.POLYGON_OFFSET_UNITS +_G.GL_TEXTURE_BINDING_2D = gl.TEXTURE_BINDING_2D +_G.GL_TEXTURE21 = gl.TEXTURE21 +_G.GL_UNPACK_ALIGNMENT = gl.UNPACK_ALIGNMENT +_G.GL_DONT_CARE = gl.DONT_CARE +_G.GL_BUFFER_SIZE = gl.BUFFER_SIZE +_G.GL_FLOAT_MAT3 = gl.FLOAT_MAT3 +_G.GL_UNSIGNED_SHORT_5_6_5 = gl.UNSIGNED_SHORT_5_6_5 +_G.GL_INT_VEC2 = gl.INT_VEC2 +_G.GL_UNSIGNED_SHORT_4_4_4_4 = gl.UNSIGNED_SHORT_4_4_4_4 +_G.GL_NONE = gl.NONE +_G.GL_BLEND_DST_ALPHA = gl.BLEND_DST_ALPHA +_G.GL_VERTEX_ATTRIB_ARRAY_SIZE = gl.VERTEX_ATTRIB_ARRAY_SIZE +_G.GL_SRC_COLOR = gl.SRC_COLOR +_G.GL_COMPRESSED_TEXTURE_FORMATS = gl.COMPRESSED_TEXTURE_FORMATS +_G.GL_STENCIL_ATTACHMENT = gl.STENCIL_ATTACHMENT +_G.GL_MAX_VERTEX_ATTRIBS = gl.MAX_VERTEX_ATTRIBS +_G.GL_NUM_COMPRESSED_TEXTURE_FORMATS = gl.NUM_COMPRESSED_TEXTURE_FORMATS +_G.GL_BLEND_EQUATION_RGB = gl.BLEND_EQUATION_RGB +_G.GL_TEXTURE = gl.TEXTURE +_G.GL_LINEAR_MIPMAP_LINEAR = gl.LINEAR_MIPMAP_LINEAR +_G.GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING +_G.GL_CURRENT_PROGRAM = gl.CURRENT_PROGRAM +_G.GL_COLOR_BUFFER_BIT = gl.COLOR_BUFFER_BIT +_G.GL_TEXTURE20 = gl.TEXTURE20 +_G.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = gl.ACTIVE_ATTRIBUTE_MAX_LENGTH +_G.GL_TEXTURE28 = gl.TEXTURE28 +_G.GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE +_G.GL_TEXTURE22 = gl.TEXTURE22 +_G.GL_ELEMENT_ARRAY_BUFFER_BINDING = gl.ELEMENT_ARRAY_BUFFER_BINDING +_G.GL_STREAM_DRAW = gl.STREAM_DRAW +_G.GL_SCISSOR_BOX = gl.SCISSOR_BOX +_G.GL_TEXTURE26 = gl.TEXTURE26 +_G.GL_TEXTURE27 = gl.TEXTURE27 +_G.GL_TEXTURE24 = gl.TEXTURE24 +_G.GL_TEXTURE25 = gl.TEXTURE25 +_G.GL_NO_ERROR = gl.NO_ERROR +_G.GL_TEXTURE29 = gl.TEXTURE29 +_G.GL_FLOAT_MAT4 = gl.FLOAT_MAT4 +_G.GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = gl.VERTEX_ATTRIB_ARRAY_NORMALIZED +_G.GL_SAMPLE_COVERAGE_INVERT = gl.SAMPLE_COVERAGE_INVERT +_G.GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = gl.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL +_G.GL_FLOAT_VEC3 = gl.FLOAT_VEC3 +_G.GL_STENCIL_CLEAR_VALUE = gl.STENCIL_CLEAR_VALUE +_G.GL_UNSIGNED_SHORT_5_5_5_1 = gl.UNSIGNED_SHORT_5_5_5_1 +_G.GL_ACTIVE_UNIFORMS = gl.ACTIVE_UNIFORMS +_G.GL_INVALID_OPERATION = gl.INVALID_OPERATION +_G.GL_DEPTH_ATTACHMENT = gl.DEPTH_ATTACHMENT +_G.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS +_G.GL_FRAMEBUFFER_COMPLETE = gl.FRAMEBUFFER_COMPLETE +_G.GL_ONE_MINUS_CONSTANT_COLOR = gl.ONE_MINUS_CONSTANT_COLOR +_G.GL_TEXTURE2 = gl.TEXTURE2 +_G.GL_TEXTURE1 = gl.TEXTURE1 +_G.GL_GEQUAL = gl.GEQUAL +_G.GL_TEXTURE7 = gl.TEXTURE7 +_G.GL_TEXTURE6 = gl.TEXTURE6 +_G.GL_TEXTURE5 = gl.TEXTURE5 +_G.GL_TEXTURE4 = gl.TEXTURE4 +_G.GL_GENERATE_MIPMAP_HINT = gl.GENERATE_MIPMAP_HINT +_G.GL_ONE_MINUS_SRC_COLOR = gl.ONE_MINUS_SRC_COLOR +_G.GL_TEXTURE9 = gl.TEXTURE9 +_G.GL_STENCIL_TEST = gl.STENCIL_TEST +_G.GL_COLOR_WRITEMASK = gl.COLOR_WRITEMASK +_G.GL_DEPTH_COMPONENT = gl.DEPTH_COMPONENT +_G.GL_STENCIL_INDEX8 = gl.STENCIL_INDEX8 +_G.GL_VERTEX_ATTRIB_ARRAY_TYPE = gl.VERTEX_ATTRIB_ARRAY_TYPE +_G.GL_FLOAT_VEC2 = gl.FLOAT_VEC2 +_G.GL_BLUE_BITS = gl.BLUE_BITS +_G.GL_VERTEX_SHADER = gl.VERTEX_SHADER +_G.GL_SUBPIXEL_BITS = gl.SUBPIXEL_BITS +_G.GL_STENCIL_WRITEMASK = gl.STENCIL_WRITEMASK +_G.GL_FLOAT_VEC4 = gl.FLOAT_VEC4 +_G.GL_TEXTURE17 = gl.TEXTURE17 +_G.GL_ONE_MINUS_CONSTANT_ALPHA = gl.ONE_MINUS_CONSTANT_ALPHA +_G.GL_TEXTURE15 = gl.TEXTURE15 +_G.GL_TEXTURE14 = gl.TEXTURE14 +_G.GL_TEXTURE13 = gl.TEXTURE13 +_G.GL_SAMPLES = gl.SAMPLES +_G.GL_TEXTURE11 = gl.TEXTURE11 +_G.GL_TEXTURE10 = gl.TEXTURE10 +_G.GL_FUNC_SUBTRACT = gl.FUNC_SUBTRACT +_G.GL_STENCIL_BUFFER_BIT = gl.STENCIL_BUFFER_BIT +_G.GL_TEXTURE19 = gl.TEXTURE19 +_G.GL_TEXTURE18 = gl.TEXTURE18 +_G.GL_NEAREST_MIPMAP_NEAREST = gl.NEAREST_MIPMAP_NEAREST +_G.GL_SHORT = gl.SHORT +_G.GL_RENDERBUFFER_BINDING = gl.RENDERBUFFER_BINDING +_G.GL_REPEAT = gl.REPEAT +_G.GL_TEXTURE_MIN_FILTER = gl.TEXTURE_MIN_FILTER +_G.GL_RED_BITS = gl.RED_BITS +_G.GL_FRONT_FACE = gl.FRONT_FACE +_G.GL_BLEND_COLOR = gl.BLEND_COLOR +_G.GL_MIRRORED_REPEAT = gl.MIRRORED_REPEAT +_G.GL_INT_VEC4 = gl.INT_VEC4 +_G.GL_MAX_CUBE_MAP_TEXTURE_SIZE = gl.MAX_CUBE_MAP_TEXTURE_SIZE +_G.GL_RENDERBUFFER_BLUE_SIZE = gl.RENDERBUFFER_BLUE_SIZE +_G.GL_SAMPLE_COVERAGE = gl.SAMPLE_COVERAGE +_G.GL_SRC_ALPHA = gl.SRC_ALPHA +_G.GL_FUNC_REVERSE_SUBTRACT = gl.FUNC_REVERSE_SUBTRACT +_G.GL_DEPTH_WRITEMASK = gl.DEPTH_WRITEMASK +_G.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = gl.FRAMEBUFFER_INCOMPLETE_ATTACHMENT +_G.GL_POLYGON_OFFSET_FILL = gl.POLYGON_OFFSET_FILL +_G.GL_STENCIL_FUNC = gl.STENCIL_FUNC +_G.GL_REPLACE = gl.REPLACE +_G.GL_LUMINANCE_ALPHA = gl.LUMINANCE_ALPHA +_G.GL_DEPTH_RANGE = gl.DEPTH_RANGE +_G.GL_FASTEST = gl.FASTEST +_G.GL_STENCIL_FAIL = gl.STENCIL_FAIL +_G.GL_UNSIGNED_SHORT = gl.UNSIGNED_SHORT +_G.GL_RENDERBUFFER_HEIGHT = gl.RENDERBUFFER_HEIGHT +_G.GL_STENCIL_BACK_FAIL = gl.STENCIL_BACK_FAIL +_G.GL_BLEND_SRC_RGB = gl.BLEND_SRC_RGB +_G.GL_TEXTURE3 = gl.TEXTURE3 +_G.GL_RENDERBUFFER = gl.RENDERBUFFER +_G.GL_RGB5_A1 = gl.RGB5_A1 +_G.GL_RENDERBUFFER_ALPHA_SIZE = gl.RENDERBUFFER_ALPHA_SIZE +_G.GL_RENDERBUFFER_STENCIL_SIZE = gl.RENDERBUFFER_STENCIL_SIZE +_G.GL_NOTEQUAL = gl.NOTEQUAL +_G.GL_BLEND_DST_RGB = gl.BLEND_DST_RGB +_G.GL_FRONT_AND_BACK = gl.FRONT_AND_BACK +_G.GL_TEXTURE_BINDING_CUBE_MAP = gl.TEXTURE_BINDING_CUBE_MAP +_G.GL_MAX_RENDERBUFFER_SIZE = gl.MAX_RENDERBUFFER_SIZE +_G.GL_ZERO = gl.ZERO +_G.GL_TEXTURE0 = gl.TEXTURE0 +_G.GL_SAMPLE_ALPHA_TO_COVERAGE = gl.SAMPLE_ALPHA_TO_COVERAGE +_G.GL_BUFFER_USAGE = gl.BUFFER_USAGE +_G.GL_ACTIVE_TEXTURE = gl.ACTIVE_TEXTURE +_G.GL_BYTE = gl.BYTE +_G.GL_CW = gl.CW +_G.GL_DYNAMIC_DRAW = gl.DYNAMIC_DRAW +_G.GL_RENDERBUFFER_RED_SIZE = gl.RENDERBUFFER_RED_SIZE +_G.GL_FALSE = gl.FALSE +_G.GL_GREATER = gl.GREATER +_G.GL_RGBA4 = gl.RGBA4 +_G.GL_VALIDATE_STATUS = gl.VALIDATE_STATUS +_G.GL_STENCIL_BITS = gl.STENCIL_BITS +_G.GL_RGB = gl.RGB +_G.GL_INT = gl.INT +_G.GL_DEPTH_FUNC = gl.DEPTH_FUNC +_G.GL_SAMPLER_2D = gl.SAMPLER_2D +_G.GL_NICEST = gl.NICEST +_G.GL_MAX_VIEWPORT_DIMS = gl.MAX_VIEWPORT_DIMS +_G.GL_CULL_FACE = gl.CULL_FACE +_G.GL_INT_VEC3 = gl.INT_VEC3 +_G.GL_ALIASED_POINT_SIZE_RANGE = gl.ALIASED_POINT_SIZE_RANGE +_G.GL_INVALID_ENUM = gl.INVALID_ENUM +_G.GL_INVERT = gl.INVERT +_G.GL_CULL_FACE_MODE = gl.CULL_FACE_MODE +_G.GL_TEXTURE8 = gl.TEXTURE8 +_G.GL_VERTEX_ATTRIB_ARRAY_POINTER = gl.VERTEX_ATTRIB_ARRAY_POINTER +_G.GL_TEXTURE_WRAP_S = gl.TEXTURE_WRAP_S +_G.GL_VERTEX_ATTRIB_ARRAY_STRIDE = gl.VERTEX_ATTRIB_ARRAY_STRIDE +_G.GL_LINES = gl.LINES +_G.GL_EQUAL = gl.EQUAL +_G.GL_LINE_LOOP = gl.LINE_LOOP +_G.GL_TEXTURE_WRAP_T = gl.TEXTURE_WRAP_T +_G.GL_DEPTH_BUFFER_BIT = gl.DEPTH_BUFFER_BIT +_G.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS +_G.GL_SHADER_TYPE = gl.SHADER_TYPE +_G.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_X = gl.TEXTURE_CUBE_MAP_NEGATIVE_X +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = gl.TEXTURE_CUBE_MAP_NEGATIVE_Y +_G.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = gl.TEXTURE_CUBE_MAP_NEGATIVE_Z +_G.GL_DECR = gl.DECR +_G.GL_DELETE_STATUS = gl.DELETE_STATUS +_G.GL_DEPTH_BITS = gl.DEPTH_BITS +_G.GL_INCR = gl.INCR +_G.GL_SAMPLE_COVERAGE_VALUE = gl.SAMPLE_COVERAGE_VALUE +_G.GL_ALPHA_BITS = gl.ALPHA_BITS +_G.GL_FLOAT_MAT2 = gl.FLOAT_MAT2 +_G.GL_LINE_STRIP = gl.LINE_STRIP +_G.GL_SHADER_SOURCE_LENGTH = gl.SHADER_SOURCE_LENGTH +_G.GL_INVALID_VALUE = gl.INVALID_VALUE +_G.GL_NEVER = gl.NEVER +_G.GL_INCR_WRAP = gl.INCR_WRAP +_G.GL_BLEND_EQUATION_ALPHA = gl.BLEND_EQUATION_ALPHA +_G.GL_TEXTURE_MAG_FILTER = gl.TEXTURE_MAG_FILTER +_G.GL_POINTS = gl.POINTS +_G.GL_COLOR_ATTACHMENT0 = gl.COLOR_ATTACHMENT0 +_G.GL_RGBA = gl.RGBA +_G.GL_SRC_ALPHA_SATURATE = gl.SRC_ALPHA_SATURATE +_G.GL_SAMPLER_CUBE = gl.SAMPLER_CUBE +_G.GL_FRAMEBUFFER = gl.FRAMEBUFFER +_G.GL_TEXTURE_CUBE_MAP = gl.TEXTURE_CUBE_MAP +_G.GL_SAMPLE_BUFFERS = gl.SAMPLE_BUFFERS +_G.GL_LINEAR = gl.LINEAR +_G.GL_LINEAR_MIPMAP_NEAREST = gl.LINEAR_MIPMAP_NEAREST +_G.GL_ACTIVE_UNIFORM_MAX_LENGTH = gl.ACTIVE_UNIFORM_MAX_LENGTH +_G.GL_STENCIL_BACK_REF = gl.STENCIL_BACK_REF +_G.GL_ELEMENT_ARRAY_BUFFER = gl.ELEMENT_ARRAY_BUFFER +_G.GL_CLAMP_TO_EDGE = gl.CLAMP_TO_EDGE +_G.GL_TRIANGLE_STRIP = gl.TRIANGLE_STRIP +_G.GL_CONSTANT_COLOR = gl.CONSTANT_COLOR +_G.GL_COMPILE_STATUS = gl.COMPILE_STATUS +_G.GL_RENDERBUFFER_GREEN_SIZE = gl.RENDERBUFFER_GREEN_SIZE +_G.GL_UNSIGNED_INT = gl.UNSIGNED_INT +_G.GL_DEPTH_CLEAR_VALUE = gl.DEPTH_CLEAR_VALUE +_G.GL_ALIASED_LINE_WIDTH_RANGE = gl.ALIASED_LINE_WIDTH_RANGE +_G.GL_SHADING_LANGUAGE_VERSION = gl.SHADING_LANGUAGE_VERSION +_G.GL_FRAMEBUFFER_UNSUPPORTED = gl.FRAMEBUFFER_UNSUPPORTED +_G.GL_INFO_LOG_LENGTH = gl.INFO_LOG_LENGTH +_G.GL_STENCIL_PASS_DEPTH_PASS = gl.STENCIL_PASS_DEPTH_PASS +_G.GL_STENCIL_VALUE_MASK = gl.STENCIL_VALUE_MASK +_G.GL_ALWAYS = gl.ALWAYS +_G.GL_MAX_TEXTURE_SIZE = gl.MAX_TEXTURE_SIZE +_G.GL_FLOAT = gl.FLOAT +_G.GL_FRAMEBUFFER_BINDING = gl.FRAMEBUFFER_BINDING +_G.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = gl.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT +_G.GL_TRIANGLE_FAN = gl.TRIANGLE_FAN +_G.GL_INVALID_FRAMEBUFFER_OPERATION = gl.INVALID_FRAMEBUFFER_OPERATION +_G.GL_TEXTURE_2D = gl.TEXTURE_2D +_G.GL_ALPHA = gl.ALPHA +_G.GL_CURRENT_VERTEX_ATTRIB = gl.CURRENT_VERTEX_ATTRIB +_G.GL_SCISSOR_TEST = gl.SCISSOR_TEST +_G.GL_TRIANGLES = gl.TRIANGLES diff --git a/scripting/lua/tolua/tolua_event.c b/scripting/lua/tolua/tolua_event.c index 571b9c781b..bb09628017 100644 --- a/scripting/lua/tolua/tolua_event.c +++ b/scripting/lua/tolua/tolua_event.c @@ -344,7 +344,7 @@ static int class_add_event (lua_State* L) return do_operator(L,".add"); } -static int class_sub_event (lua_State* L) +int class_sub_event (lua_State* L) { return do_operator(L,".sub"); } diff --git a/scripting/lua/tolua/tolua_is.c b/scripting/lua/tolua/tolua_is.c index 393c47df36..8d395ae18e 100644 --- a/scripting/lua/tolua/tolua_is.c +++ b/scripting/lua/tolua/tolua_is.c @@ -161,7 +161,7 @@ int push_table_instance(lua_State* L, int lo) { }; /* the equivalent of lua_is* for usertype */ -static int lua_isusertype (lua_State* L, int lo, const char* type) +int lua_isusertype (lua_State* L, int lo, const char* type) { if (!lua_isuserdata(L,lo)) { if (!push_table_instance(L, lo)) { diff --git a/template/multi-platform-lua/Resources/hello.lua b/template/multi-platform-lua/Resources/hello.lua index 5bcbc1bda8..607b7d7508 100644 --- a/template/multi-platform-lua/Resources/hello.lua +++ b/template/multi-platform-lua/Resources/hello.lua @@ -1,11 +1,15 @@ -require "AudioEngine" +require "Cocos2d" +-- cclog +cclog = function(...) + print(string.format(...)) +end -- for CCLuaEngine traceback function __G__TRACKBACK__(msg) - print("----------------------------------------") - print("LUA ERROR: " .. tostring(msg) .. "\n") - print(debug.traceback()) - print("----------------------------------------") + cclog("----------------------------------------") + cclog("LUA ERROR: " .. tostring(msg) .. "\n") + cclog(debug.traceback()) + cclog("----------------------------------------") end local function main() @@ -13,17 +17,13 @@ local function main() collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) - local cclog = function(...) - print(string.format(...)) - end - require "hello2" - cclog("result is " .. myadd(3, 5)) + cclog("result is " .. myadd(1, 1)) --------------- - local visibleSize = CCDirector:getInstance():getVisibleSize() - local origin = CCDirector:getInstance():getVisibleOrigin() + local visibleSize = cc.Director:getInstance():getVisibleSize() + local origin = cc.Director:getInstance():getVisibleOrigin() -- add the moving dog local function creatDog() @@ -31,24 +31,25 @@ local function main() local frameHeight = 95 -- create dog animate - local textureDog = CCTextureCache:getInstance():addImage("dog.png") - local rect = CCRect(0, 0, frameWidth, frameHeight) - local frame0 = CCSpriteFrame:createWithTexture(textureDog, rect) - rect = CCRect(frameWidth, 0, frameWidth, frameHeight) - local frame1 = CCSpriteFrame:createWithTexture(textureDog, rect) + local textureDog = cc.TextureCache:getInstance():addImage("dog.png") + local rect = cc.rect(0, 0, frameWidth, frameHeight) + local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) + rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) + local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) - local spriteDog = CCSprite:createWithSpriteFrame(frame0) + local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) spriteDog.isPaused = false spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) - +--[[ local animFrames = CCArray:create() animFrames:addObject(frame0) animFrames:addObject(frame1) +]]-- - local animation = CCAnimation:createWithSpriteFrames(animFrames, 0.5) - local animate = CCAnimate:create(animation); - spriteDog:runAction(CCRepeatForever:create(animate)) + local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) + local animate = cc.Animate:create(animation); + spriteDog:runAction(cc.RepeatForever:create(animate)) -- moving dog at every frame local function tick() @@ -63,34 +64,34 @@ local function main() spriteDog:setPositionX(x) end - CCDirector:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) + cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) return spriteDog end -- create farm local function createLayerFarm() - local layerFarm = CCLayer:create() + local layerFarm = cc.Layer:create() -- add in farm background - local bg = CCSprite:create("farm.jpg") + local bg = cc.Sprite:create("farm.jpg") bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) layerFarm:addChild(bg) -- add land sprite for i = 0, 3 do for j = 0, 1 do - local spriteLand = CCSprite:create("land.png") + local spriteLand = cc.Sprite:create("land.png") spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) layerFarm:addChild(spriteLand) end end -- add crop - local frameCrop = CCSpriteFrame:create("crop.png", CCRect(0, 0, 105, 95)) + local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) for i = 0, 3 do for j = 0, 1 do - local spriteCrop = CCSprite:createWithSpriteFrame(frameCrop); + local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2) layerFarm:addChild(spriteCrop) end @@ -146,37 +147,37 @@ local function main() -- create menu local function createLayerMenu() - local layerMenu = CCLayer:create() + local layerMenu = cc.Layer:create() local menuPopup, menuTools, effectID local function menuCallbackClosePopup() -- stop test sound effect - AudioEngine.stopEffect(effectID) + cc.SimpleAudioEngine:getInstance():stopEffect(effectID) menuPopup:setVisible(false) end local function menuCallbackOpenPopup() -- loop test sound effect - local effectPath = CCFileUtils:getInstance():fullPathForFilename("effect1.wav") - effectID = AudioEngine.playEffect(effectPath) + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) menuPopup:setVisible(true) end -- add a popup menu - local menuPopupItem = CCMenuItemImage:create("menu2.png", "menu2.png") + local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") menuPopupItem:setPosition(0, 0) menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) - menuPopup = CCMenu:createWithItem(menuPopupItem) + menuPopup = cc.Menu:create(menuPopupItem) menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2) menuPopup:setVisible(false) layerMenu:addChild(menuPopup) - + -- add the left-bottom "tools" menu to invoke menuPopup - local menuToolsItem = CCMenuItemImage:create("menu1.png", "menu1.png") + local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") menuToolsItem:setPosition(0, 0) menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) - menuTools = CCMenu:createWithItem(menuToolsItem) + menuTools = cc.Menu:create(menuToolsItem) local itemWidth = menuToolsItem:getContentSize().width local itemHeight = menuToolsItem:getContentSize().height menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) @@ -189,16 +190,16 @@ local function main() -- uncomment below for the BlackBerry version -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg") - local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.mp3") - AudioEngine.playMusic(bgMusicPath, true) - local effectPath = CCFileUtils:getInstance():fullPathForFilename("effect1.wav") - AudioEngine.preloadEffect(effectPath) + local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") + cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) -- run - local sceneGame = CCScene:create() + local sceneGame = cc.Scene:create() sceneGame:addChild(createLayerFarm()) sceneGame:addChild(createLayerMenu()) - CCDirector:getInstance():runWithScene(sceneGame) + cc.Director:getInstance():runWithScene(sceneGame) end xpcall(main, __G__TRACKBACK__) diff --git a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj index d0908f894c..ca6dea669e 100644 --- a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 1525771E17CEFBD400BE417B /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771B17CEFBD400BE417B /* DeprecatedClass.lua */; }; + 1525771F17CEFBD400BE417B /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */; }; + 1525772017CEFBD400BE417B /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */; }; 15C1568E1683131500D239F2 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C1568D1683131500D239F2 /* libcurl.a */; }; 15C156981683138E00D239F2 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156911683138E00D239F2 /* Default-568h@2x.png */; }; 15C156991683138E00D239F2 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156921683138E00D239F2 /* Default.png */; }; @@ -192,6 +195,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1525771B17CEFBD400BE417B /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = ../../../scripting/lua/script/DeprecatedClass.lua; sourceTree = ""; }; + 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = ../../../scripting/lua/script/DeprecatedEnum.lua; sourceTree = ""; }; + 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = ../../../scripting/lua/script/DeprecatedOpenglEnum.lua; sourceTree = ""; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; 15C156911683138E00D239F2 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; 15C156921683138E00D239F2 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; @@ -270,6 +276,9 @@ 1A0227A417A3AA1A00B867AD /* Lua Common */ = { isa = PBXGroup; children = ( + 1525771B17CEFBD400BE417B /* DeprecatedClass.lua */, + 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */, + 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */, 1A0227A517A3AA3500B867AD /* AudioEngine.lua */, 1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */, 1ADB273717CCA0C200634B5E /* Cocos2d.lua */, @@ -579,6 +588,9 @@ 1A0227B117A3AA3500B867AD /* Opengl.lua in Resources */, 1A0227B217A3AA3500B867AD /* OpenglConstants.lua in Resources */, 1ADB273817CCA0C200634B5E /* Cocos2d.lua in Resources */, + 1525771E17CEFBD400BE417B /* DeprecatedClass.lua in Resources */, + 1525771F17CEFBD400BE417B /* DeprecatedEnum.lua in Resources */, + 1525772017CEFBD400BE417B /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj index d38a6e4642..421114e0b7 100644 --- a/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj @@ -28,6 +28,9 @@ 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825717A74F8000E674E5 /* Opengl.lua */; }; 1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825817A74F8000E674E5 /* OpenglConstants.lua */; }; 1501826E17A7513400E674E5 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F0B17A64D060035E92B /* libchipmunk Mac.a */; }; + 1525770C17CEFB6300BE417B /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770917CEFB6200BE417B /* DeprecatedClass.lua */; }; + 1525770D17CEFB6300BE417B /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */; }; + 1525770E17CEFB6300BE417B /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */; }; 15A02F3817A64D1E0035E92B /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2417A64D1E0035E92B /* background.mp3 */; }; 15A02F3917A64D1E0035E92B /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2517A64D1E0035E92B /* background.ogg */; }; 15A02F3C17A64D1E0035E92B /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2817A64D1E0035E92B /* crop.png */; }; @@ -200,6 +203,9 @@ 1501825617A74F8000E674E5 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawPrimitives.lua; sourceTree = ""; }; 1501825717A74F8000E674E5 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Opengl.lua; sourceTree = ""; }; 1501825817A74F8000E674E5 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenglConstants.lua; sourceTree = ""; }; + 1525770917CEFB6200BE417B /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedClass.lua; sourceTree = ""; }; + 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedEnum.lua; sourceTree = ""; }; + 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedOpenglEnum.lua; sourceTree = ""; }; 15A02E6017A647C90035E92B /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; }; 15A02E6817A647C90035E92B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; @@ -256,6 +262,9 @@ 1501825117A74F8000E674E5 /* Lua Common */ = { isa = PBXGroup; children = ( + 1525770917CEFB6200BE417B /* DeprecatedClass.lua */, + 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */, + 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */, 1501825217A74F8000E674E5 /* AudioEngine.lua */, 1501825317A74F8000E674E5 /* CCBReaderLoad.lua */, 1ADB273A17CCA0F500634B5E /* Cocos2d.lua */, @@ -565,6 +574,9 @@ 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */, 1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */, 1ADB273B17CCA0F500634B5E /* Cocos2d.lua in Resources */, + 1525770C17CEFB6300BE417B /* DeprecatedClass.lua in Resources */, + 1525770D17CEFB6300BE417B /* DeprecatedEnum.lua in Resources */, + 1525770E17CEFB6300BE417B /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/tools/bindings-generator b/tools/bindings-generator index 98ddf882f2..7cc32ff488 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 98ddf882f2898bc9043ea54d9ed7f32383f6be4d +Subproject commit 7cc32ff48845f726937eea2c1b0cdb743db321cd diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index b50b5a8389..ca854bbb82 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -35,7 +35,7 @@ classes = Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = Node::[setGLServerState description getUserObject .*UserData getGLServerState .*schedule getPosition], +skip = Node::[setGLServerState description getUserObject .*UserData getGLServerState .*schedule getPosition$], Sprite::[getQuad getBlendFunc ^setPosition$ setBlendFunc], SpriteBatchNode::[getBlendFunc setBlendFunc], MotionStreak::[getBlendFunc setBlendFunc draw update],