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

CCParticleSystemPoint now derive from CCParticleSystemQuade in linux

This commit is contained in:
laschweinski 2011-09-05 11:57:10 +08:00
parent 717698bf65
commit 91f8ed7eb4
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos2dx/include/CCParticleSystemPoint.h
View File

@ -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

4
tests/test.linux/.cproject
View File

@ -85,7 +85,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests/PerformanceTest|tests/ParticleTest" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@ -173,7 +173,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="tests/PerformanceTest|tests/ParticleTest" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>

4
tests/tests/controller.cpp
View File

@ -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)