Skip to content

Commit 434f576

Browse files
waiterwaiter
committed
Merge pull request cocos2d#4 from cocos2d/master
update cocos2d/cocos2d-x
2 parents 2fc3465 + 751a66f commit 434f576

File tree

99 files changed

+5405
-1232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+5405
-1232
lines changed

‎cocos2dx/CCDirector.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,10 @@ void CCDirector::calculateDeltaTime(void)
294294

295295
*m_pLastUpdate = now;
296296
}
297-
297+
float CCDirector::getDeltaTime()
298+
{
299+
return m_fDeltaTime;
300+
}
298301
void CCDirector::setOpenGLView(CCEGLView *pobOpenGLView)
299302
{
300303
CCAssert(pobOpenGLView, "opengl view should not be null");

‎cocos2dx/CCDirector.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ class CC_DLL CCDirector : public CCObject, public TypeInfo
326326
*/
327327
CC_PROPERTY(CCAccelerometer*, m_pAccelerometer, Accelerometer);
328328

329+
/* delta time since last tick to main loop */
330+
CC_PROPERTY_READONLY(float, m_fDeltaTime, DeltaTime);
331+
329332
/** returns a shared instance of the director */
330333
static CCDirector* sharedDirector(void);
331334

@@ -385,9 +388,6 @@ class CC_DLL CCDirector : public CCObject, public TypeInfo
385388
/* last time the main loop was updated */
386389
struct cc_timeval *m_pLastUpdate;
387390

388-
/* delta time since last tick to main loop */
389-
float m_fDeltaTime;
390-
391391
/* whether or not the next delta time will be zero */
392392
bool m_bNextDeltaTimeZero;
393393

‎cocos2dx/cocoa/CCDictionary.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ void CCDictionary::removeAllObjects()
329329
HASH_DEL(m_pElements, pElement);
330330
pElement->m_pObject->release();
331331
CC_SAFE_DELETE(pElement);
332+
332333
}
333334
}
334335

‎cocos2dx/proj.linux/cocos2dx.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ endif
4141
ifeq ($(DEBUG), 1)
4242
CCFLAGS += -g3 -O0
4343
CXXFLAGS += -g3 -O0
44-
DEFINES += -DDEBUG -DCOCOS2D_DEBUG=1
44+
DEFINES += -D_DEBUG -DCOCOS2D_DEBUG=1
4545
OBJ_DIR := $(OBJ_DIR)/debug
4646
LIB_DIR := $(LIB_DIR)/debug
4747
BIN_DIR := $(BIN_DIR)/debug

‎cocos2dx/proj.nacl/cocos2dx.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ CXXFLAGS += -g3 -O0
5050
LIB_DIR := $(LIB_DIR)/Debug
5151
OBJ_DIR := $(OBJ_DIR)/Debug
5252
MULTILIB_SUFFIX := $(ARCH_DIR)/Debug
53-
DEFINES += -DDEBUG -DCOCOS2D_DEBUG=1
53+
DEFINES += -D_DEBUG -DCOCOS2D_DEBUG=1
5454
else
5555
BIN_DIR = bin/release
5656
CCFLAGS += -O3

‎external/Box2D/proj.linux/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ CXXFLAGS += -Wno-unused-but-set-variable
5555
CXXFLAGS += -Wno-uninitialized
5656

5757
ifeq ($(DEBUG), 1)
58-
DEFINES = -DDEBUG
58+
DEFINES = -D_DEBUG
59+
else
60+
DEFINES =
5961
endif
6062

6163
TARGET := $(LIB_DIR)/$(TARGET)

‎external/Box2D/proj.nacl/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ else
5959
CXXFLAGS += -Wno-uninitialized
6060
endif
6161

62+
ifeq ($(DEBUG), 1)
63+
DEFINES = -D_DEBUG
64+
else
65+
DEFINES =
66+
endif
67+
6268
TARGET = $(LIB_DIR)/libbox2d.a
6369

6470
all: $(TARGET)

‎samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "cocos2d.h"
99
#include "SimpleAudioEngine.h"
1010
#include "ScriptingCore.h"
11-
#include "generated/cocos2dx.hpp"
11+
#include "generated/jsb_cocos2dx_auto.hpp"
1212
#include "cocos2d_specifics.hpp"
1313
#include "js_bindings_chipmunk_registration.h"
1414
#include "js_bindings_system_registration.h"

‎samples/Cpp/AssetsManagerTest/proj.android/.cproject‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?fileVersion 4.0.0?>
3+
4+
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
5+
<storageModule moduleId="org.eclipse.cdt.core.settings">
6+
<cconfiguration id="0.756827735">
7+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.756827735" moduleId="org.eclipse.cdt.core.settings" name="Default">
8+
<externalSettings/>
9+
<extensions>
10+
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
11+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
12+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
13+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
14+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
15+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
16+
</extensions>
17+
</storageModule>
18+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
19+
<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator" id="0.756827735" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
20+
<folderInfo id="0.756827735." name="/" resourcePath="">
21+
<toolChain errorParsers="" id="org.eclipse.cdt.build.core.prefbase.toolchain.294545719" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
22+
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.294545719.993860072" name=""/>
23+
<builder arguments="${ProjDirPath}/build_native.sh" buildPath="${ProjDirPath}" command="bash" enabledIncrementalBuild="true" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.build.core.settings.default.builder.1648661634" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" stopOnErr="true" superClass="org.eclipse.cdt.build.core.settings.default.builder">
24+
<outputEntries>
25+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
26+
</outputEntries>
27+
</builder>
28+
<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.libs.1844369373" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs">
29+
<option id="org.eclipse.cdt.build.core.settings.holder.libfiles.628519629" name="Library Files" superClass="org.eclipse.cdt.build.core.settings.holder.libfiles" valueType="libFiles">
30+
<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="../libcocos2dx.a"/>
31+
</option>
32+
<option id="org.eclipse.cdt.build.core.settings.holder.libpaths.1705781501" name="Library Paths" superClass="org.eclipse.cdt.build.core.settings.holder.libpaths" valueType="libPaths">
33+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a"/>
34+
</option>
35+
</tool>
36+
<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.991472034" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
37+
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1413805376" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
38+
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
39+
<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
40+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
41+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
42+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include"/>
43+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/system/include"/>
44+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include"/>
45+
<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
46+
</option>
47+
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
48+
<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
49+
</option>
50+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1052916547" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
51+
</tool>
52+
<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.2035290044" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
53+
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.898748423" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
54+
<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
55+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
56+
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
57+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
58+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include"/>
59+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include"/>
60+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/stlport/stlport"/>
61+
<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
62+
</option>
63+
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
64+
<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
65+
</option>
66+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.944632859" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
67+
</tool>
68+
<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.731367497" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
69+
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1548475709" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
70+
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
71+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
72+
<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
73+
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
74+
<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/stlport/stlport"/>
75+
<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
76+
</option>
77+
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
78+
<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
79+
</option>
80+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1615206779" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
81+
</tool>
82+
</toolChain>
83+
</folderInfo>
84+
<sourceEntries>
85+
<entry excluding="cocos2dx|extensions|Classes" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
86+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="cocos2dx"/>
87+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="extensions"/>
88+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Classes"/>
89+
90+
</sourceEntries>
91+
</configuration>
92+
</storageModule>
93+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
94+
</cconfiguration>
95+
</storageModule>
96+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
97+
<project id="MyProject.null.190811507" name="MyProject"/>
98+
</storageModule>
99+
<storageModule moduleId="scannerConfiguration">
100+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
101+
<scannerConfigBuildInfo instanceId="0.756827735">
102+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
103+
</scannerConfigBuildInfo>
104+
</storageModule>
105+
<storageModule moduleId="refreshScope" versionNumber="2">
106+
<configuration configurationName="Default">
107+
<resource resourceType="PROJECT" workspacePath="/AssetsManagerTest"/>
108+
</configuration>
109+
</storageModule>
110+
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
111+
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
112+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
113+
</cproject>

‎samples/Cpp/AssetsManagerTest/proj.android/.externalToolBuilders/Javah_jni_builder.launch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
3+
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MyProject/jni&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
4+
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
5+
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
6+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/javah"/>
7+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
8+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-verbose&#10;-d jni&#10;-classpath ${project_loc}/bin/classes&#10;com.myproject.MyActivity"/>
9+
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
10+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
11+
</launchConfiguration>

0 commit comments

Comments
 (0)