draw logic add

BetaS · Dec 10, 2013 · 1352621 · 1352621
1 parent d41c719
commit 1352621
Show file tree

Hide file tree

Showing 23 changed files with 201 additions and 122 deletions.
diff --git a/CocosDenshion/proj.tizen/.project b/CocosDenshion/proj.tizen/.project
@@ -87,6 +87,11 @@
 		<nature>org.tizen.nativecpp.apichecker.core.tizenCppNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>src/Export.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/include/Export.h</locationURI>
+		</link>
 		<link>
 			<name>src/OspPlayer.cpp</name>
 			<type>1</type>
@@ -102,5 +107,10 @@
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/tizen/SimpleAudioEngine.cpp</locationURI>
 		</link>
+		<link>
+			<name>src/SimpleAudioEngine.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/include/SimpleAudioEngine.h</locationURI>
+		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/cocos2dx/CCScheduler.cpp b/cocos2dx/CCScheduler.cpp
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2010-2012 cocos2d-x.org
 Copyright (c) 2008-2010 Ricardo Quesada
 Copyright (c) 2011      Zynga Inc.

diff --git a/cocos2dx/proj.tizen/.project b/cocos2dx/proj.tizen/.project
@@ -1132,6 +1132,16 @@
 			<type>1</type>
 			<locationURI>PARENT-1-PROJECT_LOC/support/CCNotificationCenter.h</locationURI>
 		</link>
+		<link>
+			<name>src/support/CCNotificationHandler.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/support/CCNotificationHandler.cpp</locationURI>
+		</link>
+		<link>
+			<name>src/support/CCNotificationHandler.h</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/support/CCNotificationHandler.h</locationURI>
+		</link>
 		<link>
 			<name>src/support/CCPointExtension.cpp</name>
 			<type>1</type>

diff --git a/cocos2dx/support/CCNotificationHandler.cpp b/cocos2dx/support/CCNotificationHandler.cpp
@@ -10,9 +10,8 @@ void CCNotificationHandler::postNotificationOnMainThread(const char *name, CCObj
 	CCObject *target = new CCNotificationHandler(name, object);
 	target->retain();
 	target->autorelease();
-	SEL_SCHEDULE selector = schedule_selector(CCNotificationHandler::postNotification);
 
-	CCDirector::sharedDirector()->getScheduler()->scheduleSelector(selector, target, 0, 0, 0, false);
+	CCDirector::sharedDirector()->getScheduler()->scheduleSelector(schedule_selector(CCNotificationHandler::postNotification), target, 0, 0, 0, false);
 }
 
 CCNotificationHandler::~CCNotificationHandler()
@@ -27,9 +26,9 @@ CCNotificationHandler::CCNotificationHandler(const char *name, CCObject *object)
 	if (_object) _object->retain();
 }
 
-void CCNotificationHandler::postNotification()
+void CCNotificationHandler::postNotification(float dt)
 {
 	CCNotificationCenter::sharedNotificationCenter()->postNotification(_name.c_str(), _object);
-	this->release();
+//	this->autorelease();
 	// CCTimer will unschedule this selector later, and 'this' will be autoreleased by main loop
 }
diff --git a/cocos2dx/support/CCNotificationHandler.h b/cocos2dx/support/CCNotificationHandler.h
@@ -22,7 +22,7 @@ class CC_DLL CCNotificationHandler : public CCObject {
 
 	~CCNotificationHandler();
 	CCNotificationHandler(const char *name, CCObject *object);
-	void postNotification();
+	void postNotification(float dt);
 
 };
 

diff --git a/extensions/CCBReader/CCBAnimationManager.cpp b/extensions/CCBReader/CCBAnimationManager.cpp
@@ -997,7 +997,7 @@ CCObject* CCBSoundEffect::copyWithZone(CCZone *pZone)
 
 void CCBSoundEffect::update(float time)
 {
-    CocosDenshion::SimpleAudioEngine::sharedEngine()->playEffect(mSoundFile.c_str());
+    //CocosDenshion::SimpleAudioEngine::sharedEngine()->playEffect(mSoundFile.c_str());
 }
 
 

diff --git a/extensions/proj.tizen/.cproject b/extensions/proj.tizen/.cproject
@@ -169,7 +169,7 @@
 					<folderInfo id="org.tizen.nativecpp.config.sbi.gcc45.lib.debug.device.1240851129." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecpp.toolchain.sbi.gcc45.lib.debug.device.1011815399" name="Tizen Native Toolchain" superClass="org.tizen.nativecpp.toolchain.sbi.gcc45.lib.debug.device">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.205106495" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
-							<builder buildPath="${workspace_loc:/extensions/Debug-Tizen-Device}" id="org.tizen.nativecpp.target.sbi.gnu.builder.391616426" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecpp.target.sbi.gnu.builder"/>
+							<builder arguments="--eval=&quot;SHELL=cmd&quot; -r" buildPath="${workspace_loc:/extensions/Debug-Tizen-Device}" id="org.tizen.nativecpp.target.sbi.gnu.builder.391616426" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecpp.target.sbi.gnu.builder"/>
 							<tool command="arm-linux-gnueabi-ar.exe" id="org.tizen.nativecpp.tool.sbi.gnu.archiver.1946190238" name="Archiver" superClass="org.tizen.nativecpp.tool.sbi.gnu.archiver"/>
 							<tool command="clang++.exe" id="org.tizen.nativecpp.tool.sbi.gnu.cpp.compiler.806237946" name="C++ Compiler" superClass="org.tizen.nativecpp.tool.sbi.gnu.cpp.compiler">
 								<option id="gnu.cpp.compiler.option.optimization.level.1141078136" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
@@ -222,16 +222,15 @@
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1641648644" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
-								</option>
-								<option id="sbi.gnu.c.compiler.option.frameworks.cpp.356824867" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.cpp" valueType="userObjs">
-									<listOptionValue builtIn="false" value="osp-static"/>
-								</option>
-								<option id="sbi.gnu.c.compiler.option.frameworks_inc.cpp.843251170" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.cpp" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;D:\tizen-sdk\library&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/osp&quot;"/>
 								</option>
+								<option id="sbi.gnu.c.compiler.option.frameworks.cpp.356824867" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.cpp" valueType="userObjs">
+									<listOptionValue builtIn="false" value="osp-static"/>
+								</option>
+								<option id="sbi.gnu.c.compiler.option.frameworks_inc.cpp.843251170" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.cpp" valueType="includePath"/>
 								<option id="sbi.gnu.c.compiler.option.frameworks_cflags.cpp.2073478823" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.cpp" valueType="stringList">
 									<listOptionValue builtIn="false" value="-target arm-tizen-linux-gnueabi -gcc-toolchain D:/tizen-sdk/tools/smart-build-interface/../arm-linux-gnueabi-gcc-4.5/ -ccc-gcc-name arm-linux-gnueabi-g++ -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mtune=cortex-a8 -Wno-gnu"/>
 									<listOptionValue builtIn="false" value=" -fPIC"/>
@@ -379,13 +378,13 @@
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="org.tizen.nativecpp.config.sbi.gcc45.lib.debug.emulator.1855378280">
+		<scannerConfigBuildInfo instanceId="org.tizen.nativecpp.config.sbi.gcc45.lib.debug.device.1240851129">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.tizen.nativecommon.TizenGCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="org.tizen.nativecpp.config.sbi.gcc45.lib.release.2023052084">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.tizen.nativecommon.TizenGCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="org.tizen.nativecpp.config.sbi.gcc45.lib.debug.device.1240851129">
+		<scannerConfigBuildInfo instanceId="org.tizen.nativecpp.config.sbi.gcc45.lib.debug.emulator.1855378280">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.tizen.nativecommon.TizenGCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 	</storageModule>

diff --git a/extensions/proj.tizen/.project b/extensions/proj.tizen/.project
@@ -97,11 +97,6 @@
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/CCBReader</locationURI>
 		</link>
-		<link>
-			<name>src/CocoStudio</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/CocoStudio</locationURI>
-		</link>
 		<link>
 			<name>src/ExtensionMacros.h</name>
 			<type>1</type>
-Original file line number
+Diff line change
@@ Expand Up / @@ -997,7 +997,7 @@ CCObject* CCBSoundEffect::copyWithZone(CCZone *pZone) @@
     void CCBSoundEffect::update(float time)
     {
-        CocosDenshion::SimpleAudioEngine::sharedEngine()->playEffect(mSoundFile.c_str());
+        //CocosDenshion::SimpleAudioEngine::sharedEngine()->playEffect(mSoundFile.c_str());
     }
@@ Expand Down @@