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

Merge pull request #3510 from samuele3hu/iss2433-lua-bindings-generator-new 

Iss2433:Add deprecated class and enums and modify some project config and test samples
This commit is contained in:
James Chen 2013-08-31 03:52:41 -07:00
parent 35f1a61a6d 564a77edf6
commit b7258abbe6
29 changed files with 3279 additions and 763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java
View File

@ -100,7 +100,6 @@ public class Cocos2dxHelper {
//Cocos2dxHelper.nativeSetAssetManager(sAssetManager); //Cocos2dxHelper.nativeSetAssetManager(sAssetManager);
Cocos2dxBitmap.setContext(activity); Cocos2dxBitmap.setContext(activity);
Cocos2dxETCLoader.setContext(activity);
} }
public static Activity getActivity() { public static Activity getActivity() {

2
cocos2dx/proj.win32/cocos2d.vcxproj
View File

@ -107,7 +107,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>

10
samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua
View File

@ -313,12 +313,12 @@ local function ActionCardinalSpline()
local function drawCardinalSpline() local function drawCardinalSpline()
kmGLPushMatrix() kmGLPushMatrix()
kmGLTranslatef(50, 50, 0) kmGLTranslatef(50, 50, 0)
cc.DrawPrimitives.ccDrawCardinalSpline(array, 0, 100) cc.DrawPrimitives.drawCardinalSpline(array, 0, 100)
kmGLPopMatrix() kmGLPopMatrix()
kmGLPushMatrix() kmGLPushMatrix()
kmGLTranslatef(size.width / 2, 50, 0) kmGLTranslatef(size.width / 2, 50, 0)
cc.DrawPrimitives.ccDrawCardinalSpline(array, 1, 100) cc.DrawPrimitives.drawCardinalSpline(array, 1, 100)
kmGLPopMatrix() kmGLPopMatrix()
end end
@ -376,10 +376,10 @@ local function ActionCatmullRom()
local function drawCatmullRom() local function drawCatmullRom()
kmGLPushMatrix() kmGLPushMatrix()
kmGLTranslatef(50, 50, 0) kmGLTranslatef(50, 50, 0)
cc.DrawPrimitives.ccDrawCatmullRom(array, 50) cc.DrawPrimitives.drawCatmullRom(array, 50)
kmGLPopMatrix() kmGLPopMatrix()
cc.DrawPrimitives.ccDrawCatmullRom(array2,50) cc.DrawPrimitives.drawCatmullRom(array2,50)
end end
array:retain() array:retain()
@ -954,7 +954,7 @@ local function ActionFollow()
local x = winSize.width * 2 - 100 local x = winSize.width * 2 - 100
local y = winSize.height 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) } 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 end
local glNode = gl.glNodeCreate() local glNode = gl.glNodeCreate()

54
samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua
View File

@ -86,55 +86,55 @@ local function drawPrimitivesMainLayer()
glNode:setAnchorPoint(cc.p(0.5, 0.5)) glNode:setAnchorPoint(cc.p(0.5, 0.5))
local function primitivesDraw() local function primitivesDraw()
gl.DrawPrimitives.ccDrawLine(VisibleRect:leftBottom(), VisibleRect:rightTop() ) cc.DrawPrimitives.drawLine(VisibleRect:leftBottom(), VisibleRect:rightTop() )
gl.lineWidth( 5.0 ) gl.lineWidth( 5.0 )
gl.DrawPrimitives.ccDrawColor4B(255,0,0,255) cc.DrawPrimitives.drawColor4B(255,0,0,255)
gl.DrawPrimitives.ccDrawLine( VisibleRect:leftTop(), VisibleRect:rightBottom() ) cc.DrawPrimitives.drawLine( VisibleRect:leftTop(), VisibleRect:rightBottom() )
gl.DrawPrimitives.ccPointSize(64) cc.DrawPrimitives.setPointSize(64)
gl.DrawPrimitives.ccDrawColor4B(0, 0, 255, 128) cc.DrawPrimitives.drawColor4B(0, 0, 255, 128)
gl.DrawPrimitives.ccDrawPoint(VisibleRect:center()) cc.DrawPrimitives.drawPoint(VisibleRect:center())
local points = {cc.p(60,60), cc.p(70,70), cc.p(60,70), cc.p(70,60) } local points = {cc.p(60,60), cc.p(70,70), cc.p(60,70), cc.p(70,60) }
gl.DrawPrimitives.ccPointSize(4) cc.DrawPrimitives.setPointSize(4)
gl.DrawPrimitives.ccDrawColor4B(0,255,255,255) cc.DrawPrimitives.drawColor4B(0,255,255,255)
gl.DrawPrimitives.ccDrawPoints(points,4) cc.DrawPrimitives.drawPoints(points,4)
gl.lineWidth(16) gl.lineWidth(16)
gl.DrawPrimitives.ccDrawColor4B(0, 255, 0, 255) cc.DrawPrimitives.drawColor4B(0, 255, 0, 255)
gl.DrawPrimitives.ccDrawCircle( VisibleRect:center(), 100, 0, 10, false) cc.DrawPrimitives.drawCircle( VisibleRect:center(), 100, 0, 10, false)
gl.lineWidth(2) gl.lineWidth(2)
gl.DrawPrimitives.ccDrawColor4B(0, 255, 255, 255) cc.DrawPrimitives.drawColor4B(0, 255, 255, 255)
gl.DrawPrimitives.ccDrawCircle( VisibleRect:center(), 50, math.pi / 2, 50, true) cc.DrawPrimitives.drawCircle( VisibleRect:center(), 50, math.pi / 2, 50, true)
gl.lineWidth(2) gl.lineWidth(2)
gl.DrawPrimitives.ccDrawColor4B(255, 0, 255, 255) cc.DrawPrimitives.drawColor4B(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.drawSolidCircle( cc.p(VisibleRect:center().x + 140 ,VisibleRect:center().y), 40, math.rad(90), 50, 1.0, 1.0)
gl.lineWidth(10) 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)} 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) 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) } 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.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) } 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)} 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 = { local array = {
cc.p(0, 0), cc.p(0, 0),
@ -143,13 +143,13 @@ local function drawPrimitivesMainLayer()
cc.p(0, size.height - 80), cc.p(0, size.height - 80),
cc.p(0, 0), 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.lineWidth(1)
gl.DrawPrimitives.ccDrawColor4B(255,255,255,255) cc.DrawPrimitives.drawColor4B(255,255,255,255)
gl.DrawPrimitives.ccPointSize(1) cc.DrawPrimitives.setPointSize(1)
end end
glNode:registerScriptDrawHandler(primitivesDraw) glNode:registerScriptDrawHandler(primitivesDraw)

4
samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua
View File

@ -121,12 +121,12 @@ end
-- class Lens3DTarget : public cc.Node -- class Lens3DTarget : public cc.Node
-- public: -- public:
-- virtual void setPosition(const cc.p& var) -- virtual void setPosition(const CCPoint& var)
-- m_pLens3D:setPosition(var) -- m_pLens3D:setPosition(var)
-- end -- end
-- virtual const cc.p& getPosition() -- virtual const CCPoint& getPosition()
-- return m_pLens3D:getPosition() -- return m_pLens3D:getPosition()
-- end -- end

4
samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua
View File

@ -320,8 +320,8 @@ end
function Atlas4.draw() function Atlas4.draw()
local s = cc.Director:getInstance():getWinSize() local s = cc.Director:getInstance():getWinSize()
cc.DrawPrimitives.ccDrawLine( cc.p(0, s.height/2), cc.p(s.width, s.height/2) ) cc.DrawPrimitives.drawLine( 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(s.width/2, 0), cc.p(s.width/2, s.height) )
end end
function Atlas4.step(dt) function Atlas4.step(dt)

16
samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua
View File

@ -684,10 +684,10 @@ local function draw()
glLineWidth(3) glLineWidth(3)
cc.DrawPrimitives.ccDrawLine( cc.p(x, y), cc.p((x+width), y) ) cc.DrawPrimitives.drawLine( 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.drawLine( 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.drawLine( 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+height)), cc.p(x, y) )
glLineWidth(1) glLineWidth(1)
end end
@ -753,10 +753,10 @@ local function draw()
glLineWidth(3) glLineWidth(3)
cc.DrawPrimitives.ccDrawLine( cc.p(x,y), cc.p(x+width,y) ) cc.DrawPrimitives.drawLine( 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.drawLine( 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.drawLine( 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+height), cc.p(x,y) )
glLineWidth(1) glLineWidth(1)
end end

4
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
View File

@ -120,8 +120,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ExceptionHandling> <ExceptionHandling>
</ExceptionHandling> </ExceptionHandling>
<DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -131,6 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libcocos2d.lib;libExtensions.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcocos2d.lib;libExtensions.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<Culture>0x0409</Culture> <Culture>0x0409</Culture>

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

@ -1 +1 @@
2a2eccdbed6181f80d4c2fec86d963653615627b a9fdccd58c6cf8ce3cb5d00ea294ef9ff216d439

126
scripting/lua/cocos2dx_support/CCLuaEngine.cpp
View File

@ -55,6 +55,8 @@ bool LuaEngine::init(void)
_stack = LuaStack::create(); _stack = LuaStack::create();
_stack->retain(); _stack->retain();
extendLuaObject(); extendLuaObject();
executeScriptFile("DeprecatedEnum.lua");
executeScriptFile("DeprecatedClass.lua");
executeScriptFile("Deprecated.lua"); executeScriptFile("Deprecated.lua");
return true; return true;
} }
@ -608,102 +610,12 @@ void LuaEngine::extendLuaObject()
return; return;
lua_State* lua_S = _stack->getLuaState(); lua_State* lua_S = _stack->getLuaState();
extendNode(lua_S);
extendMenuItem(lua_S);
extendLayer(lua_S);
extendControl(lua_S);
extendWebsocket(lua_S); extendWebsocket(lua_S);
extendGLNode(lua_S); extendGLNode(lua_S);
extendScrollView(lua_S);
extendDrawNode(lua_S);
_stack->clean(); _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) 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) #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); 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 NS_CC_END

6
scripting/lua/cocos2dx_support/CCLuaEngine.h
View File

@ -138,14 +138,8 @@ private:
int handleTouchEvent(void* data); int handleTouchEvent(void* data);
int handleTouchesEvent(void* data); int handleTouchesEvent(void* data);
int handlerControlEvent(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 extendWebsocket(lua_State* lua_S);
void extendGLNode(lua_State* lua_S); void extendGLNode(lua_State* lua_S);
void extendScrollView(lua_State* lua_S);
void extendDrawNode(lua_State* lua_S);
private: private:
static LuaEngine* _defaultEngine; static LuaEngine* _defaultEngine;
LuaStack *_stack; LuaStack *_stack;

114
scripting/lua/cocos2dx_support/LuaBasicConversions.cpp
View File

@ -63,6 +63,25 @@ void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err)
} }
#endif #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)<abs(lo))
return true;
if (lua_isnil(L,lo) || lua_isusertype(L,lo,type))
return true;
return false;
}
bool luaval_to_int32(lua_State* L,int lo,int* outValue) bool luaval_to_int32(lua_State* L,int lo,int* outValue)
{ {
@ -70,14 +89,15 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isnumber(L,lo,0,&tolua_err)) if (!tolua_isnumber(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -93,14 +113,15 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isnumber(L,lo,0,&tolua_err)) if (!tolua_isnumber(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -116,14 +137,15 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isnumber(L,lo,0,&tolua_err)) if (!tolua_isnumber(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -139,14 +161,15 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isboolean(L,lo,0,&tolua_err)) if (!tolua_isboolean(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -162,14 +185,15 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isnumber(L,lo,0,&tolua_err)) if (!tolua_isnumber(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -185,14 +209,15 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_isnumber(L,lo,0,&tolua_err)) if (!tolua_isnumber(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -208,14 +233,15 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_iscppstring(L,lo,0,&tolua_err)) if (!tolua_iscppstring(L,lo,0,&tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -231,14 +257,16 @@ bool luaval_to_point(lua_State* L,int lo,Point* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -261,14 +289,15 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -292,14 +321,15 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -333,14 +363,15 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if(ok) if(ok)
{ {
@ -374,14 +405,15 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -415,14 +447,15 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -451,14 +484,15 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -501,14 +535,15 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue )
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
ok = false; ok = false;
}
#endif #endif
}
if (ok) if (ok)
{ {
@ -641,14 +676,15 @@ bool luaval_to_array(lua_State* L,int lo, Array** outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -740,14 +776,15 @@ bool luaval_to_dictionary(lua_State* L,int lo, Dictionary** outValue)
return false; return false;
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) if (ok)
{ {
@ -843,14 +880,15 @@ bool luaval_to_array_of_Point(lua_State* L,int lo,Point **points, int *numPoints
bool ok = true; bool ok = true;
#if COCOS2D_DEBUG >=1
tolua_Error tolua_err; tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) ) if (!tolua_istable(L, lo, 0, &tolua_err) )
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
ok = false; ok = false;
} }
#endif
if (ok) 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); lua_gettable(L,lo);
if (!tolua_istable(L,-1, 0, &tolua_err)) if (!tolua_istable(L,-1, 0, &tolua_err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err); luaval_to_native_err(L,"#ferror:",&tolua_err);
#endif
lua_pop(L, 1); lua_pop(L, 1);
free(array); free(array);
return false; return false;
@ -918,7 +958,9 @@ bool luavals_variadic_to_array(lua_State* L,int argc, Array** ret)
tolua_Error err; tolua_Error err;
if (!tolua_isusertype(L, i + 2, "Object", 0, &err)) if (!tolua_isusertype(L, i + 2, "Object", 0, &err))
{ {
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&err); luaval_to_native_err(L,"#ferror:",&err);
#endif
ok = false; ok = false;
break; break;
} }

6
scripting/lua/cocos2dx_support/LuaBasicConversions.h
View File

@ -16,6 +16,12 @@ extern std::map<int, std::string> g_luaType;
void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err); void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err);
#endif #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 // to native
extern bool luaval_to_int32(lua_State* L,int lo,int* outValue); 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); extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue);

2
scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id
View File

@ -1 +1 @@
e2ec824824096631a51472eab29643b0f55ef6f3 82873a7bab5c684b380655f714ef4627c2cc597c

2
scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id
View File

@ -1 +1 @@
8b050405631c049752c3abcbbdf1175624cc1d2a 9b2a5b3fafa8e400f433eb3cd1875a43374df67e

25
scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp
View File

@ -251,11 +251,10 @@ static int tolua_cocos2d_Menu_create(lua_State* tolua_S)
uint32_t i = 1; uint32_t i = 1;
while (i <= argc) while (i <= argc)
{ {
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S, 1 + i, "MenuItem", 0, &tolua_err)) if (!tolua_isusertype(tolua_S, 1 + i, "MenuItem", 0, &tolua_err))
{
goto tolua_lerror; goto tolua_lerror;
return 0; #endif
}
cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL)); cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL));
if (NULL != item) if (NULL != item)
@ -660,6 +659,8 @@ static int tolua_cocos2d_Layer_registerScriptKeypadHandler(lua_State* tolua_S)
} }
#endif #endif
argc = lua_gettop(tolua_S) - 1;
if (1 == argc) if (1 == argc)
{ {
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
@ -705,6 +706,8 @@ static int tolua_cocos2d_Layer_unregisterScriptKeypadHandler(lua_State* tolua_S)
} }
#endif #endif
argc = lua_gettop(tolua_S) - 1;
if (0 == argc) if (0 == argc)
{ {
ScriptHandlerMgr::getInstance()->removeObjectHandler(self, ScriptHandlerMgr::kKeypadHandler); ScriptHandlerMgr::getInstance()->removeObjectHandler(self, ScriptHandlerMgr::kKeypadHandler);
@ -927,11 +930,10 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S)
uint32_t i = 1; uint32_t i = 1;
while (i <= argc) while (i <= argc)
{ {
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err)) if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err))
{
goto tolua_lerror; goto tolua_lerror;
return 0; #endif
}
cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL)); cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL));
if (NULL != item) if (NULL != item)
@ -1248,11 +1250,10 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S)
uint32_t i = 1; uint32_t i = 1;
while (i <= argc) while (i <= argc)
{ {
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err)) if (!tolua_isusertype(tolua_S, 1 + i, "Object", 0, &tolua_err))
{
goto tolua_lerror; goto tolua_lerror;
return 0; #endif
}
cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL)); cocos2d::Object* item = static_cast<cocos2d::Object*>(tolua_tousertype(tolua_S, 1 + i, NULL));
if (NULL != item) if (NULL != item)
@ -1603,9 +1604,9 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S)
int argc = 0; int argc = 0;
DrawNode* self = nullptr; DrawNode* self = nullptr;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err; tolua_Error tolua_err;
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"DrawNode",0,&tolua_err)) goto tolua_lerror; if (!tolua_isusertype(tolua_S,1,"DrawNode",0,&tolua_err)) goto tolua_lerror;
#endif #endif
@ -1645,7 +1646,9 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S)
if (!tolua_istable(tolua_S,-1, 0, &tolua_err)) if (!tolua_istable(tolua_S,-1, 0, &tolua_err))
{ {
CC_SAFE_DELETE_ARRAY(points); CC_SAFE_DELETE_ARRAY(points);
#if COCOS2D_DEBUG >= 1
goto tolua_lerror; goto tolua_lerror;
#endif
} }
if(!luaval_to_point(tolua_S, lua_gettop(tolua_S), &points[i])) if(!luaval_to_point(tolua_S, lua_gettop(tolua_S), &points[i]))

98
scripting/lua/script/Cocos2d.lua
View File

@ -3,6 +3,24 @@ cc = cc or {}
cc.DIRECTOR_PROJECTION_2D = 0 cc.DIRECTOR_PROJECTION_2D = 0
cc.DIRECTOR_PROJECTION_3D = 1 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 --Point
function cc.p(_x,_y) function cc.p(_x,_y)
if nil == _y then if nil == _y then
@ -24,6 +42,10 @@ function cc.pMul(pt1,factor)
return { x = pt1.x * factor , y = pt1.y * factor } return { x = pt1.x * factor , y = pt1.y * factor }
end 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) function cc.pForAngle(a)
return { x = math.cos(a), y = math.sin(a) } return { x = math.cos(a), y = math.sin(a) }
end end
@ -33,7 +55,7 @@ function cc.pGetLength(pt)
end end
function cc.pNormalize(pt) function cc.pNormalize(pt)
local length = cc.getPointLength(pt) local length = cc.pGetLength(pt)
if 0 == length then if 0 == length then
return { x = 1.0,y = 0.0 } return { x = 1.0,y = 0.0 }
end end
@ -53,7 +75,7 @@ function cc.pToAngleSelf(self)
return math.atan2(self.y, self.x) return math.atan2(self.y, self.x)
end end
function cc.pToAngle(self,other) function cc.pGetAngle(self,other)
local a2 = cc.pNormalize(self) local a2 = cc.pNormalize(self)
local b2 = cc.pNormalize(other) local b2 = cc.pNormalize(other)
local angle = math.atan2(cc.pCross(a2, b2), cc.pDot(a2, b2) ) 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 return true,s,t
end 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 --Size
function cc.size( _width,_height ) function cc.size( _width,_height )
return { width = _width, height = _height } return { width = _width, height = _height }

11
scripting/lua/script/Cocos2dConstants.lua
View File

@ -242,3 +242,14 @@ cc.LANGUAGE_JAPANESE = 8
cc.LANGUAGE_HUNGARIAN = 9 cc.LANGUAGE_HUNGARIAN = 9
cc.LANGUAGE_PORTUGUESE = 10 cc.LANGUAGE_PORTUGUESE = 10
cc.LANGUAGE_ARABIC = 11 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

934
scripting/lua/script/Deprecated.lua
View File

File diff suppressed because it is too large Load Diff

1827
scripting/lua/script/DeprecatedClass.lua Normal file
View File

File diff suppressed because it is too large Load Diff

387
scripting/lua/script/DeprecatedEnum.lua Normal file
View File

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

288
scripting/lua/script/DeprecatedOpenglEnum.lua Normal file
View File

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

2
scripting/lua/tolua/tolua_event.c
View File

@ -344,7 +344,7 @@ static int class_add_event (lua_State* L)
return do_operator(L,".add"); 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"); return do_operator(L,".sub");
} }

2
scripting/lua/tolua/tolua_is.c
View File

@ -161,7 +161,7 @@ int push_table_instance(lua_State* L, int lo) {
}; };
/* the equivalent of lua_is* for usertype */ /* 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 (!lua_isuserdata(L,lo)) {
if (!push_table_instance(L, lo)) { if (!push_table_instance(L, lo)) {

87
template/multi-platform-lua/Resources/hello.lua
View File

@ -1,11 +1,15 @@
require "AudioEngine" require "Cocos2d"
-- cclog
cclog = function(...)
print(string.format(...))
end
-- for CCLuaEngine traceback -- for CCLuaEngine traceback
function __G__TRACKBACK__(msg) function __G__TRACKBACK__(msg)
print("----------------------------------------") cclog("----------------------------------------")
print("LUA ERROR: " .. tostring(msg) .. "\n") cclog("LUA ERROR: " .. tostring(msg) .. "\n")
print(debug.traceback()) cclog(debug.traceback())
print("----------------------------------------") cclog("----------------------------------------")
end end
local function main() local function main()
@ -13,17 +17,13 @@ local function main()
collectgarbage("setpause", 100) collectgarbage("setpause", 100)
collectgarbage("setstepmul", 5000) collectgarbage("setstepmul", 5000)
local cclog = function(...)
print(string.format(...))
end
require "hello2" require "hello2"
cclog("result is " .. myadd(3, 5)) cclog("result is " .. myadd(1, 1))
--------------- ---------------
local visibleSize = CCDirector:getInstance():getVisibleSize() local visibleSize = cc.Director:getInstance():getVisibleSize()
local origin = CCDirector:getInstance():getVisibleOrigin() local origin = cc.Director:getInstance():getVisibleOrigin()
-- add the moving dog -- add the moving dog
local function creatDog() local function creatDog()
@ -31,24 +31,25 @@ local function main()
local frameHeight = 95 local frameHeight = 95
-- create dog animate -- create dog animate
local textureDog = CCTextureCache:getInstance():addImage("dog.png") local textureDog = cc.TextureCache:getInstance():addImage("dog.png")
local rect = CCRect(0, 0, frameWidth, frameHeight) local rect = cc.rect(0, 0, frameWidth, frameHeight)
local frame0 = CCSpriteFrame:createWithTexture(textureDog, rect) local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect)
rect = CCRect(frameWidth, 0, frameWidth, frameHeight) rect = cc.rect(frameWidth, 0, frameWidth, frameHeight)
local frame1 = CCSpriteFrame:createWithTexture(textureDog, rect) local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect)
local spriteDog = CCSprite:createWithSpriteFrame(frame0) local spriteDog = cc.Sprite:createWithSpriteFrame(frame0)
spriteDog.isPaused = false spriteDog.isPaused = false
spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3)
--[[
local animFrames = CCArray:create() local animFrames = CCArray:create()
animFrames:addObject(frame0) animFrames:addObject(frame0)
animFrames:addObject(frame1) animFrames:addObject(frame1)
]]--
local animation = CCAnimation:createWithSpriteFrames(animFrames, 0.5) local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5)
local animate = CCAnimate:create(animation); local animate = cc.Animate:create(animation);
spriteDog:runAction(CCRepeatForever:create(animate)) spriteDog:runAction(cc.RepeatForever:create(animate))
-- moving dog at every frame -- moving dog at every frame
local function tick() local function tick()
@ -63,34 +64,34 @@ local function main()
spriteDog:setPositionX(x) spriteDog:setPositionX(x)
end end
CCDirector:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false)
return spriteDog return spriteDog
end end
-- create farm -- create farm
local function createLayerFarm() local function createLayerFarm()
local layerFarm = CCLayer:create() local layerFarm = cc.Layer:create()
-- add in farm background -- 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) bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2)
layerFarm:addChild(bg) layerFarm:addChild(bg)
-- add land sprite -- add land sprite
for i = 0, 3 do for i = 0, 3 do
for j = 0, 1 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) spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2)
layerFarm:addChild(spriteLand) layerFarm:addChild(spriteLand)
end end
end end
-- add crop -- 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 i = 0, 3 do
for j = 0, 1 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) spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2)
layerFarm:addChild(spriteCrop) layerFarm:addChild(spriteCrop)
end end
@ -146,37 +147,37 @@ local function main()
-- create menu -- create menu
local function createLayerMenu() local function createLayerMenu()
local layerMenu = CCLayer:create() local layerMenu = cc.Layer:create()
local menuPopup, menuTools, effectID local menuPopup, menuTools, effectID
local function menuCallbackClosePopup() local function menuCallbackClosePopup()
-- stop test sound effect -- stop test sound effect
AudioEngine.stopEffect(effectID) cc.SimpleAudioEngine:getInstance():stopEffect(effectID)
menuPopup:setVisible(false) menuPopup:setVisible(false)
end end
local function menuCallbackOpenPopup() local function menuCallbackOpenPopup()
-- loop test sound effect -- loop test sound effect
local effectPath = CCFileUtils:getInstance():fullPathForFilename("effect1.wav") local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
effectID = AudioEngine.playEffect(effectPath) effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath)
menuPopup:setVisible(true) menuPopup:setVisible(true)
end end
-- add a popup menu -- 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:setPosition(0, 0)
menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) 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:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2)
menuPopup:setVisible(false) menuPopup:setVisible(false)
layerMenu:addChild(menuPopup) layerMenu:addChild(menuPopup)
-- add the left-bottom "tools" menu to invoke 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:setPosition(0, 0)
menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup)
menuTools = CCMenu:createWithItem(menuToolsItem) menuTools = cc.Menu:create(menuToolsItem)
local itemWidth = menuToolsItem:getContentSize().width local itemWidth = menuToolsItem:getContentSize().width
local itemHeight = menuToolsItem:getContentSize().height local itemHeight = menuToolsItem:getContentSize().height
menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2)
@ -189,16 +190,16 @@ local function main()
-- uncomment below for the BlackBerry version -- uncomment below for the BlackBerry version
-- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg") -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg")
local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.mp3") local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3")
AudioEngine.playMusic(bgMusicPath, true) cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true)
local effectPath = CCFileUtils:getInstance():fullPathForFilename("effect1.wav") local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
AudioEngine.preloadEffect(effectPath) cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath)
-- run -- run
local sceneGame = CCScene:create() local sceneGame = cc.Scene:create()
sceneGame:addChild(createLayerFarm()) sceneGame:addChild(createLayerFarm())
sceneGame:addChild(createLayerMenu()) sceneGame:addChild(createLayerMenu())
CCDirector:getInstance():runWithScene(sceneGame) cc.Director:getInstance():runWithScene(sceneGame)
end end
xpcall(main, __G__TRACKBACK__) xpcall(main, __G__TRACKBACK__)

12
template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj
View File

@ -7,6 +7,9 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* 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 */; }; 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 */; }; 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 */; }; 15C156991683138E00D239F2 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156921683138E00D239F2 /* Default.png */; };
@ -192,6 +195,9 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1525771B17CEFBD400BE417B /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = ../../../scripting/lua/script/DeprecatedClass.lua; sourceTree = "<group>"; };
1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = ../../../scripting/lua/script/DeprecatedEnum.lua; sourceTree = "<group>"; };
1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = ../../../scripting/lua/script/DeprecatedOpenglEnum.lua; sourceTree = "<group>"; };
15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = "<group>"; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = "<group>"; };
15C156911683138E00D239F2 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; 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; }; 15C156921683138E00D239F2 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; };
@ -270,6 +276,9 @@
1A0227A417A3AA1A00B867AD /* Lua Common */ = { 1A0227A417A3AA1A00B867AD /* Lua Common */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1525771B17CEFBD400BE417B /* DeprecatedClass.lua */,
1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */,
1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */,
1A0227A517A3AA3500B867AD /* AudioEngine.lua */, 1A0227A517A3AA3500B867AD /* AudioEngine.lua */,
1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */, 1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */,
1ADB273717CCA0C200634B5E /* Cocos2d.lua */, 1ADB273717CCA0C200634B5E /* Cocos2d.lua */,
@ -579,6 +588,9 @@
1A0227B117A3AA3500B867AD /* Opengl.lua in Resources */, 1A0227B117A3AA3500B867AD /* Opengl.lua in Resources */,
1A0227B217A3AA3500B867AD /* OpenglConstants.lua in Resources */, 1A0227B217A3AA3500B867AD /* OpenglConstants.lua in Resources */,
1ADB273817CCA0C200634B5E /* Cocos2d.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; runOnlyForDeploymentPostprocessing = 0;
}; };

12
template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -28,6 +28,9 @@
1501825E17A74F8000E674E5 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825717A74F8000E674E5 /* Opengl.lua */; }; 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825717A74F8000E674E5 /* Opengl.lua */; };
1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825817A74F8000E674E5 /* OpenglConstants.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 */; }; 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 */; }; 15A02F3817A64D1E0035E92B /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2417A64D1E0035E92B /* background.mp3 */; };
15A02F3917A64D1E0035E92B /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2517A64D1E0035E92B /* background.ogg */; }; 15A02F3917A64D1E0035E92B /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2517A64D1E0035E92B /* background.ogg */; };
15A02F3C17A64D1E0035E92B /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2817A64D1E0035E92B /* crop.png */; }; 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 = "<group>"; }; 1501825617A74F8000E674E5 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawPrimitives.lua; sourceTree = "<group>"; };
1501825717A74F8000E674E5 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Opengl.lua; sourceTree = "<group>"; }; 1501825717A74F8000E674E5 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Opengl.lua; sourceTree = "<group>"; };
1501825817A74F8000E674E5 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenglConstants.lua; sourceTree = "<group>"; }; 1501825817A74F8000E674E5 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenglConstants.lua; sourceTree = "<group>"; };
1525770917CEFB6200BE417B /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedClass.lua; sourceTree = "<group>"; };
1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedEnum.lua; sourceTree = "<group>"; };
1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedOpenglEnum.lua; sourceTree = "<group>"; };
15A02E6017A647C90035E92B /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; }; 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; }; 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 = "<group>"; }; 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
@ -256,6 +262,9 @@
1501825117A74F8000E674E5 /* Lua Common */ = { 1501825117A74F8000E674E5 /* Lua Common */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1525770917CEFB6200BE417B /* DeprecatedClass.lua */,
1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */,
1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */,
1501825217A74F8000E674E5 /* AudioEngine.lua */, 1501825217A74F8000E674E5 /* AudioEngine.lua */,
1501825317A74F8000E674E5 /* CCBReaderLoad.lua */, 1501825317A74F8000E674E5 /* CCBReaderLoad.lua */,
1ADB273A17CCA0F500634B5E /* Cocos2d.lua */, 1ADB273A17CCA0F500634B5E /* Cocos2d.lua */,
@ -565,6 +574,9 @@
1501825E17A74F8000E674E5 /* Opengl.lua in Resources */, 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */,
1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */, 1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */,
1ADB273B17CCA0F500634B5E /* Cocos2d.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; runOnlyForDeploymentPostprocessing = 0;
}; };

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 98ddf882f2898bc9043ea54d9ed7f32383f6be4d Subproject commit 7cc32ff48845f726937eea2c1b0cdb743db321cd

2
tools/tolua/cocos2dx.ini
View File

@ -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 # will apply to all class names. This is a convenience wildcard to be able to skip similar named
# functions from all classes. # 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], Sprite::[getQuad getBlendFunc ^setPosition$ setBlendFunc],
SpriteBatchNode::[getBlendFunc setBlendFunc], SpriteBatchNode::[getBlendFunc setBlendFunc],
MotionStreak::[getBlendFunc setBlendFunc draw update], MotionStreak::[getBlendFunc setBlendFunc draw update],