From 91f8ed7eb42f803569887a4c1f8173789985e119 Mon Sep 17 00:00:00 2001 From: laschweinski Date: Mon, 5 Sep 2011 11:57:10 +0800 Subject: [PATCH] CCParticleSystemPoint now derive from CCParticleSystemQuade in linux --- cocos2dx/include/CCParticleSystemPoint.h | 15 ++++++++++++--- tests/test.linux/.cproject | 4 ++-- tests/tests/controller.cpp | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/cocos2dx/include/CCParticleSystemPoint.h b/cocos2dx/include/CCParticleSystemPoint.h index a635547775..1dcaa67762 100755 --- a/cocos2dx/include/CCParticleSystemPoint.h +++ b/cocos2dx/include/CCParticleSystemPoint.h @@ -27,7 +27,10 @@ THE SOFTWARE. #define __CC_PARTICLE_SYSTEM_POINT_MOBILE_H__ /*#include "Availability.h"*/ -#include "CCParticleSystem.h" +#include "CCParticleSystem.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) +#include "CCParticleSystemQuad.h" +#endif namespace cocos2d { @@ -44,7 +47,12 @@ Features: Limitations: * On 3rd gen iPhone devices and iPads, this node performs MUCH slower than CCParticleSystemQuad. -*/ +*/ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) +class CC_DLL CCParticleSystemPoint : public CCParticleSystemQuad{ + //nothing to do +}; +#else class CC_DLL CCParticleSystemPoint : public CCParticleSystem { public: @@ -76,7 +84,8 @@ protected: # if CC_USES_VBO GLuint m_uVerticesID; #endif -}; +}; +#endif }// namespace cocos2d diff --git a/tests/test.linux/.cproject b/tests/test.linux/.cproject index 2f3ed751e4..8c1c262115 100644 --- a/tests/test.linux/.cproject +++ b/tests/test.linux/.cproject @@ -85,7 +85,7 @@ - + @@ -173,7 +173,7 @@ - + diff --git a/tests/tests/controller.cpp b/tests/tests/controller.cpp index db3a831da3..eac8212fec 100644 --- a/tests/tests/controller.cpp +++ b/tests/tests/controller.cpp @@ -27,7 +27,7 @@ static TestScene* CreateTestScene(int nIdx) case TEST_ROTATE_WORLD: pScene = new RotateWorldTestScene(); break; case TEST_PARTICLE: -// pScene = new ParticleTestScene(); break; + pScene = new ParticleTestScene(); break; case TEST_EASE_ACTIONS: pScene = new EaseActionsTestScene(); break; case TEST_MOTION_STREAK: @@ -93,7 +93,7 @@ static TestScene* CreateTestScene(int nIdx) case TEST_COCOSDENSHION: pScene = new CocosDenshionTestScene(); break; case TEST_PERFORMANCE: -// pScene = new PerformanceTestScene(); break; + pScene = new PerformanceTestScene(); break; case TEST_ZWOPTEX: pScene = new ZwoptexTestScene(); break; #if (CC_TARGET_PLATFORM != CC_PLATFORM_AIRPLAY)