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

Merge pull request #1592 from fape/luaCocos2d 

fix compile: rename kOrientation to kCCTransitionOrientation
This commit is contained in:
minggo 2012-11-19 17:36:25 -08:00
parent 93821be7e4 355d8df79e
commit 33529afc07
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
samples/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua
View File

@ -189,29 +189,29 @@ local function createTransition(index, t, scene)
elseif index == Transition_Table.FadeWhiteTransition then
scene = CCTransitionFade:create(t, scene, ccc3(255, 255, 255))
elseif index == Transition_Table.FlipXLeftOver then
scene = CCTransitionFlipX:create(t, scene, kOrientationLeftOver)
scene = CCTransitionFlipX:create(t, scene, kCCTransitionOrientationLeftOver)
elseif index == Transition_Table.FlipXRightOver then
scene = CCTransitionFlipX:create(t, scene, kOrientationRightOver)
scene = CCTransitionFlipX:create(t, scene, kCCTransitionOrientationRightOver)
elseif index == Transition_Table.FlipYUpOver then
scene = CCTransitionFlipY:create(t, scene, kOrientationUpOver)
scene = CCTransitionFlipY:create(t, scene, kCCTransitionOrientationUpOver)
elseif index == Transition_Table.FlipYDownOver then
scene = CCTransitionFlipY:create(t, scene, kOrientationDownOver)
scene = CCTransitionFlipY:create(t, scene, kCCTransitionOrientationDownOver)
elseif index == Transition_Table.FlipAngularLeftOver then
scene = CCTransitionFlipAngular:create(t, scene, kOrientationLeftOver)
scene = CCTransitionFlipAngular:create(t, scene, kCCTransitionOrientationLeftOver)
elseif index == Transition_Table.FlipAngularRightOver then
scene = CCTransitionFlipAngular:create(t, scene, kOrientationRightOver)
scene = CCTransitionFlipAngular:create(t, scene, kCCTransitionOrientationRightOver)
elseif index == Transition_Table.ZoomFlipXLeftOver then
scene = CCTransitionZoomFlipX:create(t, scene, kOrientationLeftOver)
scene = CCTransitionZoomFlipX:create(t, scene, kCCTransitionOrientationLeftOver)
elseif index == Transition_Table.ZoomFlipXRightOver then
scene = CCTransitionZoomFlipX:create(t, scene, kOrientationRightOver)
scene = CCTransitionZoomFlipX:create(t, scene, kCCTransitionOrientationRightOver)
elseif index == Transition_Table.ZoomFlipYUpOver then
scene = CCTransitionZoomFlipY:create(t, scene, kOrientationUpOver)
scene = CCTransitionZoomFlipY:create(t, scene, kCCTransitionOrientationUpOver)
elseif index == Transition_Table.ZoomFlipYDownOver then
scene = CCTransitionZoomFlipY:create(t, scene, kOrientationDownOver)
scene = CCTransitionZoomFlipY:create(t, scene, kCCTransitionOrientationDownOver)
elseif index == Transition_Table.ZoomFlipAngularLeftOver then
scene = CCTransitionZoomFlipAngular:create(t, scene, kOrientationLeftOver)
scene = CCTransitionZoomFlipAngular:create(t, scene, kCCTransitionOrientationLeftOver)
elseif index == Transition_Table.ZoomFlipAngularRightOver then
scene = CCTransitionZoomFlipAngular:create(t, scene, kOrientationRightOver)
scene = CCTransitionZoomFlipAngular:create(t, scene, kCCTransitionOrientationRightOver)
elseif index == Transition_Table.CCTransitionShrinkGrow then
scene = CCTransitionShrinkGrow:create(t, scene)
elseif index == Transition_Table.CCTransitionRotoZoom then

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

@ -1 +1 @@
fb55025330e8a2805460df5913b0a398c9120ed2
c893636df2a952d791291d26ca03022ee8fc29a6

20
tools/tolua++/CCTransition.pkg
View File

@ -1,13 +1,13 @@
typedef enum {
/// An horizontal orientation where the Left is nearer
kOrientationLeftOver = 0,
kCCTransitionOrientationLeftOver = 0,
/// An horizontal orientation where the Right is nearer
kOrientationRightOver = 1,
kCCTransitionOrientationRightOver = 1,
/// A vertical orientation where the Up is nearer
kOrientationUpOver = 0,
kCCTransitionOrientationUpOver = 0,
/// A vertical orientation where the Bottom is nearer
kOrientationDownOver = 1,
kCCTransitionOrientationDownOver = 1,
} tOrientation;
class CCTransitionScene : public CCScene
@ -77,32 +77,32 @@ class CCTransitionShrinkGrow : public CCScene
class CCTransitionFlipX : public CCScene
{
static CCTransitionFlipX* create(float t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionFlipX* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationRightOver);
};
class CCTransitionFlipY : public CCScene
{
static CCTransitionFlipY* create(float t, CCScene* s, tOrientation o = kOrientationUpOver);
static CCTransitionFlipY* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationUpOver);
};
class CCTransitionFlipAngular : public CCScene
{
static CCTransitionFlipAngular* create(float t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionFlipAngular* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationRightOver);
};
class CCTransitionZoomFlipX : public CCScene
{
static CCTransitionZoomFlipX* create(float t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionZoomFlipX* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationRightOver);
};
class CCTransitionZoomFlipY : public CCScene
{
static CCTransitionZoomFlipY* create(float t, CCScene* s, tOrientation o = kOrientationUpOver);
static CCTransitionZoomFlipY* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationUpOver);
};
class CCTransitionZoomFlipAngular : public CCScene
{
static CCTransitionZoomFlipAngular* create(float t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionZoomFlipAngular* create(float t, CCScene* s, tOrientation o = kCCTransitionOrientationRightOver);
};
class CCTransitionFade : public CCScene