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

Merge pull request #871 from dumganhar/iss1190_gles20_lua 

fixed #1190: Updated lua bindings to 2.0 api.
This commit is contained in:
James Chen 2012-04-25 23:40:01 -07:00
parent f54d9b4184 ceb5b122b0
commit 7d8fc95297
48 changed files with 471 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloLua/Classes/Android.mk
View File

@ -20,7 +20,7 @@ LOCAL_STATIC_LIBRARIES += jpeg_static_prebuilt
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
LOCAL_SHARED_LIBRARIES := cocosdenshion_shared lua_shared
include $(BUILD_STATIC_LIBRARY)
$(call import-module,cocos2dx/platform/third_party/android/modules/libpng)

16
HelloLua/Resources/hello.lua
View File

@ -30,12 +30,13 @@ local function creatDog()
spriteDog.isPaused = false
spriteDog:setPosition(0, winSize.height / 4 * 3)
local animFrames = CCMutableArray_CCSpriteFrame__:new(2)
local animFrames = CCArray:arrayWithCapacity(2)
animFrames:addObject(frame0)
animFrames:addObject(frame1)
local animation = CCAnimation:animationWithFrames(animFrames, 0.5)
local animate = CCAnimate:actionWithAnimation(animation, false);
local animation = CCAnimation:animationWithSpriteFrames(animFrames, 0.5)
local animate = CCAnimate:actionWithAnimation(animation);
spriteDog:runAction(CCRepeatForever:actionWithAction(animate))
-- moving dog at every frame
@ -47,10 +48,11 @@ local function creatDog()
else
x = x + 1
end
spriteDog:setPositionX(x)
end
CCScheduler:sharedScheduler():scheduleScriptFunc(tick, 0, false)
CCDirector:sharedDirector():getScheduler():scheduleScriptFunc(tick, 0, false)
return spriteDog
end
@ -110,7 +112,7 @@ local function createLayerFram()
end
local function onTouchEnded(x, y)
cclog("onTouchEnded")
cclog("onTouchEnded: %0.2f, %0.2f", x, y)
touchBeginPoint = nil
spriteDog.isPaused = false
end
@ -151,7 +153,7 @@ local function createLayerMenu()
end
-- add a popup menu
local menuPopupItem = CCMenuItemImage:itemFromNormalImage("menu2.png", "menu2.png")
local menuPopupItem = CCMenuItemImage:itemWithNormalImage("menu2.png", "menu2.png")
menuPopupItem:setPosition(0, 0)
menuPopupItem:registerScriptHandler(menuCallbackClosePopup)
menuPopup = CCMenu:menuWithItem(menuPopupItem)
@ -160,7 +162,7 @@ local function createLayerMenu()
layerMenu:addChild(menuPopup)
-- add the left-bottom "tools" menu to invoke menuPopup
local menuToolsItem = CCMenuItemImage:itemFromNormalImage("menu1.png", "menu1.png")
local menuToolsItem = CCMenuItemImage:itemWithNormalImage("menu1.png", "menu1.png")
menuToolsItem:setPosition(0, 0)
menuToolsItem:registerScriptHandler(menuCallbackOpenPopup)
menuTools = CCMenu:menuWithItem(menuToolsItem)

2
HelloLua/proj.android/default.properties
View File

@ -1,2 +1,2 @@
# Project target.
target=android-7
target=android-10

52
HelloLua/proj.android/gen/org/cocos2dx/hellolua/R.java
View File

@ -1,26 +1,26 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package org.cocos2dx.hellolua;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
}
public static final class id {
public static final int test_demo_gl_surfaceview=0x7f050001;
public static final int textField=0x7f050000;
}
public static final class layout {
public static final int game_demo=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package org.cocos2dx.hellolua;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
}
public static final class id {
public static final int test_demo_gl_surfaceview=0x7f050001;
public static final int textField=0x7f050000;
}
public static final class layout {
public static final int game_demo=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}

6
HelloLua/proj.android/jni/helloworld/main.cpp
View File

@ -23,10 +23,10 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
{
if (!cocos2d::CCDirector::sharedDirector()->getOpenGLView())
{
cocos2d::CCEGLView *view = &cocos2d::CCEGLView::sharedOpenGLView();
view->setFrameWidthAndHeight(w, h);
cocos2d::CCEGLView *view = &cocos2d::CCEGLView::sharedOpenGLView();
view->setFrameSize(w, h);
// if you want to run in WVGA with HVGA resource, set it
view->create(480, 320);
// view->create(480, 320);
cocos2d::CCDirector::sharedDirector()->setOpenGLView(view);
AppDelegate *pAppDelegate = new AppDelegate();

11
HelloLua/proj.android/project.properties Normal file
View File

@ -0,0 +1,11 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=android-10

33
HelloLua/proj.android/src/org/cocos2dx/hellolua/HelloLua.java
View File

@ -24,22 +24,34 @@ THE SOFTWARE.
package org.cocos2dx.hellolua;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
import org.cocos2dx.lib.Cocos2dxRenderer;
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.ConfigurationInfo;
import android.opengl.GLSurfaceView;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
public class HelloLua extends Cocos2dxActivity{
protected void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
// get the packageName,it's used to set the resource path
String packageName = getApplication().getPackageName();
super.setPackageName(packageName);
if (detectOpenGLES20()) {
// get the packageName,it's used to set the resource path
String packageName = getApplication().getPackageName();
super.setPackageName(packageName);
mGLView = new LuaGLSurfaceView(this);
setContentView(mGLView);
mGLView = new LuaGLSurfaceView(this);
setContentView(mGLView);
mGLView.setEGLContextClientVersion(2);
mGLView.setCocos2dxRenderer(new Cocos2dxRenderer());
}
else {
Log.d("activity", "don't support gles2.0");
finish();
}
}
@Override
@ -54,7 +66,16 @@ public class HelloLua extends Cocos2dxActivity{
mGLView.onResume();
}
private GLSurfaceView mGLView;
private boolean detectOpenGLES20()
{
ActivityManager am =
(ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
ConfigurationInfo info = am.getDeviceConfigurationInfo();
return (info.reqGlEsVersion >= 0x20000);
}
private LuaGLSurfaceView mGLView;
static {
System.loadLibrary("cocosdenshion");

9
HelloLua/proj.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
View File

@ -144,11 +144,14 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView {
super(context, attrs);
initView();
}
public void setCocos2dxRenderer(Cocos2dxRenderer renderer){
mRenderer = renderer;
setRenderer(mRenderer);
}
protected void initView() {
mRenderer = new Cocos2dxRenderer();
protected void initView() {
setFocusableInTouchMode(true);
setRenderer(mRenderer);
textInputWraper = new TextInputWraper(this);

2
HelloLua/proj.ios/AppController.mm
View File

@ -45,7 +45,7 @@ static AppDelegate s_sharedApplication;
window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
EAGLView *__glView = [EAGLView viewWithFrame: [window bounds]
pixelFormat: kEAGLColorFormatRGBA8
depthFormat: GL_DEPTH_COMPONENT16_OES
depthFormat: GL_DEPTH_COMPONENT16
preserveBackbuffer: NO
sharegroup: nil
multiSampling: NO

2
HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
ffad21bda3a4ed5edc31bc8177fe0bf9d8262a5d
9b310a8b553efc1db798797273bd0bfb1b11c857

4
HelloLua/proj.win32/HelloLua.win32.vcproj
View File

@ -49,7 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Classes;&quot;$(SolutionDir)\lua\cocos2dx_support&quot;;&quot;$(SolutionDir)\lua\CocosDenshion_support&quot;;&quot;$(SolutionDir)\lua\lua&quot;;&quot;$(SolutionDir)\lua\tolua&quot;;&quot;$(SolutionDir)\lua\src&quot;;.;&quot;$(SolutionDir)\cocos2dx&quot;;&quot;$(SolutionDir)\cocos2dx\include&quot;;&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES&quot;;&quot;$(SolutionDir)\CocosDenshion\Include&quot;;&quot;$(SolutionDir)\cocos2dx\kazmath\include&quot;"
AdditionalIncludeDirectories="..\Classes;&quot;$(SolutionDir)\lua\cocos2dx_support&quot;;&quot;$(SolutionDir)\lua\CocosDenshion_support&quot;;&quot;$(SolutionDir)\lua\lua&quot;;&quot;$(SolutionDir)\lua\tolua&quot;;&quot;$(SolutionDir)\lua\src&quot;;.;&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\actions&quot;;&quot;$(SolutionDir)cocos2dx\base_nodes&quot;;&quot;$(SolutionDir)cocos2dx\cocoa&quot;;&quot;$(SolutionDir)cocos2dx\effects&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx\kazmath\include&quot;;&quot;$(SolutionDir)cocos2dx\keypad_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\label_nodes&quot;;&quot;$(SolutionDir)cocos2dx\layers_scenes_transitions_nodes&quot;;&quot;$(SolutionDir)cocos2dx\menu_nodes&quot;;&quot;$(SolutionDir)cocos2dx\misc_nodes&quot;;&quot;$(SolutionDir)cocos2dx\particle_nodes&quot;;&quot;$(SolutionDir)cocos2dx\script_support&quot;;&quot;$(SolutionDir)cocos2dx\shaders&quot;;&quot;$(SolutionDir)cocos2dx\sprite_nodes&quot;;&quot;$(SolutionDir)cocos2dx\support&quot;;&quot;$(SolutionDir)cocos2dx\text_input_node&quot;;&quot;$(SolutionDir)cocos2dx\textures&quot;;&quot;$(SolutionDir)cocos2dx\tileMap_parallax_nodes&quot;;&quot;$(SolutionDir)cocos2dx\touch_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\win32&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;&quot;$(SolutionDir)CocosDenshion\include&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -73,7 +73,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcocos2d.lib libCocosDenshion.lib libgles_cm.lib liblua.lib"
AdditionalDependencies="libcocos2d.lib libCocosDenshion.lib libGLESv2.lib liblua.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"

40
HelloLua/proj.win32/main.cpp
View File

@ -2,16 +2,32 @@
#include "AppDelegate.h"
int APIENTRY _tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPTSTR lpCmdLine,
int nCmdShow)
{
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
// create the application instance
AppDelegate app;
return cocos2d::CCApplication::sharedApplication().run();
// uncomment below line, open debug console
#define USE_WIN32_CONSOLE
int APIENTRY _tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPTSTR lpCmdLine,
int nCmdShow)
{
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
#ifdef USE_WIN32_CONSOLE
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
#endif
// create the application instance
AppDelegate app;
int ret = cocos2d::CCApplication::sharedApplication().run();
#ifdef USE_WIN32_CONSOLE
FreeConsole();
#endif
return ret;
}

2
HelloWorld/proj.win32/HelloWorld.win32.vcproj
View File

@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)cocos2dx&quot;;&quot;$(SolutionDir)cocos2dx\actions&quot;;&quot;$(SolutionDir)cocos2dx\base_nodes&quot;;&quot;$(SolutionDir)cocos2dx\cocoa&quot;;&quot;$(SolutionDir)cocos2dx\effects&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx\kazmath\include&quot;;&quot;$(SolutionDir)cocos2dx\keypad_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\label_nodes&quot;;&quot;$(SolutionDir)cocos2dx\layers_scenes_transitions_nodes&quot;;&quot;$(SolutionDir)cocos2dx\menu_nodes&quot;;&quot;$(SolutionDir)cocos2dx\misc_nodes&quot;;&quot;$(SolutionDir)cocos2dx\particle_nodes&quot;;&quot;$(SolutionDir)cocos2dx\script_support&quot;;&quot;$(SolutionDir)cocos2dx\shaders&quot;;&quot;$(SolutionDir)cocos2dx\sprite_nodes&quot;;&quot;$(SolutionDir)cocos2dx\support&quot;;&quot;$(SolutionDir)cocos2dx\text_input_node&quot;;&quot;$(SolutionDir)cocos2dx\textures&quot;;&quot;$(SolutionDir)cocos2dx\tileMap_parallax_nodes&quot;;&quot;$(SolutionDir)cocos2dx\touch_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\win32&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\Classes"
AdditionalIncludeDirectories="&quot;$(SolutionDir)cocos2dx1&quot;;&quot;$(SolutionDir)cocos2dx\actions&quot;;&quot;$(SolutionDir)cocos2dx\base_nodes&quot;;&quot;$(SolutionDir)cocos2dx\cocoa&quot;;&quot;$(SolutionDir)cocos2dx\effects&quot;;&quot;$(SolutionDir)cocos2dx\include&quot;;&quot;$(SolutionDir)cocos2dx\kazmath\include&quot;;&quot;$(SolutionDir)cocos2dx\keypad_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\label_nodes&quot;;&quot;$(SolutionDir)cocos2dx\layers_scenes_transitions_nodes&quot;;&quot;$(SolutionDir)cocos2dx\menu_nodes&quot;;&quot;$(SolutionDir)cocos2dx\misc_nodes&quot;;&quot;$(SolutionDir)cocos2dx\particle_nodes&quot;;&quot;$(SolutionDir)cocos2dx\script_support&quot;;&quot;$(SolutionDir)cocos2dx\shaders&quot;;&quot;$(SolutionDir)cocos2dx\sprite_nodes&quot;;&quot;$(SolutionDir)cocos2dx\support&quot;;&quot;$(SolutionDir)cocos2dx\text_input_node&quot;;&quot;$(SolutionDir)cocos2dx\textures&quot;;&quot;$(SolutionDir)cocos2dx\tileMap_parallax_nodes&quot;;&quot;$(SolutionDir)cocos2dx\touch_dispatcher&quot;;&quot;$(SolutionDir)cocos2dx\platform&quot;;&quot;$(SolutionDir)cocos2dx\platform\win32&quot;;&quot;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES&quot;;..\Classes"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"

8
cocos2dx/CCScheduler.cpp
View File

@ -179,6 +179,10 @@ void CCTimer::update(ccTime dt)
{
(m_pTarget->*m_pfnSelector)(m_fElapsed);
}
if (m_nScriptHandler)
{
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed);
}
m_fElapsed = m_fElapsed - m_fDelay;
m_nTimesExecuted+=1;
m_bUseDelay = false;
@ -192,6 +196,10 @@ void CCTimer::update(ccTime dt)
{
(m_pTarget->*m_pfnSelector)(m_fElapsed);
}
if (m_nScriptHandler)
{
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nScriptHandler, m_fElapsed);
}
m_fElapsed = 0;
m_nTimesExecuted += 1;

30
cocos2dx/cocoa/CCDictionary.cpp
View File

@ -88,14 +88,14 @@ CCArray* CCDictionary::allKeysForObject(CCObject* object)
return pArray;
}
CCObject* CCDictionary::objectForKey(const CCString& key)
CCObject* CCDictionary::objectForKey(const std::string& key)
{
if (m_eDictType == kCCDictUnknown && m_eDictType == kCCDictUnknown) return NULL;
CCAssert(m_eDictType == kCCDictStr, "this dictionary does not use string as key.");
CCObject* pRetObject = NULL;
CCDictElement *pElement = NULL;
HASH_FIND_STR(m_pElements, key.getCString(), pElement);
HASH_FIND_STR(m_pElements, key.c_str(), pElement);
if (pElement != NULL)
{
pRetObject = pElement->m_pObject;
@ -118,7 +118,7 @@ CCObject* CCDictionary::objectForKey(int key)
return pRetObject;
}
const CCString* CCDictionary::valueForKey(const CCString& key)
const CCString* CCDictionary::valueForKey(const std::string& key)
{
CCString* pStr = (CCString*)objectForKey(key);
if (pStr == NULL)
@ -138,7 +138,7 @@ const CCString* CCDictionary::valueForKey(int key)
return pStr;
}
void CCDictionary::setObject(CCObject* pObject, const CCString& key)
void CCDictionary::setObject(CCObject* pObject, const std::string& key)
{
CCAssert(key.length() > 0 && pObject != NULL, "Invalid Argument!");
if (m_eOldDictType == kCCDictUnknown)
@ -149,7 +149,7 @@ void CCDictionary::setObject(CCObject* pObject, const CCString& key)
CCAssert(m_eDictType == m_eOldDictType, "this dictionary does not use string as key.");
CCDictElement *pElement = NULL;
HASH_FIND_STR(m_pElements, key.getCString(), pElement);
HASH_FIND_STR(m_pElements, key.c_str(), pElement);
if (pElement == NULL)
{
setObjectUnSafe(pObject, key);
@ -191,7 +191,7 @@ void CCDictionary::setObject(CCObject* pObject, int key)
}
void CCDictionary::removeObjectForKey(const CCString& key)
void CCDictionary::removeObjectForKey(const std::string& key)
{
if (m_eOldDictType == kCCDictUnknown)
{
@ -200,7 +200,7 @@ void CCDictionary::removeObjectForKey(const CCString& key)
CCAssert(m_eDictType == kCCDictStr, "this dictionary does not use string as its key");
CCAssert(key.length() > 0, "Invalid Argument!");
CCDictElement *pElement = NULL;
HASH_FIND_STR(m_pElements, key.getCString(), pElement);
HASH_FIND_STR(m_pElements, key.c_str(), pElement);
removeObjectForElememt(pElement);
}
@ -216,10 +216,10 @@ void CCDictionary::removeObjectForKey(int key)
removeObjectForElememt(pElement);
}
void CCDictionary::setObjectUnSafe(CCObject* pObject, const CCString& key)
void CCDictionary::setObjectUnSafe(CCObject* pObject, const std::string& key)
{
pObject->retain();
CCDictElement* pElement = new CCDictElement(key.getCString(), pObject);
CCDictElement* pElement = new CCDictElement(key.c_str(), pObject);
HASH_ADD_STR(m_pElements, m_szKey, pElement);
}
@ -236,7 +236,7 @@ void CCDictionary::removeObjectsForKeys(CCArray* pKeyArray)
CCARRAY_FOREACH(pKeyArray, pObj)
{
CCString* pStr = (CCString*)pObj;
removeObjectForKey(*pStr);
removeObjectForKey(pStr->getCString());
}
}
@ -285,6 +285,16 @@ CCObject* CCDictionary::copyWithZone(CCZone* pZone)
return pNewDict;
}
CCDictionary* CCDictionary::dictionary()
{
CCDictionary* pRet = new CCDictionary();
if (pRet != NULL)
{
pRet->autorelease();
}
return pRet;
}
CCDictionary* CCDictionary::dictionaryWithDictionary(CCDictionary* srcDict)
{
CCDictionary* pNewDict = (CCDictionary*)srcDict->copy();

13
cocos2dx/cocoa/CCDictionary.h
View File

@ -118,16 +118,16 @@ public:
/** @warning : We use '==' to compare two objects*/
CCArray* allKeysForObject(CCObject* object);
CCObject* objectForKey(const CCString& key);
CCObject* objectForKey(const std::string& key);
CCObject* objectForKey(int key);
const CCString* valueForKey(const CCString& key);
const CCString* valueForKey(const std::string& key);
const CCString* valueForKey(int key);
void setObject(CCObject* pObject, const CCString& key);
void setObject(CCObject* pObject, const std::string& key);
void setObject(CCObject* pObject, int key);
void removeObjectForKey(const CCString& key);
void removeObjectForKey(const std::string& key);
void removeObjectForKey(int key);
void removeObjectsForKeys(CCArray* pKeyArray);
void removeObjectForElememt(CCDictElement* pElement);
@ -135,6 +135,9 @@ public:
virtual CCObject* copyWithZone(CCZone* pZone);
/* static functions */
static CCDictionary* dictionary();
static CCDictionary* dictionaryWithDictionary(CCDictionary* srcDict);
/**
@brief Generate a CCDictionary pointer by file
@ -150,7 +153,7 @@ public:
static CCDictionary* dictionaryWithContentsOfFileThreadSafe(const char *pFileName);
private:
void setObjectUnSafe(CCObject* pObject, const CCString& key);
void setObjectUnSafe(CCObject* pObject, const std::string& key);
void setObjectUnSafe(CCObject* pObject, const int key);
public:

4
cocos2dx/platform/CCEGLViewProtocol.cpp
View File

@ -235,7 +235,7 @@ void CCEGLViewProtocol::handleTouchesMove(int num, int ids[], float xs[], float
return;
}
CCLOG("Moving touches with id: %d, x=%f, y=%f", id, x, y);
CCLOGINFO("Moving touches with id: %d, x=%f, y=%f", id, x, y);
CCTouch* pTouch = s_pTouches[pIndex->getValue()];
if (pTouch)
{
@ -285,7 +285,7 @@ void CCEGLViewProtocol::getSetOfTouchesEndOrCancel(CCSet& set, int num, int ids[
CCTouch* pTouch = s_pTouches[pIndex->getValue()];
if (pTouch)
{
CCLOG("Ending touches with id: %d, x=%f, y=%f", id, x, y);
CCLOGINFO("Ending touches with id: %d, x=%f, y=%f", id, x, y);
if (m_bNeedScale)
{

5
cocos2dx/platform/android/CCCommon.cpp
View File

@ -50,4 +50,9 @@ void CCMessageBox(const char * pszMsg, const char * pszTitle)
showMessageBoxJNI(pszMsg, pszTitle);
}
void CCLuaLog(const char * pszFormat)
{
CCLog(pszFormat);
}
NS_CC_END

3
cocos2dx/platform/android/CCEGLView.cpp
View File

@ -30,8 +30,7 @@ THE SOFTWARE.
#include "jni/MessageJni.h"
#include <stdlib.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include "CCGL.h"
#include <EGL/egl.h>
#include <android/log.h>

5
cocos2dx/platform/ios/CCCommon.mm
View File

@ -58,4 +58,9 @@ void CCMessageBox(const char * pszMsg, const char * pszTitle)
[messageBox show];
}
void CCLuaLog(const char * pszFormat)
{
CCLog(pszFormat);
}
NS_CC_END

5
cocos2dx/platform/win32/CCCommon.cpp
View File

@ -51,5 +51,10 @@ void CCMessageBox(const char * pszMsg, const char * pszTitle)
MessageBoxA(NULL, pszMsg, pszTitle, MB_OK);
}
void CCLuaLog(const char * pszFormat)
{
CCLog(pszFormat);
}
NS_CC_END

6
cocos2dx/sprite_nodes/CCSpriteFrameCache.cpp
View File

@ -309,8 +309,8 @@ void CCSpriteFrameCache::removeSpriteFrameByName(const char *pszName)
if (key)
{
m_pSpriteFrames->removeObjectForKey(*key);
m_pSpriteFramesAliases->removeObjectForKey(*key);
m_pSpriteFrames->removeObjectForKey(key->getCString());
m_pSpriteFramesAliases->removeObjectForKey(key->getCString());
}
else
{
@ -372,7 +372,7 @@ CCSpriteFrame* CCSpriteFrameCache::spriteFrameByName(const char *pszName)
CCString *key = (CCString*)m_pSpriteFramesAliases->objectForKey(pszName);
if (key)
{
frame = (CCSpriteFrame*)m_pSpriteFrames->objectForKey(*key);
frame = (CCSpriteFrame*)m_pSpriteFrames->objectForKey(key->getCString());
if (! frame)
{
CCLOG("cocos2d: CCSpriteFrameCahce: Frame '%s' not found", pszName);

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

@ -1 +1 @@
c9ab8cdd41e8b3e0089e5a0eb2ce2477b2eed786
ae3ae184f6137f05f4caa10d92a1d2f99dca3c54

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

@ -185,8 +185,6 @@ class CCAnimate : public CCActionInterval
void setAnimation(CCAnimation *pAnimation);
static CCAction* actionWithAnimation(CCAnimation *pAnimation);
static CCAction* actionWithAnimation(CCAnimation *pAnimation, bool bRestoreOriginalFrame);
static CCAction* actionWithDuration(ccTime duration, CCAnimation *pAnimation, bool bRestoreOriginalFrame);
};
class CCProgressTo : public CCAction

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

@ -1,15 +1,21 @@
class CCActionManager : public CCObject
{
void removeAllActions(void);
void removeAllActionsFromTarget(CCObject *pTarget);
void removeAction(CCAction *pAction);
void removeActionByTag(int tag, CCObject *pTarget);
void addAction(CCAction *pAction, CCNode *pTarget, bool paused);
int numberOfRunningActionsInTarget(CCObject *pTarget);
void removeAllActions(void);
void removeAllActionsFromTarget(CCObject *pTarget);
void removeAction(CCAction *pAction);
void removeActionByTag(unsigned int tag, CCObject *pTarget);
CCAction* getActionByTag(unsigned int tag, CCObject *pTarget);
unsigned int numberOfRunningActionsInTarget(CCObject *pTarget);
void pauseTarget(CCObject *pTarget);
void resumeTarget(CCObject *pTarget);
static CCActionManager* sharedManager(void);
void resumeTarget(CCObject *pTarget);
};

10
tools/tolua++/CCActionProgressTimer.pkg Normal file
View File

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

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

@ -1,11 +1,11 @@
struct CCAffineTransform {
CGFloat a, b, c, d;
CGFloat tx, ty;
CCFloat a, b, c, d;
CCFloat tx, ty;
};
CCAffineTransform __CCAffineTransformMake(CGFloat a, CGFloat b, CGFloat c, CGFloat d, CGFloat tx, CGFloat ty);
CCAffineTransform CCAffineTransformMake(CGFloat a, CGFloat b, CGFloat c, CGFloat d, CGFloat tx, CGFloat ty);
CCAffineTransform __CCAffineTransformMake(CCFloat a, CCFloat b, CCFloat c, CCFloat d, CCFloat tx, CCFloat ty);
CCAffineTransform CCAffineTransformMake(CCFloat a, CCFloat b, CCFloat c, CCFloat d, CCFloat tx, CCFloat ty);
CCPoint __CCPointApplyAffineTransform(CCPoint point, CCAffineTransform t);
CCPoint CCPointApplyAffineTransform(CCPoint point, CCAffineTransform t);
@ -17,8 +17,8 @@ CCAffineTransform CCAffineTransformMakeIdentity();
CCRect CCRectApplyAffineTransform(CCRect rect, CCAffineTransform anAffineTransform);
CCAffineTransform CCAffineTransformTranslate(CCAffineTransform t, float tx, float ty);
CCAffineTransform CCAffineTransformRotate(CCAffineTransform aTransform, CGFloat anAngle);
CCAffineTransform CCAffineTransformScale(CCAffineTransform t, CGFloat sx, CGFloat sy);
CCAffineTransform CCAffineTransformRotate(CCAffineTransform aTransform, CCFloat anAngle);
CCAffineTransform CCAffineTransformScale(CCAffineTransform t, CCFloat sx, CCFloat sy);
CCAffineTransform CCAffineTransformConcat(CCAffineTransform t1,CCAffineTransform t2);
bool CCAffineTransformEqualToTransform(CCAffineTransform t1,CCAffineTransform t2);
CCAffineTransform CCAffineTransformInvert(CCAffineTransform t);

59
tools/tolua++/CCAnimation.pkg
View File

@ -1,20 +1,51 @@
class CCAnimationFrame : public CCObject
{
CCAnimationFrame();
~CCAnimationFrame();
bool initWithSpriteFrame(CCSpriteFrame* spriteFrame, float delayUnits, CCDictionary* userInfo);
CCSpriteFrame* getSpriteFrame();
void setSpriteFrame(CCSpriteFrame* pSpFrame);
float getDelayUnits();
void setDelayUnits(float fDelayUnits);
CCDictionary* getUserInfo();
void setUserInfo(CCDictionary* pDict);
};
class CCAnimation : public CCObject
{
const char* getName(void);
void setName(const char *pszName);
float getDelay(void);
void setDelay(float fDelay);
CCMutableArray<CCSpriteFrame*>* getFrames(void);
void setFrames(CCMutableArray<CCSpriteFrame*> *pFrames);
void addFrame(CCSpriteFrame *pFrame);
void addFrameWithFileName(const char *pszFileName);
void addFrameWithTexture(CCTexture2D* pobTexture, CCRect rect);
CCAnimation();
~CCAnimation(void);
static CCAnimation* animation(void);
static CCAnimation* animationWithFrames(CCMutableArray<CCSpriteFrame*> *frames);
static CCAnimation* animationWithFrames(CCMutableArray<CCSpriteFrame*> *frames, float delay);
static CCAnimation* animationWithSpriteFrames(CCArray* arrayOfSpriteFrameNames);
static CCAnimation* animationWithSpriteFrames(CCArray* arrayOfSpriteFrameNames, float delay);
static CCAnimation* animationWithAnimationFrames(CCArray *arrayOfSpriteFrameNames, float delayPerUnit, unsigned int loops);
void addSpriteFrame(CCSpriteFrame *pFrame);
void addSpriteFrameWithFileName(const char *pszFileName);
void addSpriteFrameWithTexture(CCTexture2D* pobTexture, const CCRect& rect);
float getTotalDelayUnits();
float getDelayPerUnit();
void setDelayPerUnit(float fDelayPerUnits);
float getDuration();
CCArray* getFrames();
void setFrames(CCArray* pFrames);
bool getRestoreOriginalFrame();
void setRestoreOriginalFrame(bool bRestoreFrame);
unsigned int getLoops();
void setLoops(unsigned int uLoops);
};

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

@ -13,5 +13,5 @@ typedef enum LanguageType
class CCApplication
{
static CCApplication& sharedApplication();
static ccLanguageType getCurrentLanguage();
ccLanguageType getCurrentLanguage();
};

89
tools/tolua++/CCArray.pkg
View File

@ -1,34 +1,55 @@
class CCArray : public CCObject
{
unsigned int count();
unsigned int capacity();
unsigned int indexOfObject(CCObject* object);
CCObject* objectAtIndex(unsigned int index);
CCObject* lastObject();
CCObject* randomObject();
bool containsObject(CCObject* object);
void addObject(CCObject* object);
void addObjectsFromArray(CCArray* otherArray);
void insertObject(CCObject* object, unsigned int index);
void removeLastObject();
void removeObject(CCObject* object);
void removeObjectAtIndex(unsigned int index);
void removeObjectsInArray(CCArray* otherArray);
void removeAllObjects();
void fastRemoveObject(CCObject* object);
void fastRemoveObjectAtIndex(unsigned int index);
void exchangeObject(CCObject* object1, CCObject* object2);
void exchangeObjectAtIndex(unsigned int index1, unsigned int index2);
void reverseObjects();
void reduceMemoryFootprint();
static CCArray* array();
static CCArray* arrayWithCapacity(unsigned int capacity);
static CCArray* arrayWithArray(CCArray* otherArray);
};
class CCArray : public CCObject
{
public:
static CCArray* array();
static CCArray* arrayWithObject(CCObject* pObject);
static CCArray* arrayWithCapacity(unsigned int capacity);
static CCArray* arrayWithArray(CCArray* otherArray);
static CCArray* arrayWithContentsOfFile(const char* pFileName);
unsigned int count();
unsigned int capacity();
unsigned int indexOfObject(CCObject* object);
CCObject* objectAtIndex(unsigned int index);
CCObject* lastObject();
CCObject* randomObject();
bool containsObject(CCObject* object);
void addObject(CCObject* object);
void addObjectsFromArray(CCArray* otherArray);
void insertObject(CCObject* object, unsigned int index);
void removeLastObject(bool bReleaseObj = true);
void removeObject(CCObject* object, bool bReleaseObj = true);
void removeObjectAtIndex(unsigned int index, bool bReleaseObj = true);
void removeObjectsInArray(CCArray* otherArray);
void removeAllObjects();
void fastRemoveObject(CCObject* object);
void fastRemoveObjectAtIndex(unsigned int index);
void exchangeObject(CCObject* object1, CCObject* object2);
void exchangeObjectAtIndex(unsigned int index1, unsigned int index2);
void reverseObjects();
void reduceMemoryFootprint();
void replaceObjectAtIndex(unsigned int uIndex, CCObject* pObject, bool bReleaseObject = true);
};

26
tools/tolua++/CCDictionary.pkg Normal file
View File

@ -0,0 +1,26 @@
class CCDictionary : public CCObject
{
unsigned int count();
CCArray* allKeys();
CCArray* allKeysForObject(CCObject* object);
CCObject* objectForKey(const std::string& key);
CCObject* objectForKey(int key);
const CCString* valueForKey(const std::string& key);
const CCString* valueForKey(int key);
void setObject(CCObject* pObject, const std::string& key);
void setObject(CCObject* pObject, int key);
void removeObjectForKey(const std::string& key);
void removeObjectForKey(int key);
void removeObjectsForKeys(CCArray* pKeyArray);
void removeAllObjects();
static CCDictionary* dictionary();
static CCDictionary* dictionaryWithDictionary(CCDictionary* srcDict);
static CCDictionary* dictionaryWithContentsOfFile(const char *pFileName);
};

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

@ -24,5 +24,11 @@ class CCDirector : public CCObject
CCFloat getContentScaleFactor(void);
CCScheduler* getScheduler();
CCActionManager* getActionManager();
CCTouchDispatcher* getTouchDispatcher();
CCKeypadDispatcher* getKeypadDispatcher();
CCAccelerometer* getAccelerometer();
static CCDirector* sharedDirector(void);
};

28
tools/tolua++/CCMotionStreak.pkg
View File

@ -1,11 +1,23 @@
class CCMotionStreak : public CCNode
{
CCRibbon* getRibbon(void);
void setTexture(CCTexture2D* var);
CCTexture2D* getTexture(void);
void setBlendFunc(ccBlendFunc var);
ccBlendFunc getBlendFunc(void);
static CCMotionStreak* streakWithFade(float fade, float minSeg, float stroke, ccColor3B color, const char* path);
static CCMotionStreak* streakWithFade(float fade, float minSeg, float stroke, ccColor3B color, CCTexture2D* texture);
static CCMotionStreak * streakWithFade(float fade, float seg, const char *imagePath, float width, float length, ccColor4B color);
};
void tintWithColor(ccColor3B colors);
void reset();
void setPosition(CCPoint& position);
CCTexture2D* getTexture(void);
void setTexture(CCTexture2D *texture);
void setBlendFunc(ccBlendFunc blendFunc);
ccBlendFunc getBlendFunc(void);
void setColor(const ccColor3B& color);
const ccColor3B& getColor(void);
GLubyte getOpacity(void);
void setOpacity(GLubyte opacity);
void setIsOpacityModifyRGB(bool bValue);
bool getIsOpacityModifyRGB(void);
bool getIsFastMode();
void setIsFastMode(bool mode);
};

39
tools/tolua++/CCMutableArray.pkg
View File

@ -1,39 +0,0 @@
class CCMutableArray : public CCObject
{
TOLUA_TEMPLATE_BIND(T, CCObject*, CCSpriteFrame*, CCFiniteTimeAction*)
CCMutableArray(unsigned int uSize = 0);
unsigned int count(void);
bool containsObject(T pObject);
T getLastObject(void);
T getObjectAtIndex(unsigned int uIndex);
void addObject(T pObject);
void addObjectsFromArray(CCMutableArray<T> *pArray);
void insertObjectAtIndex(T pObject, unsigned int uIndex);
void removeLastObject(bool bDeleteObject = true);
void removeObject(T pObject, bool bDeleteObject = true);
void removeObjectsInArray(CCMutableArray<T>* pDeleteArray);
void removeObjectAtIndex(unsigned int uIndex, bool bDeleteObject = true);
void removeAllObjects(bool bDeleteObject = true);
void replaceObjectAtIndex(unsigned int uIndex, T pObject, bool bDeleteObject = true);
std::vector<T>::iterator begin(void);
std::vector<T>::reverse_iterator rbegin(void);
std::vector<T>::iterator endToLua(void);
std::vector<T>::reverse_iterator rend(void);
CCMutableArray<T>* copy(void);
static CCMutableArray<T>* arrayWithArray(CCMutableArray<T> *pArray);
};

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

@ -1,26 +0,0 @@
class CCMutableDictionary : public CCObject
{
TOLUA_TEMPLATE_BIND(K V, std::string CCObject*)
unsigned int count();
std::vector<std::string> allKeys();
std::vector<std::string> allKeysForObject(V object);
V objectForKey(K key);
bool setObject(V pObject, K key);
void removeObjectForKey(K key);
bool begin();
void endToLua();
V next(K* key = NULL);
void endToLua();
void removeAllObjects();
static CCMutableDictionary<K, V>* dictionaryWithDictionary(CCMutableDictionary<K, V>* srcDict);
};
typedef CCMutableDictionary<std::string, CCString*> CCStringToStringDictionary;

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

@ -53,6 +53,3 @@ class CCParticleSystemQuad : public CCParticleSystem {
static CCParticleSystemQuad * particleWithFile(const char *plistFile);
};
class CCParticleSystemPoint : public CCParticleSystem {
static CCParticleSystemPoint * particleWithFile(const char *plistFile);
};

65
tools/tolua++/CCProgressTimer.pkg
View File

@ -1,29 +1,36 @@
typedef enum {
/// Radial Counter-Clockwise
kCCProgressTimerTypeRadialCCW,
/// Radial ClockWise
kCCProgressTimerTypeRadialCW,
/// Horizontal Left-Right
kCCProgressTimerTypeHorizontalBarLR,
/// Horizontal Right-Left
kCCProgressTimerTypeHorizontalBarRL,
/// Vertical Bottom-top
kCCProgressTimerTypeVerticalBarBT,
/// Vertical Top-Bottom
kCCProgressTimerTypeVerticalBarTB,
} CCProgressTimerType;
class CCProgressTimer : public CCNode
{
CCProgressTimerType getType(void);
float getPercentage(void);
CCSprite* getSprite(void);
void setPercentage(float fPercentage);
void setSprite(CCSprite *pSprite);
void setType(CCProgressTimerType type);
static CCProgressTimer* progressWithFile(const char *pszFileName);
static CCProgressTimer* progressWithTexture(CCTexture2D *pTexture);
};
typedef enum {
kCCProgressTimerTypeRadial,
kCCProgressTimerTypeBar,
} CCProgressTimerType;
class CCProgressTimer : public CCNode
{
CCProgressTimerType getType(void);
float getPercentage(void);
CCSprite* getSprite(void) { return m_pSprite; }
void setPercentage(float fPercentage);
void setSprite(CCSprite *pSprite);
void setType(CCProgressTimerType type);
void setReverseProgress(bool reverse);
void setAnchorPoint(CCPoint anchorPoint);
void setColor(const ccColor3B& color);
const ccColor3B& getColor(void);
GLubyte getOpacity(void);
void setOpacity(GLubyte opacity);
void setIsOpacityModifyRGB(bool bValue);
bool getIsOpacityModifyRGB(void);
static CCProgressTimer* progressWithSprite(CCSprite* sp);
CCPoint getMidpoint();
void setMidpoint(CCPoint pt);
CCPoint getBarChangeRate();
void setBarChangeRate(CCPoint rate);
bool getIsReverseDirection();
void setIsReverseDirection(bool bReverseDir);
};

10
tools/tolua++/CCRenderTexture.pkg
View File

@ -1,9 +1,8 @@
typedef enum eImageFormat
{
kCCImageFormatJPG = 0,
kCCImageFormatJPEG = 0,
kCCImageFormatPNG = 1,
kCCImageFormatRawData = 2
} tImageFormat;
class CCRenderTexture : public CCNode
@ -16,8 +15,11 @@ class CCRenderTexture : public CCNode
void beginWithClear(float r, float g, float b, float a);
void clear(float r, float g, float b, float a);
bool saveBuffer(const char *name);
bool saveBuffer(const char *name, int format);
CCImage* newCCImage();
bool saveToFile(const char *szFilePath);
bool saveToFile(const char *name, tCCImageFormat format);
static CCRenderTexture * renderTextureWithWidthAndHeight(int w, int h, CCTexture2DPixelFormat eFormat);
static CCRenderTexture * renderTextureWithWidthAndHeight(int w, int h);

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

@ -25,5 +25,4 @@ class CCScheduler : public CCObject
void resumeTarget(CCObject *pTarget);
bool isTargetPaused(CCObject *pTarget);
static CCScheduler* sharedScheduler(void);
};

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

@ -22,6 +22,4 @@ class CCSpriteBatchNode : public CCNode
static CCSpriteBatchNode* batchNodeWithTexture(CCTexture2D *tex);
static CCSpriteBatchNode* batchNodeWithTexture(CCTexture2D* tex, unsigned int capacity);
static CCSpriteBatchNode* batchNodeWithFile(const char* fileImage);
static CCSpriteBatchNode* batchNodeWithFile(const char* fileImage, unsigned int capacity);
};

30
tools/tolua++/CCString.pkg
View File

@ -1,12 +1,18 @@
class CCString : public CCObject
{
CCString();
CCString(const char * str);
~CCString();
int toInt();
unsigned int toUInt();
float toFloat();
bool isEmpty();
};
class CCString : public CCObject
{
int intValue() const;
unsigned int uintValue() const;
float floatValue() const;
double doubleValue() const;
bool boolValue() const;
const char* getCString() const;
unsigned int length() const;
bool isEqual(const CCObject* pObject);
static CCString* stringWithCString(const char* pStr);
static CCString* stringWithData(unsigned char* pData, unsigned long nLen);
static CCString* stringWithContentsOfFile(const char* pszFileName);
};

6
tools/tolua++/CCTMXLayer.pkg
View File

@ -16,14 +16,16 @@ class CCTMXLayer : public CCSpriteBatchNode
void setLayerOrientation(unsigned int val);
unsigned int getLayerOrientation();
void setProperties(CCStringToStringDictionary* pval);
CCStringToStringDictionary* getProperties();
void setProperties(CCDictionary* pval);
CCDictionary* getProperties();
void releaseMap();
CCSprite* tileAt(CCPoint tileCoordinate);
unsigned int tileGIDAt(CCPoint tileCoordinate);
unsigned int tileGIDAt(CCPoint tileCoordinate, ccTMXTileFlags* flags);
void setTileGID(unsigned int gid, CCPoint tileCoordinate);
void setTileGID(unsigned int gid, CCPoint tileCoordinate, ccTMXTileFlags flags);
void removeTileAt(CCPoint tileCoordinate);
CCPoint positionAt(CCPoint tileCoordinate);
CCString *propertyNamed(const char *propertyName);

10
tools/tolua++/CCTMXObjectGroup.pkg
View File

@ -4,16 +4,16 @@ class CCTMXObjectGroup : public CCObject
void setPositionOffset(CCPoint pt);
CCPoint getPositionOffset();
void setProperties(CCStringToStringDictionary* pval);
CCStringToStringDictionary* getProperties();
void setProperties(CCDictionary* pval);
CCDictionary* getProperties();
void setObjects(CCMutableArray<CCStringToStringDictionary*>* val);
CCMutableArray<CCStringToStringDictionary*>* getObjects();
void setObjects(CCArray* val);
CCArray* getObjects();
void setGroupName(const char *groupName);
const char* getGroupName();
CCString *propertyNamed(const char* propertyName);
CCStringToStringDictionary* objectNamed(const char *objectName);
CCDictionary* objectNamed(const char *objectName);
};

10
tools/tolua++/CCTMXTiledMap.pkg
View File

@ -20,16 +20,16 @@ class CCTMXTiledMap : public CCNode
void setMapOrientation(int val);
int getMapOrientation();
void setObjectGroups(CCMutableArray<CCTMXObjectGroup*>* pval);
CCMutableArray<CCTMXObjectGroup*>* getObjectGroups();
void setObjectGroups(CCArray* pval);
CCArray* getObjectGroups();
void setProperties(CCStringToStringDictionary* pval);
CCStringToStringDictionary* getProperties();
void setProperties(CCDictionary* pval);
CCDictionary* getProperties();
CCTMXLayer* layerNamed(const char *layerName);
CCTMXObjectGroup* objectGroupNamed(const char *groupName);
CCString *propertyNamed(const char *propertyName);
CCDictionary<std::string, CCString*> *propertiesForGID(int GID);
CCDictionary *propertiesForGID(int GID);
static CCTMXTiledMap * tiledMapWithTMXFile(const char *tmxFile);
};

24
tools/tolua++/CCTMXXMLParser.pkg
View File

@ -17,8 +17,8 @@ enum {
class CCTMXLayerInfo : public CCObject
{
CCStringToStringDictionary* getProperties();
void setProperties(CCStringToStringDictionary* pval);
CCDictionary* getProperties();
void setProperties(CCDictionary* pval);
};
class CCTMXTilesetInfo : public CCObject
@ -34,12 +34,12 @@ class CCTMXMapInfo : public CCObject
CCSize getMapSize();
void setTileSize(CCSize sz);
CCSize getTileSize();
void setLayers(CCMutableArray<CCTMXLayerInfo*>* pval);
CCMutableArray<CCTMXLayerInfo*>* getLayers();
void setTilesets(CCMutableArray<CCTMXTilesetInfo*>* pval);
CCMutableArray<CCTMXTilesetInfo*>* getTilesets();
void setObjectGroups(CCMutableArray<CCTMXObjectGroup*>* val);
CCMutableArray<CCTMXObjectGroup*>* getObjectGroups();
void setLayers(CCArray* pval);
CCArray* getLayers();
void setTilesets(CCArray* pval);
CCArray* getTilesets();
void setObjectGroups(CCArray* val);
CCArray* getObjectGroups();
void setParentElement(int val);
int getParentElement();
void setParentGID(unsigned int val);
@ -48,10 +48,10 @@ class CCTMXMapInfo : public CCObject
int getLayerAttribs();
void setStoringCharacters(bool val);
bool getStoringCharacters();
void setProperties(CCStringToStringDictionary* pval);
CCStringToStringDictionary* getProperties();
void setTileProperties(CCDictionary<int, CCStringToStringDictionary*> * tileProperties);
CCDictionary<int, CCStringToStringDictionary*> * getTileProperties();
void setProperties(CCDictionary* pval);
CCDictionary* getProperties();
void setTileProperties(CCDictionary* tileProperties);
CCDictionary* getTileProperties();
void setCurrentString(const char *currentString);
const char* getCurrentString();
void setTMXFileName(const char *fileName);

6
tools/tolua++/CCTouch.pkg
View File

@ -8,9 +8,9 @@ enum {
class CCTouch : public CCObject
{
CCPoint locationInView(int nViewId);
CCPoint previousLocationInView(int nViewId);
int view();
CCPoint locationInView();
CCPoint previousLocationInView();
int getID();
};
class CCEvent : public CCObject

49
tools/tolua++/Cocos2d.pkg
View File

@ -1,17 +1,18 @@
$#include "LuaCocos2d.h"
//$pfile "CCAction.pkg"
//$pfile "CCActionCamera.pkg"
//$pfile "CCActionEase.pkg"
//$pfile "CCActionGrid.pkg"
//$pfile "CCActionGrid3D.pkg"
//$pfile "CCActionManager.pkg"
//$pfile "CCActionPageTurn3D.pkg"
//$pfile "CCActionTiledGrid.pkg"
//$pfile "CCAffineTransform.pkg"
//$pfile "CCAnimation.pkg"
//$pfile "CCAnimationCache.pkg"
$pfile "CCAction.pkg"
$pfile "CCActionCamera.pkg"
$pfile "CCActionEase.pkg"
$pfile "CCActionGrid.pkg"
$pfile "CCActionGrid3D.pkg"
$pfile "CCActionManager.pkg"
$pfile "CCActionPageTurn3D.pkg"
$pfile "CCActionProgressTimer.pkg"
$pfile "CCActionTiledGrid.pkg"
$pfile "CCAffineTransform.pkg"
$pfile "CCAnimation.pkg"
$pfile "CCAnimationCache.pkg"
$pfile "CCApplication.pkg"
$pfile "CCArray.pkg"
$pfile "CCAtlasNode.pkg"
@ -27,21 +28,19 @@ $pfile "CCLabelTTF.pkg"
$pfile "CCLayer.pkg"
$pfile "CCMenu.pkg"
$pfile "CCMenuItem.pkg"
//$pfile "CCMotionStreak.pkg"
//$pfile "CCMutableArray.pkg"
//$pfile "CCMutableDictionary.pkg"
$pfile "CCMotionStreak.pkg"
$pfile "CCDictionary.pkg"
$pfile "CCNode.pkg"
$pfile "CCObject.pkg"
$pfile "CCParallaxNode.pkg"
//$pfile "CCParticleSystem.pkg"
$pfile "CCParticleSystem.pkg"
$pfile "CCPointExtension.pkg"
//$pfile "CCProgressTimer.pkg"
//$pfile "CCRenderTexture.pkg"
//$pfile "CCRibbon.pkg"
$pfile "CCProgressTimer.pkg"
$pfile "CCRenderTexture.pkg"
$pfile "CCScene.pkg"
//$pfile "CCScheduler.pkg"
$pfile "CCScheduler.pkg"
$pfile "CCSprite.pkg"
//$pfile "CCSpriteBatchNode.pkg"
$pfile "CCSpriteBatchNode.pkg"
$pfile "CCSpriteFrame.pkg"
$pfile "CCSpriteFrameCache.pkg"
$pfile "CCString.pkg"
@ -50,11 +49,11 @@ $pfile "CCTexture2D.pkg"
$pfile "CCTextureAtlas.pkg"
$pfile "CCTextureCache.pkg"
$pfile "CCTileMapAtlas.pkg"
//$pfile "CCTMXLayer.pkg"
//$pfile "CCTMXObjectGroup.pkg"
//$pfile "CCTMXTiledMap.pkg"
//$pfile "CCTMXXMLParser.pkg"
//$pfile "CCTouch.pkg"
$pfile "CCTMXLayer.pkg"
$pfile "CCTMXObjectGroup.pkg"
$pfile "CCTMXTiledMap.pkg"
$pfile "CCTMXXMLParser.pkg"
$pfile "CCTouch.pkg"
$pfile "CCTransition.pkg"
$pfile "ccTypes.pkg"
$pfile "CCUserDefault.pkg"

3
tools/tolua++/basic.lua
View File

@ -85,8 +85,7 @@ local CCObjectTypes = {
"CCTiledGrid3D",
"CCKeypadDispatcher",
"CCKeypadHandler",
"CCMutableArray",
"CCMutableDictionary",
"CCDictionary",
"CCNode",
"CCAtlasNode",
"CCLabelAtlas",