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

Merge pull request #1025 from dumganhar/gles20 

fixed #1326: The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
This commit is contained in:
James Chen 2012-06-14 19:58:50 -07:00
parent 522fcf9018 3a5ba4a24c
commit 77d7f44b3f
29 changed files with 146 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HelloLua/Classes/AppDelegate.cpp
View File

@ -40,13 +40,13 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
CCString* pstrFileContent = CCString::stringWithContentsOfFile("hello.lua");
CCString* pstrFileContent = CCString::createWithContentsOfFile("hello.lua");
if (pstrFileContent)
{
pEngine->executeString(pstrFileContent->getCString());
}
#else
std::string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
std::string path = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath("hello.lua");
pEngine->addSearchPath(path.substr(0, path.find_last_of("/")).c_str());
pEngine->executeScriptFile(path.c_str());
#endif

7
cocos2dx/layers_scenes_transitions_nodes/CCTransitionProgress.h
View File

@ -37,6 +37,7 @@ class CCRenderTexture;
class CC_DLL CCTransitionProgress : public CCTransitionScene
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgress)
TRANSITION_CREATE_FUNC(CCTransitionProgress)
CCTransitionProgress();
@ -58,6 +59,7 @@ protected:
class CC_DLL CCTransitionProgressRadialCCW : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressRadialCCW)
TRANSITION_CREATE_FUNC(CCTransitionProgressRadialCCW)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
@ -71,6 +73,7 @@ protected:
class CC_DLL CCTransitionProgressRadialCW : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressRadialCW)
TRANSITION_CREATE_FUNC(CCTransitionProgressRadialCW)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
@ -83,6 +86,7 @@ protected:
class CC_DLL CCTransitionProgressHorizontal : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressHorizontal)
TRANSITION_CREATE_FUNC(CCTransitionProgressHorizontal)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
@ -92,6 +96,7 @@ protected:
class CC_DLL CCTransitionProgressVertical : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressVertical)
TRANSITION_CREATE_FUNC(CCTransitionProgressVertical)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
@ -101,6 +106,7 @@ protected:
class CC_DLL CCTransitionProgressInOut : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressInOut)
TRANSITION_CREATE_FUNC(CCTransitionProgressInOut)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
@ -111,6 +117,7 @@ protected:
class CC_DLL CCTransitionProgressOutIn : public CCTransitionProgress
{
public:
OLD_TRANSITION_CREATE_FUNC(CCTransitionProgressOutIn)
TRANSITION_CREATE_FUNC(CCTransitionProgressOutIn)
protected:
virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);

6
js/JSBindings/ScriptingCore.cpp
View File

@ -246,11 +246,11 @@ void ScriptingCore::runScript(const char *path)
// std::string dpath("/Users/rabarca/Desktop/testjs/testjs/");
std::string dpath("");
dpath += path;
const char *realPath = CCFileUtils::fullPathFromRelativePath(dpath.c_str());
const char *realPath = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(dpath.c_str());
#else
const char *realPath = CCFileUtils::fullPathFromRelativePath(path);
const char *realPath = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(path);
#endif
const char* content = CCString::stringWithContentsOfFile(realPath)->getCString();
const char* content = CCString::createWithContentsOfFile(realPath)->getCString();
if (content && strlen(content) > 0) {
JSBool ok;
jsval rval;

2
js/JSBindings/cocos2d_generated.cpp.REMOVED.git-id
View File

@ -1 +1 @@
2ef6f502d16098ac1a18aee1ab7a64815c241af6
83e960279cac86d7cb43efbfa0f4445bf6b4f2b5

2
js/JSBindings/cocos2d_generated.hpp.REMOVED.git-id
View File

@ -1 +1 @@
27f42f585ea7195531f863d34fff314117000630
b0931db6aa50254f26db328117aa6b772c3dd86c

6
js/JSBindings/cocos2d_manual_bindings.cpp
View File

@ -128,7 +128,7 @@ JSBool S_CCFileUtils::jsgetFileData(JSContext *cx, uint32_t argc, jsval *vp) {
JS_ConvertArguments(cx, 2, JS_ARGV(cx, vp), "SS", &arg0, &arg1);
char *narg0 = JS_EncodeString(cx, arg0);
char *narg1 = JS_EncodeString(cx, arg1);
unsigned char *ret = CCFileUtils::getFileData(narg0, narg1, &len);
unsigned char *ret = CCFileUtils::sharedFileUtils()->getFileData(narg0, narg1, &len);
if (ret == NULL) {
JS_SET_RVAL(cx, vp, JSVAL_NULL);
return JS_TRUE;
@ -146,7 +146,7 @@ JSBool S_CCFileUtils::jsfullPathFromRelativePath(JSContext *cx, uint32_t argc, j
JSString *arg0;
JS_ConvertArguments(cx, 1, JS_ARGV(cx, vp), "S", &arg0);
char *narg0 = JS_EncodeString(cx, arg0);
const char *ret = CCFileUtils::fullPathFromRelativePath(narg0);
const char *ret = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(narg0);
if (ret == NULL) {
JS_SET_RVAL(cx, vp, JSVAL_NULL);
return JS_TRUE;
@ -166,7 +166,7 @@ JSBool S_CCFileUtils::jsfullPathFromRelativeFile(JSContext *cx, uint32_t argc, j
JS_ConvertArguments(cx, 2, JS_ARGV(cx, vp), "SS", &arg0, &arg1);
char *narg0 = JS_EncodeString(cx, arg0);
char *narg1 = JS_EncodeString(cx, arg1);
const char *ret = CCFileUtils::fullPathFromRelativeFile(narg0, narg1);
const char *ret = CCFileUtils::sharedFileUtils()->fullPathFromRelativeFile(narg0, narg1);
if (ret == NULL) {
JS_SET_RVAL(cx, vp, JSVAL_NULL);
return JS_TRUE;

2
lua/cocos2dx_support/CCLuaEngine.cpp
View File

@ -282,7 +282,7 @@ int CCLuaEngine::executeTouchesEvent(int nHandler, int eventType, CCSet *pTouche
return executeFunctionByHandler(nHandler, 2);
}
int CCLuaEngine::executeSchedule(int nHandler, ccTime dt)
int CCLuaEngine::executeSchedule(int nHandler, float dt)
{
return executeFunctionWithFloatData(nHandler, dt);
}

2
lua/cocos2dx_support/CCLuaEngine.h
View File

@ -112,7 +112,7 @@ public:
virtual int executeTouchesEvent(int nHandler, int eventType, cocos2d::CCSet *pTouches);
// execute a schedule function
virtual int executeSchedule(int nHandler, cocos2d::ccTime dt);
virtual int executeSchedule(int nHandler, float dt);
// Add lua loader, now it is used on android
virtual void addLuaLoader(lua_CFunction func);

12
lua/cocos2dx_support/Cocos2dxLuaLoader.cpp
View File

@ -33,23 +33,15 @@ extern "C"
std::string filename(luaL_checkstring(L, 1));
filename.append(".lua");
unsigned long size;
char *pFileContent = (char*)CCFileUtils::getFileData(filename.c_str(), "r", &size);
CCString* pFileContent = CCString::createWithContentsOfFile(filename.c_str());
if (pFileContent)
{
// copy the file contents and add '\0' at the end, or the lua parser can not parse it
char *pCodes = new char[size + 1];
pCodes[size] = '\0';
memcpy(pCodes, pFileContent, size);
delete[] pFileContent;
if (luaL_loadstring(L, pCodes) != 0)
if (luaL_loadstring(L, pFileContent->getCString()) != 0)
{
luaL_error(L, "error loading module %s from file %s :\n\t%s",
lua_tostring(L, 1), filename.c_str(), lua_tostring(L, -1));
}
delete []pCodes;
}
else
{

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

@ -1 +1 @@
b44166abef4b62f6277ccfa7730bde51123f4295
c96a0297e226ff452dacd39b6d832b23622d34b7

4
template/msvc/CCAppWiz.win32/Templates/1033/Classes/AppDelegate.cpp
View File

@ -46,13 +46,13 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
CCString* pstrFileContent = CCString::stringWithContentsOfFile("hello.lua");
CCString* pstrFileContent = CCString::createWithContentsOfFile("hello.lua");
if (pstrFileContent)
{
pEngine->executeString(pstrFileContent->getCString());
}
#else
std::string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
std::string path = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath("hello.lua");
pEngine->addSearchPath(path.substr(0, path.find_last_of("/")).c_str());
pEngine->executeScriptFile(path.c_str());
#endif

2
template/xcode4/cocos2dx_box2d.xctemplate/Classes/HelloWorldScene.cpp vendored
View File

@ -44,7 +44,7 @@ CCAffineTransform PhysicsSprite::nodeToParentTransform(void)
float x = pos.x * PTM_RATIO;
float y = pos.y * PTM_RATIO;
if ( !getIsRelativeAnchorPoint() ) {
if ( getIgnoreAnchorPointForPosition() ) {
x += m_tAnchorPointInPoints.x;
y += m_tAnchorPointInPoints.y;
}

2
template/xcode4/cocos2dx_chipmunk.xctemplate/Classes/HelloWorldScene.cpp vendored
View File

@ -53,7 +53,7 @@ CCAffineTransform ChipmunkPhysicsSprite::nodeToParentTransform(void)
CCFloat x = m_pBody->p.x;
CCFloat y = m_pBody->p.y;
if ( !getIsRelativeAnchorPoint() ) {
if ( getIgnoreAnchorPointForPosition() ) {
x += m_tAnchorPointInPoints.x;
y += m_tAnchorPointInPoints.y;
}

4
template/xcode4/cocos2dx_lua.xctemplate/Classes/AppDelegate.cpp vendored
View File

@ -41,13 +41,13 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
CCString* pstrFileContent = CCString::stringWithContentsOfFile("hello.lua");
CCString* pstrFileContent = CCString::createWithContentsOfFile("hello.lua");
if (pstrFileContent)
{
pEngine->executeString(pstrFileContent->getCString());
}
#else
string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
string path = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath("hello.lua");
pEngine->addSearchPath(path.substr(0, path.find_last_of("/")).c_str());
pEngine->executeScriptFile(path.c_str());
#endif

4
tools/lua_project_generator/template/Classes/AppDelegate.cpp
View File

@ -38,13 +38,13 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
CCString* pstrFileContent = CCString::stringWithContentsOfFile("hello.lua");
CCString* pstrFileContent = CCString::createWithContentsOfFile("hello.lua");
if (pstrFileContent)
{
pEngine->executeString(pstrFileContent->getCString());
}
#else
std::string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
std::string path = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath("hello.lua");
pEngine->addSearchPath(path.substr(0, path.find_last_of("/")).c_str());
pEngine->executeScriptFile(path.c_str());
#endif

56
tools/tolua++/CCAction.pkg
View File

@ -18,15 +18,15 @@ class CCAction : public CCObject
class CCActionInterval : public CCAction
{
// ccTime getElapsed(void);
// float getElapsed(void);
// void setAmplitudeRate(CGFloat amp);
// CGFloat getAmplitudeRate(void);
};
class CCFiniteTimeAction : public CCActionInterval
{
// ccTime getDuration(void);
// void setDuration(ccTime duration);
// float getDuration(void);
// void setDuration(float duration);
// CCFiniteTimeAction* reverse(void);
};
@ -52,7 +52,7 @@ class CCFollow : public CCAction
class CCSequence : public CCActionInterval
{
static CCFiniteTimeAction* actionOneTwo(CCFiniteTimeAction *pActionOne, CCFiniteTimeAction *pActionTwo);
static CCFiniteTimeAction* actionsWithArray(CCArray *actions);
static CCFiniteTimeAction* actionWithArray(CCArray *actions);
};
class CCRepeat : public CCActionInterval
@ -67,48 +67,48 @@ class CCRepeatForever : public CCActionInterval
class CCSpawn : public CCActionInterval
{
static CCFiniteTimeAction* actionsWithArray(CCArray *actions);
static CCFiniteTimeAction* actionWithArray(CCArray *actions);
static CCSpawn* actionOneTwo(CCFiniteTimeAction *pAction1, CCFiniteTimeAction *pAction2);
};
class CCRotateTo : public CCActionInterval
{
static CCRotateTo* actionWithDuration(ccTime duration, float fDeltaAngle);
static CCRotateTo* actionWithDuration(float duration, float fDeltaAngle);
};
class CCRotateBy : public CCActionInterval
{
static CCRotateBy* actionWithDuration(ccTime duration, float fDeltaAngle);
static CCRotateBy* actionWithDuration(float duration, float fDeltaAngle);
};
class CCMoveTo : public CCActionInterval
{
static CCMoveTo* actionWithDuration(ccTime duration, CCPoint position);
static CCMoveTo* actionWithDuration(float duration, CCPoint position);
};
class CCMoveBy : public CCActionInterval
{
static CCMoveBy* actionWithDuration(ccTime duration, CCPoint position);
static CCMoveBy* actionWithDuration(float duration, CCPoint position);
};
class CCSkewTo : public CCActionInterval
{
static CCSkewTo* actionWithDuration(ccTime t, float sx, float sy);
static CCSkewTo* actionWithDuration(float t, float sx, float sy);
};
class CCSkewBy : public CCActionInterval
{
static CCSkewBy* actionWithDuration(ccTime t, float deltaSkewX, float deltaSkewY);
static CCSkewBy* actionWithDuration(float t, float deltaSkewX, float deltaSkewY);
};
class CCJumpBy : public CCActionInterval
{
static CCJumpBy* actionWithDuration(ccTime duration, CCPoint position, ccTime height, int jumps);
static CCJumpBy* actionWithDuration(float duration, CCPoint position, float height, int jumps);
};
class CCJumpTo : public CCActionInterval
{
static CCJumpTo* actionWithDuration(ccTime duration, CCPoint position, ccTime height, int jumps);
static CCJumpTo* actionWithDuration(float duration, CCPoint position, float height, int jumps);
};
typedef struct _ccBezierConfig {
@ -119,59 +119,59 @@ typedef struct _ccBezierConfig {
class CCBezierBy : public CCActionInterval
{
static CCBezierBy* actionWithDuration(ccTime t, ccBezierConfig c);
static CCBezierBy* actionWithDuration(float t, ccBezierConfig c);
};
class CCBezierTo : public CCActionInterval
{
static CCBezierTo* actionWithDuration(ccTime t, ccBezierConfig c);
static CCBezierTo* actionWithDuration(float t, ccBezierConfig c);
};
class CCScaleTo : public CCActionInterval
{
static CCScaleTo* actionWithDuration(ccTime duration, float s);
static CCScaleTo* actionWithDuration(ccTime duration, float sx, float sy);
static CCScaleTo* actionWithDuration(float duration, float s);
static CCScaleTo* actionWithDuration(float duration, float sx, float sy);
};
class CCScaleBy : public CCActionInterval
{
static CCScaleBy* actionWithDuration(ccTime duration, float s);
static CCScaleBy* actionWithDuration(ccTime duration, float sx, float sy);
static CCScaleBy* actionWithDuration(float duration, float s);
static CCScaleBy* actionWithDuration(float duration, float sx, float sy);
};
class CCBlink : public CCActionInterval
{
static CCBlink* actionWithDuration(ccTime duration, unsigned int uBlinks);
static CCBlink* actionWithDuration(float duration, unsigned int uBlinks);
};
class CCFadeIn : public CCActionInterval
{
static CCFadeIn* actionWithDuration(ccTime d);
static CCFadeIn* actionWithDuration(float d);
};
class CCFadeOut : public CCActionInterval
{
static CCFadeOut* actionWithDuration(ccTime d);
static CCFadeOut* actionWithDuration(float d);
};
class CCFadeTo : public CCActionInterval
{
static CCFadeTo* actionWithDuration(ccTime duration, GLubyte opacity);
static CCFadeTo* actionWithDuration(float duration, GLubyte opacity);
};
class CCTintTo : public CCActionInterval
{
static CCTintTo* actionWithDuration(ccTime duration, GLubyte red, GLubyte green, GLubyte blue);
static CCTintTo* actionWithDuration(float duration, GLubyte red, GLubyte green, GLubyte blue);
};
class CCTintBy : public CCActionInterval
{
static CCTintBy* actionWithDuration(ccTime duration, GLshort deltaRed, GLshort deltaGreen, GLshort deltaBlue);
static CCTintBy* actionWithDuration(float duration, GLshort deltaRed, GLshort deltaGreen, GLshort deltaBlue);
};
class CCDelayTime : public CCActionInterval
{
static CCDelayTime* actionWithDuration(ccTime d);
static CCDelayTime* actionWithDuration(float d);
};
class CCReverseTime : public CCActionInterval
@ -189,12 +189,12 @@ class CCAnimate : public CCActionInterval
class CCProgressTo : public CCAction
{
static CCAction* actionWithDuration(ccTime duration, float fPercent);
static CCAction* actionWithDuration(float duration, float fPercent);
};
class CCProgressFromTo : public CCAction
{
static CCAction* actionWithDuration(ccTime duration, float fFromPercentage, float fToPercentage);
static CCAction* actionWithDuration(float duration, float fFromPercentage, float fToPercentage);
};

8
tools/tolua++/CCActionGrid.pkg
View File

@ -3,7 +3,7 @@ class CCGridAction : public CCActionInterval
{
CCGridBase* getGrid(void);
static CCGridAction* actionWithSize(ccGridSize gridSize, ccTime duration);
static CCGridAction* actionWithSize(ccGridSize gridSize, float duration);
};
class CCAccelDeccelAmplitude : public CCActionInterval
@ -11,7 +11,7 @@ class CCAccelDeccelAmplitude : public CCActionInterval
float getRate(void);
void setRate(float fRate);
static CCAccelDeccelAmplitude* actionWithAction(CCAction *pAction, ccTime duration);
static CCAccelDeccelAmplitude* actionWithAction(CCAction *pAction, float duration);
};
class CCAccelAmplitude : public CCActionInterval
@ -19,7 +19,7 @@ class CCAccelAmplitude : public CCActionInterval
float getRate(void);
void setRate(float fRate);
static CCAccelAmplitude* actionWithAction(CCAction *pAction, ccTime duration);
static CCAccelAmplitude* actionWithAction(CCAction *pAction, float duration);
};
class CCDeccelAmplitude : public CCActionInterval
@ -27,7 +27,7 @@ class CCDeccelAmplitude : public CCActionInterval
float getRate(void);
void setRate(float fRate);
static CCDeccelAmplitude* actionWithAction(CCAction *pAction, ccTime duration);
static CCDeccelAmplitude* actionWithAction(CCAction *pAction, float duration);
};
class CCStopGrid : public CCActionInstant

18
tools/tolua++/CCActionGrid3D.pkg
View File

@ -6,17 +6,17 @@ class CCWaves3D : public CCGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCWaves3D* actionWithWaves(int wav, float amp, ccGridSize gridSize, ccTime duration);
static CCWaves3D* actionWithWaves(int wav, float amp, ccGridSize gridSize, float duration);
};
class CCFlipX3D : public CCGrid3DAction
{
static CCFlipX3D* actionWithDuration(ccTime duration);
static CCFlipX3D* actionWithDuration(float duration);
};
class CCFlipY3D : public CCFlipX3D
{
static CCFlipY3D* actionWithDuration(ccTime duration);
static CCFlipY3D* actionWithDuration(float duration);
};
class CCLens3D : public CCGrid3DAction
@ -26,7 +26,7 @@ class CCLens3D : public CCGrid3DAction
CCPoint getPosition(void);
void setPosition(CCPoint position);
static CCLens3D* actionWithPosition(CCPoint pos, float r, ccGridSize gridSize, ccTime duration);
static CCLens3D* actionWithPosition(CCPoint pos, float r, ccGridSize gridSize, float duration);
};
class CCRipple3D : public CCGrid3DAction
@ -38,12 +38,12 @@ class CCRipple3D : public CCGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCRipple3D* actionWithPosition(CCPoint pos, float r, int wav, float amp, ccGridSize gridSize, ccTime duration);
static CCRipple3D* actionWithPosition(CCPoint pos, float r, int wav, float amp, ccGridSize gridSize, float duration);
};
class CCShaky3D : public CCGrid3DAction
{
static CCShaky3D* actionWithRange(int range, bool shakeZ, ccGridSize gridSize, ccTime duration);
static CCShaky3D* actionWithRange(int range, bool shakeZ, ccGridSize gridSize, float duration);
};
class CCLiquid : public CCGrid3DAction
@ -53,7 +53,7 @@ class CCLiquid : public CCGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCLiquid* actionWithWaves(int wav, float amp, ccGridSize gridSize, ccTime duration);
static CCLiquid* actionWithWaves(int wav, float amp, ccGridSize gridSize, float duration);
};
class CCWaves : public CCGrid3DAction
@ -63,7 +63,7 @@ class CCWaves : public CCGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCWaves* actionWithWaves(int wav, float amp, bool h, bool v, ccGridSize gridSize,ccTime duration);
static CCWaves* actionWithWaves(int wav, float amp, bool h, bool v, ccGridSize gridSize,float duration);
};
class CCTwirl : public CCGrid3DAction
@ -75,5 +75,5 @@ class CCTwirl : public CCGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCTwirl* actionWithPosition(CCPoint pos, int t, float amp, ccGridSize gridSize,ccTime duration);
static CCTwirl* actionWithPosition(CCPoint pos, int t, float amp, ccGridSize gridSize,float duration);
};

2
tools/tolua++/CCActionPageTurn3D.pkg
View File

@ -1,5 +1,5 @@
class CCPageTurn3D : public CCGrid3DAction
{
static CCPageTurn3D* actionWithSize(ccGridSize gridSize, ccTime time);
static CCPageTurn3D* actionWithSize(ccGridSize gridSize, float time);
};

4
tools/tolua++/CCActionProgressTimer.pkg
View File

@ -1,10 +1,10 @@
class CCProgressTo : public CCActionInterval
{
static CCProgressTo* actionWithDuration(ccTime duration, float fPercent);
static CCProgressTo* actionWithDuration(float duration, float fPercent);
};
class CCProgressFromTo : public CCActionInterval
{
static CCProgressFromTo* actionWithDuration(ccTime duration, float fFromPercentage, float fToPercentage);
static CCProgressFromTo* actionWithDuration(float duration, float fFromPercentage, float fToPercentage);
};

26
tools/tolua++/CCActionTiledGrid.pkg
View File

@ -1,12 +1,12 @@
class CCShakyTiles3D : public CCTiledGrid3DAction
{
static CCShakyTiles3D* actionWithRange(int nRange, bool bShakeZ, ccGridSize gridSize, ccTime duration);
static CCShakyTiles3D* actionWithRange(int nRange, bool bShakeZ, ccGridSize gridSize, float duration);
};
class CCShatteredTiles3D : public CCTiledGrid3DAction
{
static CCShatteredTiles3D* actionWithRange(int nRange, bool bShatterZ, ccGridSize gridSize, ccTime duration);
static CCShatteredTiles3D* actionWithRange(int nRange, bool bShatterZ, ccGridSize gridSize, float duration);
};
class CCShuffleTiles : public CCTiledGrid3DAction
@ -15,7 +15,7 @@ class CCShuffleTiles : public CCTiledGrid3DAction
ccGridSize getDelta(ccGridSize pos);
void placeTile(ccGridSize pos, Tile *t);
static CCShuffleTiles* actionWithSeed(int s, ccGridSize gridSize, ccTime duration);
static CCShuffleTiles* actionWithSeed(int s, ccGridSize gridSize, float duration);
};
class CCFadeOutTRTiles : public CCTiledGrid3DAction
@ -24,22 +24,22 @@ class CCFadeOutTRTiles : public CCTiledGrid3DAction
void turnOffTile(ccGridSize pos);
void transformTile(ccGridSize pos, float distance);
static CCFadeOutTRTiles* actionWithSize(ccGridSize gridSize, ccTime time);
static CCFadeOutTRTiles* actionWithSize(ccGridSize gridSize, float time);
};
class CCFadeOutBLTiles : public CCFadeOutTRTiles
{
static CCFadeOutBLTiles* actionWithSize(ccGridSize gridSize, ccTime time);
static CCFadeOutBLTiles* actionWithSize(ccGridSize gridSize, float time);
};
class CCFadeOutUpTiles : public CCFadeOutTRTiles
{
static CCFadeOutUpTiles* actionWithSize(ccGridSize gridSize, ccTime time);
static CCFadeOutUpTiles* actionWithSize(ccGridSize gridSize, float time);
};
class CCFadeOutDownTiles : public CCFadeOutUpTiles
{
static CCFadeOutDownTiles* actionWithSize(ccGridSize gridSize, ccTime time);
static CCFadeOutDownTiles* actionWithSize(ccGridSize gridSize, float time);
};
class CCTurnOffTiles : public CCTiledGrid3DAction
@ -48,8 +48,8 @@ class CCTurnOffTiles : public CCTiledGrid3DAction
void turnOnTile(ccGridSize pos);
void turnOffTile(ccGridSize pos);
static CCTurnOffTiles* actionWithSize(ccGridSize size, ccTime d);
static CCTurnOffTiles* actionWithSeed(int s, ccGridSize gridSize, ccTime duration);
static CCTurnOffTiles* actionWithSize(ccGridSize size, float d);
static CCTurnOffTiles* actionWithSeed(int s, ccGridSize gridSize, float duration);
};
class CCWavesTiles3D : public CCTiledGrid3DAction
@ -59,7 +59,7 @@ class CCWavesTiles3D : public CCTiledGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCWavesTiles3D* actionWithWaves(int wav, float amp, ccGridSize gridSize, ccTime duration);
static CCWavesTiles3D* actionWithWaves(int wav, float amp, ccGridSize gridSize, float duration);
};
class CCJumpTiles3D : public CCTiledGrid3DAction
@ -69,15 +69,15 @@ class CCJumpTiles3D : public CCTiledGrid3DAction
float getAmplitudeRate(void);
void setAmplitudeRate(float fAmplitudeRate);
static CCJumpTiles3D* actionWithJumps(int j, float amp, ccGridSize gridSize, ccTime duration);
static CCJumpTiles3D* actionWithJumps(int j, float amp, ccGridSize gridSize, float duration);
};
class CCSplitRows : public CCTiledGrid3DAction
{
static CCSplitRows* actionWithRows(int nRows, ccTime duration);
static CCSplitRows* actionWithRows(int nRows, float duration);
};
class CCSplitCols : public CCTiledGrid3DAction
{
static CCSplitCols* actionWithCols(int nCols, ccTime duration);
static CCSplitCols* actionWithCols(int nCols, float duration);
};

2
tools/tolua++/CCDirector.pkg
View File

@ -9,7 +9,7 @@ class CCDirector : public CCObject
void setDisplayStats(bool bDisplayFPS);
bool isPaused(void);
unsigned int getFrames(void);
unsigned int getTotalFrames(void);
CCSize getWinSize(void);
CCSize getWinSizeInPixels(void);

3
tools/tolua++/CCFileUtils.pkg
View File

@ -1,5 +1,6 @@
class CCFileUtils
{
static std::string getWriteablePath();
static CCFileUtils* sharedFileUtils();
std::string getWriteablePath();
};

4
tools/tolua++/CCNode.pkg
View File

@ -65,8 +65,8 @@ class CCNode : public CCObject
bool getIsRunning();
CCNode* getParent();
void setParent(CCNode * var);
bool getIsRelativeAnchorPoint();
void setIsRelativeAnchorPoint(bool newValue);
bool getIgnoreAnchorPointForPosition();
void setIgnoreAnchorPointForPosition(bool newValue);
void* getUserData();
void setUserData(void *var);
void addChild(CCNode * child);

12
tools/tolua++/CCScheduler.pkg
View File

@ -1,18 +1,18 @@
class CCTimer : public CCObject
{
ccTime getInterval(void);
void setInterval(ccTime fInterval);
void update(ccTime dt);
float getInterval(void);
void setInterval(float fInterval);
void update(float dt);
};
class CCScheduler : public CCObject
{
ccTime getTimeScale(void);
void setTimeScale(ccTime fTimeScale);
float getTimeScale(void);
void setTimeScale(float fTimeScale);
unsigned int scheduleScriptFunc(LUA_FUNCTION funcID, ccTime fInterval, bool bPaused);
unsigned int scheduleScriptFunc(LUA_FUNCTION funcID, float fInterval, bool bPaused);
void unscheduleScriptEntry(unsigned int uScheduleScriptEntryID);
void scheduleUpdateForTarget(CCObject *pTarget, int nPriority, bool bPaused);

4
tools/tolua++/CCSprite.pkg
View File

@ -40,7 +40,7 @@ class CCSprite : public CCNode
//CCPoint getOffsetPositionInPixels(void);
void setDirtyRecursively(bool bValue);
void setIsRelativeAnchorPoint(bool bRelative);
void setIgnoreAnchorPointForPosition(bool newValue);
void setFlipX(bool bFlipX);
void setFlipY(bool bFlipY);
bool isFlipX(void);
@ -72,7 +72,7 @@ class CCSprite : public CCNode
static CCSprite* spriteWithTexture(CCTexture2D *pTexture);
static CCSprite* spriteWithTexture(CCTexture2D *pTexture, CCRect rect);
static CCSprite* spriteWithTexture(CCTexture2D *pTexture, CCRect rect, CCPoint offset);
// static CCSprite* spriteWithTexture(CCTexture2D *pTexture, CCRect rect, CCPoint offset);
static CCSprite* spriteWithSpriteFrame(CCSpriteFrame *pSpriteFrame);
static CCSprite* spriteWithSpriteFrameName(const char *pszSpriteFrameName);
static CCSprite* spriteWithFile(const char *pszFileName);

4
tools/tolua++/CCTexture2D.pkg
View File

@ -1,6 +1,6 @@
typedef enum {
kCCTexture2DPixelFormat_Automatic = 0,
// kCCTexture2DPixelFormat_Automatic = 0,
//! 32-bit texture: RGBA8888
kCCTexture2DPixelFormat_RGBA8888,
//! 24-bit texture: RGBA888
@ -26,7 +26,7 @@ typedef enum {
kCCTexture2DPixelFormat_Default = kCCTexture2DPixelFormat_RGBA8888,
// backward compatibility stuff
kTexture2DPixelFormat_Automatic = kCCTexture2DPixelFormat_Automatic,
// kTexture2DPixelFormat_Automatic = kCCTexture2DPixelFormat_Automatic,
kTexture2DPixelFormat_RGBA8888 = kCCTexture2DPixelFormat_RGBA8888,
kTexture2DPixelFormat_RGB888 = kCCTexture2DPixelFormat_RGB888,
kTexture2DPixelFormat_RGB565 = kCCTexture2DPixelFormat_RGB565,

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

@ -12,152 +12,152 @@ typedef enum {
class CCTransitionSceneOriented : public CCScene
{
static CCTransitionSceneOriented* transitionWithDuration(ccTime t, CCScene* scene, tOrientation o);
static CCTransitionSceneOriented* transitionWithDuration(float t, CCScene* scene, tOrientation o);
};
class CCTransitionRotoZoom : public CCScene
{
static CCTransitionRotoZoom* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionRotoZoom* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionJumpZoom : public CCScene
{
static CCTransitionJumpZoom* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionJumpZoom* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionMoveInL : public CCScene
{
static CCTransitionMoveInL* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionMoveInL* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionMoveInR : public CCScene
{
static CCTransitionMoveInR* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionMoveInR* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionMoveInT : public CCScene
{
static CCTransitionMoveInT* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionMoveInT* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionMoveInB : public CCScene
{
static CCTransitionMoveInB* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionMoveInB* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSlideInL : public CCScene
{
static CCTransitionSlideInL* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSlideInL* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSlideInR : public CCScene
{
static CCTransitionSlideInR* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSlideInR* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSlideInB : public CCScene
{
static CCTransitionSlideInB* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSlideInB* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSlideInT : public CCScene
{
static CCTransitionSlideInT* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSlideInT* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionShrinkGrow : public CCScene
{
static CCTransitionShrinkGrow* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionShrinkGrow* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionFlipX : public CCScene
{
static CCTransitionFlipX* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionFlipX* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationRightOver);
};
class CCTransitionFlipY : public CCScene
{
static CCTransitionFlipY* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationUpOver);
static CCTransitionFlipY* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationUpOver);
};
class CCTransitionFlipAngular : public CCScene
{
static CCTransitionFlipAngular* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionFlipAngular* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationRightOver);
};
class CCTransitionZoomFlipX : public CCScene
{
static CCTransitionZoomFlipX* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionZoomFlipX* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationRightOver);
};
class CCTransitionZoomFlipY : public CCScene
{
static CCTransitionZoomFlipY* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationUpOver);
static CCTransitionZoomFlipY* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationUpOver);
};
class CCTransitionZoomFlipAngular : public CCScene
{
static CCTransitionZoomFlipAngular* transitionWithDuration(ccTime t, CCScene* s, tOrientation o = kOrientationRightOver);
static CCTransitionZoomFlipAngular* transitionWithDuration(float t, CCScene* s, tOrientation o = kOrientationRightOver);
};
class CCTransitionFade : public CCScene
{
static CCTransitionFade* transitionWithDuration(ccTime duration,CCScene* scene, ccColor3B color = ccBLACK);
static CCTransitionFade* transitionWithDuration(float duration,CCScene* scene, ccColor3B color = ccBLACK);
};
class CCTransitionCrossFade : public CCScene
{
static CCTransitionCrossFade* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionCrossFade* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionTurnOffTiles : public CCScene
{
static CCTransitionTurnOffTiles* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionTurnOffTiles* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSplitCols : public CCScene
{
static CCTransitionSplitCols* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSplitCols* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionSplitRows : public CCScene
{
static CCTransitionSplitRows* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionSplitRows* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionFadeTR : public CCScene
{
static CCTransitionFadeTR* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionFadeTR* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionFadeBL : public CCScene
{
static CCTransitionFadeBL* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionFadeBL* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionFadeUp : public CCScene
{
static CCTransitionFadeUp* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionFadeUp* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionFadeDown : public CCScene
{
static CCTransitionFadeDown* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionFadeDown* transitionWithDuration(float t, CCScene* scene);
};
/*
class CCTransitionRadialCCW : public CCScene
{
static CCTransitionRadialCCW* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionRadialCCW* transitionWithDuration(float t, CCScene* scene);
};
class CCTransitionRadialCW : public CCScene
{
static CCTransitionRadialCW* transitionWithDuration(ccTime t, CCScene* scene);
static CCTransitionRadialCW* transitionWithDuration(float t, CCScene* scene);
};
*/
class CCTransitionPageTurn : public CCScene
{
CCActionInterval* actionWithSize(ccGridSize vector);
static CCTransitionPageTurn* transitionWithDuration(ccTime t,CCScene* scene,bool backwards);
static CCTransitionPageTurn* transitionWithDuration(float t,CCScene* scene,bool backwards);
};

19
tools/tolua++/ccTypes.pkg
View File

@ -9,7 +9,6 @@ typedef unsigned short GLushort;
typedef unsigned int GLuint;
typedef float GLfloat;
typedef float ccTime;
typedef struct _ccColor3B
{
GLubyte r;
@ -234,11 +233,21 @@ typedef struct _ccBlendFunc
//! delta time type
//! if you want more resolution redefine it as a double
//typedef double ccTime;
//typedef double float;
typedef enum
{
CCTextAlignmentLeft,
CCTextAlignmentCenter,
CCTextAlignmentRight,
kCCVerticalTextAlignmentTop,
kCCVerticalTextAlignmentCenter,
kCCVerticalTextAlignmentBottom,
} CCVerticalTextAlignment;
// XXX: If any of these enums are edited and/or reordered, udpate CCTexture2D.m
//! Horizontal text alignment type
typedef enum
{
kCCTextAlignmentLeft,
kCCTextAlignmentCenter,
kCCTextAlignmentRight,
} CCTextAlignment;