From 79d892bffc7f5618af45d34258ef2d5945d04858 Mon Sep 17 00:00:00 2001 From: songchengjiang Date: Mon, 2 Mar 2015 16:05:26 +0800 Subject: [PATCH] add std::nothrow modify Copyright --- .../Particle3D/CCParticle3DAffector.cpp | 2 +- extensions/Particle3D/CCParticle3DAffector.h | 2 +- extensions/Particle3D/CCParticle3DEmitter.cpp | 2 +- extensions/Particle3D/CCParticle3DEmitter.h | 2 +- extensions/Particle3D/CCParticle3DRender.cpp | 12 ++-- extensions/Particle3D/CCParticle3DRender.h | 2 +- extensions/Particle3D/CCParticleSystem3D.cpp | 2 +- extensions/Particle3D/CCParticleSystem3D.h | 2 +- .../CCPUParticle3DDynamicAttribute.cpp | 11 ++-- .../CCPUParticle3DDynamicAttribute.h | 3 +- ...PUParticle3DDynamicAttributeTranslator.cpp | 16 ++--- ...CCPUParticle3DDynamicAttributeTranslator.h | 10 ++-- .../CCPUParticle3DForceField.cpp | 5 +- .../CCPUParticle3DForceField.h | 3 +- .../CCPUParticle3DListener.cpp | 7 ++- .../ParticleUniverse/CCPUParticle3DListener.h | 3 +- .../CCPUParticle3DMaterialManager.cpp | 7 ++- .../CCPUParticle3DMaterialManager.h | 3 +- .../CCPUParticle3DMaterialTranslator.cpp | 5 +- .../CCPUParticle3DMaterialTranslator.h | 7 ++- .../ParticleUniverse/CCPUParticle3DNoise.cpp | 3 +- .../ParticleUniverse/CCPUParticle3DNoise.h | 3 +- .../ParticleUniverse/CCPUParticle3DPlane.cpp | 3 +- .../ParticleUniverse/CCPUParticle3DPlane.h | 3 +- .../CCPUParticle3DRendererTranslator.cpp | 7 ++- .../CCPUParticle3DRendererTranslator.h | 13 ++-- .../CCPUParticle3DScriptCompiler.cpp | 17 +++--- .../CCPUParticle3DScriptCompiler.h | 5 +- .../CCPUParticle3DScriptLexer.cpp | 5 +- .../CCPUParticle3DScriptLexer.h | 3 +- .../CCPUParticle3DScriptParser.cpp | 40 ++++++------- .../CCPUParticle3DScriptParser.h | 5 +- .../CCPUParticle3DScriptTranslator.cpp | 6 +- .../CCPUParticle3DScriptTranslator.h | 5 +- .../CCPUParticle3DSimpleSpline.cpp | 3 +- .../CCPUParticle3DSimpleSpline.h | 3 +- .../ParticleUniverse/CCPUParticle3DSphere.cpp | 3 +- .../ParticleUniverse/CCPUParticle3DSphere.h | 3 +- .../CCPUParticle3DTechniqueTranslator.cpp | 5 +- .../CCPUParticle3DTechniqueTranslator.h | 9 +-- .../CCPUParticle3DTranslateManager.cpp | 5 +- .../CCPUParticle3DTranslateManager.h | 21 +++---- .../ParticleUniverse/CCPUParticle3DUtil.cpp | 3 +- .../ParticleUniverse/CCPUParticle3DUtil.h | 3 +- .../ParticleUniverse/CCPUParticleSystem3D.cpp | 37 ++++++------ .../ParticleUniverse/CCPUParticleSystem3D.h | 5 +- .../CCPUParticleSystem3DTranslator.cpp | 3 +- .../CCPUParticleSystem3DTranslator.h | 9 +-- .../CCPUParticle3DAffector.cpp | 9 +-- .../CCPUParticle3DAffector.h | 5 +- .../CCPUParticle3DAffectorManager.cpp | 55 ++++++++--------- .../CCPUParticle3DAffectorManager.h | 59 ++++++++++--------- .../CCPUParticle3DAffectorTranslator.cpp | 7 ++- .../CCPUParticle3DAffectorTranslator.h | 9 +-- .../CCPUParticle3DAlignAffector.cpp | 7 ++- .../CCPUParticle3DAlignAffector.h | 5 +- .../CCPUParticle3DAlignAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DAlignAffectorTranslator.h | 9 +-- .../CCPUParticle3DBaseCollider.cpp | 5 +- .../CCPUParticle3DBaseCollider.h | 5 +- .../CCPUParticle3DBaseColliderTranslator.cpp | 9 +-- .../CCPUParticle3DBaseColliderTranslator.h | 9 +-- .../CCPUParticle3DBaseForceAffector.cpp | 5 +- .../CCPUParticle3DBaseForceAffector.h | 5 +- ...UParticle3DBaseForceAffectorTranslator.cpp | 9 +-- ...CPUParticle3DBaseForceAffectorTranslator.h | 9 +-- .../CCPUParticle3DBoxCollider.cpp | 7 ++- .../CCPUParticle3DBoxCollider.h | 3 +- .../CCPUParticle3DBoxColliderTranslator.cpp | 11 ++-- .../CCPUParticle3DBoxColliderTranslator.h | 9 +-- ...PUParticle3DCollisionAvoidanceAffector.cpp | 7 ++- ...CCPUParticle3DCollisionAvoidanceAffector.h | 5 +- ...3DCollisionAvoidanceAffectorTranslator.cpp | 9 +-- ...le3DCollisionAvoidanceAffectorTranslator.h | 9 +-- .../CCPUParticle3DColorAffector.cpp | 7 ++- .../CCPUParticle3DColorAffector.h | 5 +- .../CCPUParticle3DColorAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DColorAffectorTranslator.h | 9 +-- .../CCPUParticle3DFlockCenteringAffector.cpp | 7 ++- .../CCPUParticle3DFlockCenteringAffector.h | 5 +- ...icle3DFlockCenteringAffectorTranslator.cpp | 9 +-- ...rticle3DFlockCenteringAffectorTranslator.h | 9 +-- .../CCPUParticle3DForceFieldAffector.cpp | 7 ++- .../CCPUParticle3DForceFieldAffector.h | 7 ++- ...Particle3DForceFieldAffectorTranslator.cpp | 9 +-- ...PUParticle3DForceFieldAffectorTranslator.h | 9 +-- .../CCPUParticle3DGeometryRotator.cpp | 11 ++-- .../CCPUParticle3DGeometryRotator.h | 7 ++- ...CPUParticle3DGeometryRotatorTranslator.cpp | 9 +-- .../CCPUParticle3DGeometryRotatorTranslator.h | 9 +-- .../CCPUParticle3DGravityAffector.cpp | 7 ++- .../CCPUParticle3DGravityAffector.h | 5 +- ...CPUParticle3DGravityAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DGravityAffectorTranslator.h | 9 +-- .../CCPUParticle3DInterParticleCollider.cpp | 7 ++- .../CCPUParticle3DInterParticleCollider.h | 3 +- ...ticle3DInterParticleColliderTranslator.cpp | 9 +-- ...article3DInterParticleColliderTranslator.h | 9 +-- .../CCPUParticle3DJetAffector.cpp | 9 +-- .../CCPUParticle3DJetAffector.h | 7 ++- .../CCPUParticle3DJetAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DJetAffectorTranslator.h | 9 +-- .../CCPUParticle3DLineAffector.cpp | 7 ++- .../CCPUParticle3DLineAffector.h | 5 +- .../CCPUParticle3DLineAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DLineAffectorTranslator.h | 9 +-- .../CCPUParticle3DLinearForceAffector.cpp | 7 ++- .../CCPUParticle3DLinearForceAffector.h | 3 +- ...article3DLinearForceAffectorTranslator.cpp | 11 ++-- ...UParticle3DLinearForceAffectorTranslator.h | 9 +-- .../CCPUParticle3DParticleFollower.cpp | 7 ++- .../CCPUParticle3DParticleFollower.h | 5 +- ...PUParticle3DParticleFollowerTranslator.cpp | 9 +-- ...CCPUParticle3DParticleFollowerTranslator.h | 9 +-- .../CCPUParticle3DPathFollower.cpp | 7 ++- .../CCPUParticle3DPathFollower.h | 7 ++- .../CCPUParticle3DPathFollowerTranslator.cpp | 9 +-- .../CCPUParticle3DPathFollowerTranslator.h | 9 +-- .../CCPUParticle3DPlaneCollider.cpp | 8 +-- .../CCPUParticle3DPlaneCollider.h | 5 +- .../CCPUParticle3DPlaneColliderTranslator.cpp | 11 ++-- .../CCPUParticle3DPlaneColliderTranslator.h | 9 +-- .../CCPUParticle3DRandomiser.cpp | 7 ++- .../CCPUParticle3DRandomiser.h | 5 +- .../CCPUParticle3DRandomiserTranslator.cpp | 9 +-- .../CCPUParticle3DRandomiserTranslator.h | 9 +-- .../CCPUParticle3DScaleAffector.cpp | 23 ++++---- .../CCPUParticle3DScaleAffector.h | 7 ++- .../CCPUParticle3DScaleAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DScaleAffectorTranslator.h | 9 +-- .../CCPUParticle3DScaleVelocityAffector.cpp | 11 ++-- .../CCPUParticle3DScaleVelocityAffector.h | 7 ++- ...ticle3DScaleVelocityAffectorTranslator.cpp | 10 ++-- ...article3DScaleVelocityAffectorTranslator.h | 9 +-- .../CCPUParticle3DSineForceAffector.cpp | 7 ++- .../CCPUParticle3DSineForceAffector.h | 3 +- ...UParticle3DSineForceAffectorTranslator.cpp | 11 ++-- ...CPUParticle3DSineForceAffectorTranslator.h | 9 +-- .../CCPUParticle3DSphereCollider.cpp | 7 ++- .../CCPUParticle3DSphereCollider.h | 5 +- ...CCPUParticle3DSphereColliderTranslator.cpp | 11 ++-- .../CCPUParticle3DSphereColliderTranslator.h | 9 +-- .../CCPUParticle3DTextureAnimator.cpp | 7 ++- .../CCPUParticle3DTextureAnimator.h | 5 +- ...CPUParticle3DTextureAnimatorTranslator.cpp | 9 +-- .../CCPUParticle3DTextureAnimatorTranslator.h | 9 +-- .../CCPUParticle3DTextureRotator.cpp | 11 ++-- .../CCPUParticle3DTextureRotator.h | 7 ++- ...CCPUParticle3DTextureRotatorTranslator.cpp | 9 +-- .../CCPUParticle3DTextureRotatorTranslator.h | 9 +-- ...CCPUParticle3DVelocityMatchingAffector.cpp | 7 ++- .../CCPUParticle3DVelocityMatchingAffector.h | 5 +- ...le3DVelocityMatchingAffectorTranslator.cpp | 9 +-- ...icle3DVelocityMatchingAffectorTranslator.h | 9 +-- .../CCPUParticle3DVortexAffector.cpp | 9 +-- .../CCPUParticle3DVortexAffector.h | 7 ++- ...CCPUParticle3DVortexAffectorTranslator.cpp | 9 +-- .../CCPUParticle3DVortexAffectorTranslator.h | 9 +-- .../CCPUParticle3DBehaviour.cpp | 7 ++- .../CCPUParticle3DBehaviour.h | 5 +- .../CCPUParticle3DBehaviourManager.cpp | 5 +- .../CCPUParticle3DBehaviourManager.h | 9 +-- .../CCPUParticle3DBehaviourTranslator.cpp | 7 ++- .../CCPUParticle3DBehaviourTranslator.h | 9 +-- .../CCPUParticle3DSlaveBehaviour.cpp | 5 +- .../CCPUParticle3DSlaveBehaviour.h | 7 ++- ...CCPUParticle3DSlaveBehaviourTranslator.cpp | 7 ++- .../CCPUParticle3DSlaveBehaviourTranslator.h | 9 +-- .../CCPUParticle3DBoxEmitter.cpp | 7 ++- .../CCPUParticle3DBoxEmitter.h | 5 +- .../CCPUParticle3DBoxEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DBoxEmitterTranslator.h | 9 +-- .../CCPUParticle3DCircleEmitter.cpp | 9 +-- .../CCPUParticle3DCircleEmitter.h | 5 +- .../CCPUParticle3DCircleEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DCircleEmitterTranslator.h | 9 +-- .../CCPUParticle3DEmitter.cpp | 29 ++++----- .../ParticleEmitters/CCPUParticle3DEmitter.h | 9 +-- .../CCPUParticle3DEmitterManager.cpp | 19 +++--- .../CCPUParticle3DEmitterManager.h | 23 ++++---- .../CCPUParticle3DEmitterTranslator.cpp | 11 ++-- .../CCPUParticle3DEmitterTranslator.h | 9 +-- .../CCPUParticle3DLineEmitter.cpp | 9 +-- .../CCPUParticle3DLineEmitter.h | 5 +- .../CCPUParticle3DLineEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DLineEmitterTranslator.h | 9 +-- .../CCPUParticle3DMeshSurfaceEmitter.cpp | 17 +++--- .../CCPUParticle3DMeshSurfaceEmitter.h | 5 +- ...Particle3DMeshSurfaceEmitterTranslator.cpp | 9 +-- ...PUParticle3DMeshSurfaceEmitterTranslator.h | 9 +-- .../CCPUParticle3DPointEmitter.cpp | 7 ++- .../CCPUParticle3DPointEmitter.h | 5 +- .../CCPUParticle3DPointEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DPointEmitterTranslator.h | 9 +-- .../CCPUParticle3DPositionEmitter.cpp | 7 ++- .../CCPUParticle3DPositionEmitter.h | 5 +- ...CPUParticle3DPositionEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DPositionEmitterTranslator.h | 9 +-- .../CCPUParticle3DSlaveEmitter.cpp | 9 +-- .../CCPUParticle3DSlaveEmitter.h | 7 ++- .../CCPUParticle3DSlaveEmitterTranslator.cpp | 9 +-- .../CCPUParticle3DSlaveEmitterTranslator.h | 9 +-- .../CCPUParticle3DSphereSurfaceEmitter.cpp | 9 +-- .../CCPUParticle3DSphereSurfaceEmitter.h | 6 +- ...rticle3DSphereSurfaceEmitterTranslator.cpp | 9 +-- ...Particle3DSphereSurfaceEmitterTranslator.h | 9 +-- .../CCPUParticle3DVertexEmitter.cpp | 5 +- .../CCPUParticle3DVertexEmitter.h | 5 +- .../CCPUParticle3DDoAffectorEventHandler.cpp | 11 ++-- .../CCPUParticle3DDoAffectorEventHandler.h | 5 +- ...icle3DDoAffectorEventHandlerTranslator.cpp | 9 +-- ...rticle3DDoAffectorEventHandlerTranslator.h | 9 +-- ...article3DDoEnableComponentEventHandler.cpp | 13 ++-- ...UParticle3DDoEnableComponentEventHandler.h | 7 ++- ...oEnableComponentEventHandlerTranslator.cpp | 9 +-- ...DDoEnableComponentEventHandlerTranslator.h | 9 +-- .../CCPUParticle3DDoExpireEventHandler.cpp | 11 ++-- .../CCPUParticle3DDoExpireEventHandler.h | 5 +- ...rticle3DDoExpireEventHandlerTranslator.cpp | 9 +-- ...Particle3DDoExpireEventHandlerTranslator.h | 9 +-- .../CCPUParticle3DDoFreezeEventHandler.cpp | 11 ++-- .../CCPUParticle3DDoFreezeEventHandler.h | 5 +- ...rticle3DDoFreezeEventHandlerTranslator.cpp | 9 +-- ...Particle3DDoFreezeEventHandlerTranslator.h | 9 +-- ...ticle3DDoPlacementParticleEventHandler.cpp | 11 ++-- ...article3DDoPlacementParticleEventHandler.h | 7 ++- ...lacementParticleEventHandlerTranslator.cpp | 9 +-- ...oPlacementParticleEventHandlerTranslator.h | 9 +-- .../CCPUParticle3DDoScaleEventHandler.cpp | 9 +-- .../CCPUParticle3DDoScaleEventHandler.h | 5 +- ...article3DDoScaleEventHandlerTranslator.cpp | 9 +-- ...UParticle3DDoScaleEventHandlerTranslator.h | 9 +-- ...CCPUParticle3DDoStopSystemEventHandler.cpp | 9 +-- .../CCPUParticle3DDoStopSystemEventHandler.h | 5 +- ...le3DDoStopSystemEventHandlerTranslator.cpp | 9 +-- ...icle3DDoStopSystemEventHandlerTranslator.h | 9 +-- .../CCPUParticle3DEventHandler.cpp | 7 ++- .../CCPUParticle3DEventHandler.h | 3 +- .../CCPUParticle3DEventHandlerManager.cpp | 19 +++--- .../CCPUParticle3DEventHandlerManager.h | 22 +++---- .../CCPUParticle3DEventHandlerTranslator.cpp | 9 +-- .../CCPUParticle3DEventHandlerTranslator.h | 10 ++-- .../CCPUParticle3DObserver.cpp | 9 +-- .../CCPUParticle3DObserver.h | 5 +- .../CCPUParticle3DObserverManager.cpp | 27 +++++---- .../CCPUParticle3DObserverManager.h | 29 ++++----- .../CCPUParticle3DObserverTranslator.cpp | 9 +-- .../CCPUParticle3DObserverTranslator.h | 9 +-- .../CCPUParticle3DOnClearObserver.cpp | 9 +-- .../CCPUParticle3DOnClearObserver.h | 5 +- ...CPUParticle3DOnClearObserverTranslator.cpp | 9 +-- .../CCPUParticle3DOnClearObserverTranslator.h | 9 +-- .../CCPUParticle3DOnCollisionObserver.cpp | 9 +-- .../CCPUParticle3DOnCollisionObserver.h | 5 +- ...article3DOnCollisionObserverTranslator.cpp | 9 +-- ...UParticle3DOnCollisionObserverTranslator.h | 9 +-- .../CCPUParticle3DOnCountObserver.cpp | 9 +-- .../CCPUParticle3DOnCountObserver.h | 5 +- ...CPUParticle3DOnCountObserverTranslator.cpp | 9 +-- .../CCPUParticle3DOnCountObserverTranslator.h | 9 +-- .../CCPUParticle3DOnEmissionObserver.cpp | 9 +-- .../CCPUParticle3DOnEmissionObserver.h | 5 +- ...Particle3DOnEmissionObserverTranslator.cpp | 9 +-- ...PUParticle3DOnEmissionObserverTranslator.h | 9 +-- .../CCPUParticle3DOnEventFlagObserver.cpp | 9 +-- .../CCPUParticle3DOnEventFlagObserver.h | 5 +- ...article3DOnEventFlagObserverTranslator.cpp | 9 +-- ...UParticle3DOnEventFlagObserverTranslator.h | 9 +-- .../CCPUParticle3DOnExpireObserver.cpp | 9 +-- .../CCPUParticle3DOnExpireObserver.h | 5 +- ...PUParticle3DOnExpireObserverTranslator.cpp | 9 +-- ...CCPUParticle3DOnExpireObserverTranslator.h | 9 +-- .../CCPUParticle3DOnPositionObserver.cpp | 9 +-- .../CCPUParticle3DOnPositionObserver.h | 5 +- ...Particle3DOnPositionObserverTranslator.cpp | 9 +-- ...PUParticle3DOnPositionObserverTranslator.h | 9 +-- .../CCPUParticle3DOnQuotaObserver.cpp | 9 +-- .../CCPUParticle3DOnQuotaObserver.h | 5 +- ...CPUParticle3DOnQuotaObserverTranslator.cpp | 9 +-- .../CCPUParticle3DOnQuotaObserverTranslator.h | 10 ++-- .../CCPUParticle3DOnRandomObserver.cpp | 35 +++++------ .../CCPUParticle3DOnRandomObserver.h | 5 +- ...PUParticle3DOnRandomObserverTranslator.cpp | 9 +-- ...CCPUParticle3DOnRandomObserverTranslator.h | 9 +-- .../CCPUParticle3DOnTimeObserver.cpp | 9 +-- .../CCPUParticle3DOnTimeObserver.h | 5 +- ...CCPUParticle3DOnTimeObserverTranslator.cpp | 9 +-- .../CCPUParticle3DOnTimeObserverTranslator.h | 9 +-- .../CCPUParticle3DOnVelocityObserver.cpp | 9 +-- .../CCPUParticle3DOnVelocityObserver.h | 5 +- ...Particle3DOnVelocityObserverTranslator.cpp | 9 +-- ...PUParticle3DOnVelocityObserverTranslator.h | 9 +-- .../CCPUParticle3DBeamRender.cpp | 19 +++--- .../CCPUParticle3DBeamRender.h | 11 ++-- .../CCPUParticle3DBillboardChain.cpp | 9 +-- .../CCPUParticle3DBillboardChain.h | 3 +- .../ParticleRenders/CCPUParticle3DRender.cpp | 21 +++---- .../ParticleRenders/CCPUParticle3DRender.h | 5 +- .../CCPUParticle3DRibbonTrail.cpp | 7 ++- .../CCPUParticle3DRibbonTrail.h | 5 +- .../CCPUParticle3DRibbonTrailRender.cpp | 17 +++--- .../CCPUParticle3DRibbonTrailRender.h | 13 ++-- 302 files changed, 1460 insertions(+), 1176 deletions(-) diff --git a/extensions/Particle3D/CCParticle3DAffector.cpp b/extensions/Particle3D/CCParticle3DAffector.cpp index d2f2232b87..28fad18916 100755 --- a/extensions/Particle3D/CCParticle3DAffector.cpp +++ b/extensions/Particle3D/CCParticle3DAffector.cpp @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticle3DAffector.h b/extensions/Particle3D/CCParticle3DAffector.h index 7418f04c34..6a26e4a1fd 100644 --- a/extensions/Particle3D/CCParticle3DAffector.h +++ b/extensions/Particle3D/CCParticle3DAffector.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticle3DEmitter.cpp b/extensions/Particle3D/CCParticle3DEmitter.cpp index e1841e6859..054272851b 100755 --- a/extensions/Particle3D/CCParticle3DEmitter.cpp +++ b/extensions/Particle3D/CCParticle3DEmitter.cpp @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticle3DEmitter.h b/extensions/Particle3D/CCParticle3DEmitter.h index 046ee60e4a..bfe28e691b 100644 --- a/extensions/Particle3D/CCParticle3DEmitter.h +++ b/extensions/Particle3D/CCParticle3DEmitter.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticle3DRender.cpp b/extensions/Particle3D/CCParticle3DRender.cpp index fe33073a03..9027e1d689 100755 --- a/extensions/Particle3D/CCParticle3DRender.cpp +++ b/extensions/Particle3D/CCParticle3DRender.cpp @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/CCParticleSystem3D.h" -#include "Particle3D/CCParticle3DRender.h" +#include "extensions/Particle3D/CCParticleSystem3D.h" +#include "extensions/Particle3D/CCParticle3DRender.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" #include "renderer/CCTextureCache.h" @@ -56,7 +56,7 @@ Particle3DQuadRender::~Particle3DQuadRender() Particle3DQuadRender* Particle3DQuadRender::create(const std::string& texFile) { - auto ret = new Particle3DQuadRender(); + auto ret = new (std::nothrow) Particle3DQuadRender(); ret->autorelease(); ret->initQuadRender(texFile); return ret; @@ -172,7 +172,7 @@ void Particle3DQuadRender::initQuadRender( const std::string& texFile ) //ret->_indexBuffer = IndexBuffer::create(IndexBuffer::IndexType::INDEX_TYPE_SHORT_16, 6 * 10000); //ret->_indexBuffer->retain(); - _meshCommand = new MeshCommand(); + _meshCommand = new (std::nothrow) MeshCommand(); _meshCommand->setTransparent(true); _meshCommand->setDepthTestEnabled(_depthTest); _meshCommand->setDepthWriteEnabled(_depthWrite); @@ -208,7 +208,7 @@ Particle3DModelRender::~Particle3DModelRender() Particle3DModelRender* Particle3DModelRender::create(const std::string& modelFile, const std::string &texFile) { - auto ret = new Particle3DModelRender(); + auto ret = new (std::nothrow) Particle3DModelRender(); ret->_modelFile = modelFile; ret->_texFile = texFile; return ret; diff --git a/extensions/Particle3D/CCParticle3DRender.h b/extensions/Particle3D/CCParticle3DRender.h index 5e14e11c93..15b6bc6898 100644 --- a/extensions/Particle3D/CCParticle3DRender.h +++ b/extensions/Particle3D/CCParticle3DRender.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticleSystem3D.cpp b/extensions/Particle3D/CCParticleSystem3D.cpp index e29f3fd5a8..a3f6f841b8 100755 --- a/extensions/Particle3D/CCParticleSystem3D.cpp +++ b/extensions/Particle3D/CCParticleSystem3D.cpp @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/CCParticleSystem3D.h b/extensions/Particle3D/CCParticleSystem3D.h index ee60c80f92..598656f2cd 100644 --- a/extensions/Particle3D/CCParticleSystem3D.h +++ b/extensions/Particle3D/CCParticleSystem3D.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.cpp index c305678ec0..2673fa2114 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -83,7 +84,7 @@ void PUDynamicAttributeFixed::copyAttributesTo( PUDynamicAttribute* dynamicAttri PUDynamicAttributeFixed* PUDynamicAttributeFixed::clone() { - auto af = new PUDynamicAttributeFixed(); + auto af = new (std::nothrow) PUDynamicAttributeFixed(); this->copyAttributesTo(af); return af; } @@ -148,7 +149,7 @@ void PUDynamicAttributeRandom::copyAttributesTo( PUDynamicAttribute* dynamicAttr PUDynamicAttributeRandom* PUDynamicAttributeRandom::clone() { - auto ar = new PUDynamicAttributeRandom(); + auto ar = new (std::nothrow) PUDynamicAttributeRandom(); this->copyAttributesTo(ar); return ar; } @@ -335,7 +336,7 @@ void PUDynamicAttributeCurved::copyAttributesTo( PUDynamicAttribute* dynamicAttr PUDynamicAttributeCurved* PUDynamicAttributeCurved::clone() { - auto ac = new PUDynamicAttributeCurved(); + auto ac = new (std::nothrow) PUDynamicAttributeCurved(); this->copyAttributesTo(ac); return ac; } @@ -447,7 +448,7 @@ void PUDynamicAttributeOscillate::copyAttributesTo( PUDynamicAttribute* dynamicA PUDynamicAttributeOscillate* PUDynamicAttributeOscillate::clone() { - auto ao = new PUDynamicAttributeOscillate(); + auto ao = new (std::nothrow) PUDynamicAttributeOscillate(); this->copyAttributesTo(ao); return ao; } diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h index 2fe0b7fb6a..4ee0d960b6 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.cpp index ab29a1a235..c039724980 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,9 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #include "CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN PUParticle3DDynamicAttributeTranslator::PUParticle3DDynamicAttributeTranslator() @@ -45,24 +45,24 @@ void PUParticle3DDynamicAttributeTranslator::translate(PUScriptCompiler* compile if (type == token[TOKEN_DYN_RANDOM]) { - _dynamicAttribute = new PUDynamicAttributeRandom(); + _dynamicAttribute = new (std::nothrow) PUDynamicAttributeRandom(); } else if (type == token[TOKEN_DYN_CURVED_LINEAR]) { - _dynamicAttribute = new PUDynamicAttributeCurved(); + _dynamicAttribute = new (std::nothrow) PUDynamicAttributeCurved(); } else if (type == token[TOKEN_DYN_CURVED_SPLINE]) { - _dynamicAttribute = new PUDynamicAttributeCurved(); + _dynamicAttribute = new (std::nothrow) PUDynamicAttributeCurved(); } else if (type == token[TOKEN_DYN_OSCILLATE]) { - _dynamicAttribute = new PUDynamicAttributeOscillate(); + _dynamicAttribute = new (std::nothrow) PUDynamicAttributeOscillate(); } else { // Create a fixed one. - _dynamicAttribute = new PUDynamicAttributeFixed(); + _dynamicAttribute = new (std::nothrow) PUDynamicAttributeFixed(); } // Run through properties diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h index 56b92fe98a..399e57ee6c 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,13 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.cpp index bda1981ac3..9ce237b767 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -422,7 +423,7 @@ PUForceFieldCalculationFactory* PUForceField::createForceFieldCalculationFactory else { // Use realtime calculation - setForceFieldCalculationFactory(new PURealTimeForceFieldCalculationFactory()); + setForceFieldCalculationFactory(new (std::nothrow) PURealTimeForceFieldCalculationFactory()); return getForceFieldCalculationFactory(); } } diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h index 711e504cae..58c43004ca 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.cpp index 807d97db06..93b208cc18 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h index 1b706536da..f0f0a556b3 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.cpp index 0d61e24326..6a871469c9 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DMaterialManager.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "platform/CCFileUtils.h" #include "platform/CCPlatformMacros.h" diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h index d30e995ea6..c3dc6e95c7 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.cpp index c7fa40f173..37b42e8d9d 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DMaterialTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h index ab1a1a63fe..8677eae98c 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,8 +26,8 @@ #ifndef __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN class PUParticle3DMaterial; diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.cpp index 8f3078b473..360dcd1ab0 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.h index acc55fdaab..fb5df0ae87 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.cpp index 2839df5e5e..fb88de5769 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h index 869e0a5a15..210c8b2b14 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.cpp index e1dc7b00c4..12cde6ebf2 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DRendererTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" NS_CC_BEGIN PUParticle3DRendererTranslator::PUParticle3DRendererTranslator() diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h index 80ad28bffd..310a76e8db 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,11 +26,11 @@ #ifndef __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.cpp index def4cd44d4..dd3afb9694 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "platform/CCFileUtils.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ PUObjectAbstractNode::PUObjectAbstractNode(PUAbstractNode *ptr) PUAbstractNode *PUObjectAbstractNode::clone() const { - PUObjectAbstractNode *node = new PUObjectAbstractNode(parent); + PUObjectAbstractNode *node = new (std::nothrow) PUObjectAbstractNode(parent); node->file = file; node->line = line; node->type = type; @@ -125,7 +126,7 @@ PUPropertyAbstractNode::PUPropertyAbstractNode(PUAbstractNode *ptr) PUAbstractNode *PUPropertyAbstractNode::clone() const { - PUPropertyAbstractNode *node = new PUPropertyAbstractNode(parent); + PUPropertyAbstractNode *node = new (std::nothrow) PUPropertyAbstractNode(parent); node->file = file; node->line = line; node->type = type; @@ -310,7 +311,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node) return; } - PUObjectAbstractNode *impl = new PUObjectAbstractNode(_current); + PUObjectAbstractNode *impl = new (std::nothrow) PUObjectAbstractNode(_current); impl->line = node->line; impl->file = node->file; impl->abstract = false; @@ -341,7 +342,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node) while(iter1 != temp.end() && (*iter1)->type != CNT_LBRACE) { - PUAtomAbstractNode *atom = new PUAtomAbstractNode(impl); + PUAtomAbstractNode *atom = new (std::nothrow) PUAtomAbstractNode(impl); atom->file = (*iter1)->file; atom->line = (*iter1)->line; atom->type = ANT_ATOM; @@ -359,7 +360,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node) //no brance// else { - PUPropertyAbstractNode *impl = new PUPropertyAbstractNode(_current); + PUPropertyAbstractNode *impl = new (std::nothrow) PUPropertyAbstractNode(_current); impl->line = node->line; impl->file = node->file; impl->name = node->token; @@ -379,7 +380,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node) } else { - PUAtomAbstractNode *impl = new PUAtomAbstractNode(_current); + PUAtomAbstractNode *impl = new (std::nothrow) PUAtomAbstractNode(_current); impl->line = node->line; impl->file = node->file; impl->value = node->token; diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h index 76f2262032..21da520ec0 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,7 +26,7 @@ #ifndef __CC_PU_SCRIPT_COMPILER_H__ #define __CC_PU_SCRIPT_COMPILER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.cpp index 9c2615d013..7c5a129874 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -242,7 +243,7 @@ void PUScriptLexer::setToken(const std::string &lexeme, int line, const std::str const char openBracket = '{', closeBracket = '}', colon = ':', quote = '\"', var = '$'; - PUScriptToken* token = new PUScriptToken; + PUScriptToken* token = new (std::nothrow) PUScriptToken; token->lexeme = lexeme; token->line = line; diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h index 4194891987..2e78b2db66 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.cpp index 8bede9a9bb..496460abae 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,7 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #include "CCPUParticle3DScriptParser.h" NS_CC_BEGIN @@ -84,7 +84,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to { if(token->lexeme == "import") { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; @@ -97,7 +97,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to { printf("Except,expected import target at line :%d,ScriptParser::parse",node->line); } - PUConcreteNode* temp = new PUConcreteNode; + PUConcreteNode* temp = new (std::nothrow) PUConcreteNode; temp->parent = node; temp->file = (*i)->file; temp->line = (*i)->line; @@ -115,7 +115,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to { printf("expected import source at line :%d,ScriptParser::parse",node->line); } - temp = new PUConcreteNode; + temp = new (std::nothrow) PUConcreteNode; temp->parent = node; temp->file = (*i)->file; temp->line = (*i)->line; @@ -145,7 +145,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->lexeme == "set") { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -161,7 +161,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to // Ogre::StringConverter::toString(node->line), // "ScriptParser::parse"); } - PUConcreteNode* temp = new PUConcreteNode; + PUConcreteNode* temp = new (std::nothrow) PUConcreteNode; temp->parent = node; temp->file = (*i)->file; temp->line = (*i)->line; @@ -175,7 +175,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to { printf("expected variable value at line %d ScriptParser::parse\n",node->line); } - temp = new PUConcreteNode; + temp = new (std::nothrow) PUConcreteNode; temp->parent = node; temp->file = (*i)->file; temp->line = (*i)->line; @@ -204,7 +204,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else { - node = new PUConcreteNode(); + node = new (std::nothrow) PUConcreteNode(); node->file = token->file; node->line = token->line; node->type = token->type == TID_WORD ? CNT_WORD : CNT_QUOTE; @@ -240,7 +240,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to if(parent) parent = parent->parent; - node = new PUConcreteNode(); + node = new (std::nothrow) PUConcreteNode(); node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -283,7 +283,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->type == TID_COLON) { - node = new PUConcreteNode(); + node = new (std::nothrow) PUConcreteNode(); node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -301,7 +301,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to while(j != end && ((*j)->type == TID_WORD || (*j)->type == TID_QUOTE)) { - PUConcreteNode* tempNode = new PUConcreteNode; + PUConcreteNode* tempNode = new (std::nothrow) PUConcreteNode; tempNode->token = (*j)->lexeme; tempNode->file = (*j)->file; tempNode->line = (*j)->line; @@ -330,7 +330,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->type == TID_LBRACKET) { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -369,7 +369,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to if(parent && parent->type == CNT_LBRACE && parent->parent) parent = parent->parent; - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -399,7 +399,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->type == TID_VARIABLE) { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -420,7 +420,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->type == TID_QUOTE) { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme.substr(1, token->lexeme.size() - 2); node->file = token->file; node->line = token->line; @@ -441,7 +441,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to } else if(token->type == TID_WORD) { - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->token = token->lexeme; node->file = token->file; node->line = token->line; @@ -488,7 +488,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi switch(token->type) { case TID_VARIABLE: - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->file = token->file; node->line = token->line; node->parent = 0; @@ -496,7 +496,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi node->type = CNT_VARIABLE; break; case TID_WORD: - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->file = token->file; node->line = token->line; node->parent = 0; @@ -504,7 +504,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi node->type = CNT_WORD; break; case TID_QUOTE: - node = new PUConcreteNode; + node = new (std::nothrow) PUConcreteNode; node->file = token->file; node->line = token->line; node->parent = 0; diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h index 90d9d8e7dd..b5f4cdadc7 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -33,7 +34,7 @@ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.cpp index 7a974515ac..7e3cf09f9c 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,9 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #include "CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" NS_CC_BEGIN PUScriptTranslator::PUScriptTranslator(void) diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h index 49f9d24521..9607ae636b 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -29,7 +30,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.cpp index 3c6b0401c7..aca025a023 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h index 0290527268..a1f01fb68d 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.cpp index d8d9a2fd96..30541e267d 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h index 3afa182e99..d9291c70dd 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.cpp index b1818cc4a8..32c9bcf297 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DTechniqueTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h index 3de328026a..4ae9a1292e 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN class PUParticle3DTechniqueTranslator : public PUScriptTranslator diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.cpp index fd6750dbfd..cad9c3ce64 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DTranslateManager.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN PUParticle3DTranslateManager::PUParticle3DTranslateManager() diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h index cb75842398..da845f7422 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -29,15 +30,15 @@ //#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DSystemTranslator.h" //#include "3dparticle/ParticleUniverse/Script/Translater/CCAliasTranslator.h" //#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DTechniqueTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h" using namespace std; NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.cpp index c642cd4a01..2858d3f796 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h index 251e1b2103..52168a6eaf 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.cpp index e23cab5c7e..cd582ba3ae 100755 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,19 +23,19 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" -#include "Particle3D/CCParticle3DRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" +#include "extensions/Particle3D/CCParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" #include "platform/CCFileUtils.h" NS_CC_BEGIN @@ -235,7 +236,7 @@ PUParticleSystem3D::~PUParticleSystem3D() PUParticleSystem3D* PUParticleSystem3D::create() { - auto pups = new PUParticleSystem3D(); + auto pups = new (std::nothrow) PUParticleSystem3D(); pups->autorelease(); return pups; } @@ -500,7 +501,7 @@ void PUParticleSystem3D::prepared() if (emitter->getEmitsType() == PUParticle3D::PT_EMITTER){ PUParticle3DEmitter *emitted = static_cast(emitter->getEmitsEntityPtr()); for (unsigned int i = 0; i < _emittedEmitterQuota; ++i){ - auto p = new PUParticle3D(); + auto p = new (std::nothrow) PUParticle3D(); p->particleType = PUParticle3D::PT_EMITTER; p->particleEntityPtr = emitted->clone(); p->particleEntityPtr->retain(); @@ -513,7 +514,7 @@ void PUParticleSystem3D::prepared() PUParticleSystem3D *emitted = static_cast(emitter->getEmitsEntityPtr()); for (unsigned int i = 0; i < _emittedSystemQuota; ++i){ PUParticleSystem3D *clonePS = emitted->clone(); - auto p = new PUParticle3D(); + auto p = new (std::nothrow) PUParticle3D(); p->particleType = PUParticle3D::PT_TECHNIQUE; p->particleEntityPtr = clonePS; p->particleEntityPtr->retain(); @@ -528,7 +529,7 @@ void PUParticleSystem3D::prepared() } for (unsigned int i = 0; i < _particleQuota; ++i){ - auto p = new PUParticle3D(); + auto p = new (std::nothrow) PUParticle3D(); p->autorelease(); p->copyBehaviours(_behaviourTemplates); _particlePool.addData(p); diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h index 751bae7e90..e933250d07 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -28,7 +29,7 @@ #include "2d/CCNode.h" #include "base/CCProtocols.h" #include "math/CCMath.h" -#include "Particle3D/CCParticleSystem3D.h" +#include "extensions/Particle3D/CCParticleSystem3D.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.cpp b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.cpp index 98d618479c..fc04775fab 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h index 2966e75056..afd2cb8766 100644 --- a/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,9 +27,9 @@ #define __CC_PU_PARTICLE_SYSTEM_3D_TRANSLATOR_H__ //#include -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.cpp index be336809f4..700c0558d3 100755 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h index 0799af3697..18931454c6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/CCParticle3DAffector.h" +#include "extensions/Particle3D/CCParticle3DAffector.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.cpp index 4c8c6c302b..7f0481962c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,32 +24,32 @@ ****************************************************************************/ #include "CCPUParticle3DAffectorManager.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h" NS_CC_BEGIN PUParticle3DAffectorManager::PUParticle3DAffectorManager() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h index 669dfe5e00..b5883a0bd8 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,34 +27,34 @@ #define __CC_PU_PARTICLE_3D_AFFECTOR_MANAGER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h" using namespace std; NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.cpp index 6afd3c0b06..282bfaa969 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h index fe1228eed6..db4d9188fc 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.cpp index 38f556a2c9..795642e438 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DAlignAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -81,7 +82,7 @@ void PUParticle3DAlignAffector::firstParticleUpdate( PUParticle3D *particle, flo PUParticle3DAlignAffector* PUParticle3DAlignAffector::create() { - auto paa = new PUParticle3DAlignAffector(); + auto paa = new (std::nothrow) PUParticle3DAlignAffector(); paa->autorelease(); return paa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h index 7b7d780b17..9eadc9b506 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.cpp index 12dccad8d6..ec26e682d7 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DAlignAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h index 3786282444..bd433a6522 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.cpp index 21cdd9be0d..11d288a613 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DBaseCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h index 4c0fecba4a..77c2333aaa 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_H__ #define __CC_PU_PARTICLE_3D_BASE_COLLIDER_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "3d/CCAABB.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.cpp index 19f106b54c..738f28e952 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DBaseColliderTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h index c85f9356ae..de8e91cdc9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.cpp index ae0c6daa21..277f09496a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DBaseForceAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h index ce9b3462dc..b5abbfc532 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #define __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECTOR_H__ #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.cpp index 45ebba140a..129cc93d50 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DBaseForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h index 7b49265925..88cfbb4011 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECT_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECT_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.cpp index 1218d58fd6..caee14a2e7 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DBoxCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -281,7 +282,7 @@ void PUParticle3DBoxCollider::preUpdateAffector( float deltaTime ) PUParticle3DBoxCollider* PUParticle3DBoxCollider::create() { - auto pbc = new PUParticle3DBoxCollider(); + auto pbc = new (std::nothrow) PUParticle3DBoxCollider(); pbc->autorelease(); return pbc; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h index e73baaa7a4..abb70790df 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.cpp index e6df412986..1f94c8040f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DBoxColliderTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h index df26832d83..1e38bf7453 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.cpp index f27e292a1a..a3d385de54 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DCollisionAvoidanceAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -96,7 +97,7 @@ void PUParticle3DCollisionAvoidanceAffector::updatePUAffector( PUParticle3D *par PUParticle3DCollisionAvoidanceAffector* PUParticle3DCollisionAvoidanceAffector::create() { - auto pcaa = new PUParticle3DCollisionAvoidanceAffector(); + auto pcaa = new (std::nothrow) PUParticle3DCollisionAvoidanceAffector(); pcaa->autorelease(); return pcaa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h index af082eafdb..c51982475d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.cpp index de3f5131b5..e7b9a67fa5 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DCollisionAvoidanceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h index 77a263b373..ebd3db7743 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.cpp index c7e60bd590..71266d7f84 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DColorAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -126,7 +127,7 @@ void PUParticle3DColorAffector::updatePUAffector( PUParticle3D *particle, float PUParticle3DColorAffector* PUParticle3DColorAffector::create() { - auto pca = new PUParticle3DColorAffector(); + auto pca = new (std::nothrow) PUParticle3DColorAffector(); pca->autorelease(); return pca; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h index 82711d24a9..6f7af7e086 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.cpp index 870620fd5c..78f5add218 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DColorAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h index 2f03b14df1..5e5e0c0d99 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.cpp index 59d98a040e..6b73f22332 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DFlockCenteringAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -67,7 +68,7 @@ void PUParticle3DFlockCenteringAffector::preUpdateAffector( float deltaTime ) PUParticle3DFlockCenteringAffector* PUParticle3DFlockCenteringAffector::create() { - auto pfca = new PUParticle3DFlockCenteringAffector(); + auto pfca = new (std::nothrow) PUParticle3DFlockCenteringAffector(); pfca->autorelease(); return pfca; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h index 2c7b4ebe01..7cc7a22aca 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.cpp index 53a60ce9af..9ce6ac25be 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DFlockCenteringAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h index 621bd3ca4a..4a1ae3f2de 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.cpp index 4a212234eb..2a87350a67 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DForceFieldAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -316,7 +317,7 @@ void PUParticle3DForceFieldAffector::prepare() PUParticle3DForceFieldAffector* PUParticle3DForceFieldAffector::create() { - auto pffa = new PUParticle3DForceFieldAffector(); + auto pffa = new (std::nothrow) PUParticle3DForceFieldAffector(); pffa->autorelease(); return pffa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h index 5818026bd1..94d4ae3f54 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DForceField.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.cpp index 86d04c8014..e274bd7161 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DForceFieldAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h index 8892337d4e..56a353f161 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.cpp index 277c679c11..7d3504c6e1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DGeometryRotator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -41,7 +42,7 @@ PUParticle3DGeometryRotator::PUParticle3DGeometryRotator() : _rotationAxis(DEFAULT_ROTATION_AXIS), _rotationAxisSet(false) { - _dynRotationSpeed = new PUDynamicAttributeFixed(); + _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); }; //----------------------------------------------------------------------- @@ -64,7 +65,7 @@ void PUParticle3DGeometryRotator::setRotationAxis(const Vec3& rotationAxis) //----------------------------------------------------------------------- void PUParticle3DGeometryRotator::resetRotationAxis(void) { - _dynRotationSpeed = new PUDynamicAttributeFixed(); + _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); _rotationAxisSet = false; } @@ -164,7 +165,7 @@ void PUParticle3DGeometryRotator::updatePUAffector( PUParticle3D *particle, floa PUParticle3DGeometryRotator* PUParticle3DGeometryRotator::create() { - auto pgr = new PUParticle3DGeometryRotator(); + auto pgr = new (std::nothrow) PUParticle3DGeometryRotator(); pgr->autorelease(); return pgr; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h index 1051b0f245..d253413244 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__ #define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" NS_CC_BEGIN struct PUParticle3D; diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.cpp index ad9eb1476c..42eaa1cdd6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DGeometryRotatorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h index dcda5a43eb..fef6cc2195 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.cpp index f390e51d2f..7f40e48be2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DGravityAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -82,7 +83,7 @@ void PUParticle3DGravityAffector::preUpdateAffector( float deltaTime ) PUParticle3DGravityAffector* PUParticle3DGravityAffector::create() { - auto pga = new PUParticle3DGravityAffector(); + auto pga = new (std::nothrow) PUParticle3DGravityAffector(); pga->autorelease(); return pga; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h index fb1e39d982..8e04abe404 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.cpp index e633a6b49d..34d1020bf2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DGravityAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h index 579609bffe..e809a81f8c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.cpp index 2c958730fd..1e33099b93 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DInterParticleCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -169,7 +170,7 @@ void PUParticle3DInterParticleCollider::updatePUAffector( PUParticle3D *particle PUParticle3DInterParticleCollider* PUParticle3DInterParticleCollider::create() { - auto pipc = new PUParticle3DInterParticleCollider(); + auto pipc = new (std::nothrow) PUParticle3DInterParticleCollider(); pipc->autorelease(); return pipc; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h index e7d7abad9a..4f935e2925 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.cpp index eb74e2f8e4..631d610815 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DInterParticleColliderTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h index 449f881cf8..898982a7e4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_INNER_PARTICLE_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_INNER_PARTICLE_COLLIDER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.cpp index ee3c8b578d..614b9f428f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DJetAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -35,7 +36,7 @@ PUParticle3DJetAffector::PUParticle3DJetAffector (void) : PUParticle3DAffector(), _scaled(0.0f) { - _dynAcceleration = new PUDynamicAttributeFixed(); + _dynAcceleration = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynAcceleration))->setValue(DEFAULT_ACCELERATION); } //----------------------------------------------------------------------- @@ -76,7 +77,7 @@ void PUParticle3DJetAffector::updatePUAffector( PUParticle3D *particle, float de PUParticle3DJetAffector* PUParticle3DJetAffector::create() { - auto pja = new PUParticle3DJetAffector(); + auto pja = new (std::nothrow) PUParticle3DJetAffector(); pja->autorelease(); return pja; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h index e5feb11360..2c9934f0f6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.cpp index b678a5d211..a17bea5af2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DJetAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h index 60b39966fb..7b9ccbb9a4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_JET_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_JET_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.cpp index 30200f41f5..50a0525de8 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DLineAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -158,7 +159,7 @@ void PUParticle3DLineAffector::firstParticleUpdate( PUParticle3D *particle, floa PUParticle3DLineAffector* PUParticle3DLineAffector::create() { - auto pla = new PUParticle3DLineAffector(); + auto pla = new (std::nothrow) PUParticle3DLineAffector(); pla->autorelease(); return pla; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h index af296cbf24..060e6a8463 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_LINE_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_LINE_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.cpp index 9e8c3574c9..fbc2bcb75e 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DLineAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h index d39c857f4a..2bc1a9d0a7 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_LINE_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_LINE_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.cpp index 22d7af3a12..e16f556023 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DLinearForceAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -56,7 +57,7 @@ void PUParticle3DLinearForceAffector::updatePUAffector( PUParticle3D *particle, PUParticle3DLinearForceAffector* PUParticle3DLinearForceAffector::create() { - auto plfa = new PUParticle3DLinearForceAffector(); + auto plfa = new (std::nothrow) PUParticle3DLinearForceAffector(); plfa->autorelease(); return plfa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h index ed74350132..2cd341ccd6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.cpp index f2c53c371d..7554966439 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DLinearForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h index 51b6aedb26..8bcadfb205 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_LINEAR_FORCE_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_LINEAR_FORCE_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.cpp index f97e388e46..014d0666e0 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DParticleFollower.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -98,7 +99,7 @@ void PUParticle3DParticleFollower::firstParticleUpdate( PUParticle3D *particle, PUParticle3DParticleFollower* PUParticle3DParticleFollower::create() { - auto ppf = new PUParticle3DParticleFollower(); + auto ppf = new (std::nothrow) PUParticle3DParticleFollower(); ppf->autorelease(); return ppf; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h index 164c2bbe81..afb16f4f6c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_PARTICLE_FOLLOWER_H__ #define __CC_PU_PARTICLE_3D_PARTICLE_FOLLOWER_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.cpp index 704fd70296..5deed214b9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DParticleFollowerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h index 635c7168ae..ce9b771eea 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_PARTICLE_FOLLOWER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_PARTICLE_FOLLOWER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.cpp index e0d965e213..fd1568f828 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DPathFollower.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -69,7 +70,7 @@ void PUParticle3DPathFollower::updatePUAffector( PUParticle3D *particle, float d PUParticle3DPathFollower* PUParticle3DPathFollower::create() { - auto ppf = new PUParticle3DPathFollower(); + auto ppf = new (std::nothrow) PUParticle3DPathFollower(); ppf->autorelease(); return ppf; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h index c9e414fb88..7aef2bfbca 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_PATH_FOLLOWER_H__ #define __CC_PU_PARTICLE_3D_PATH_FOLLOWER_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.cpp index 66f2a2ca41..fd4ed2d4be 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DPathFollowerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h index 37e40a7a04..d7cd978c91 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_PATH_FOLLOWER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_PATH_FOLLOWER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.cpp index a0e0bed2a4..0e6e8ba0a3 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,9 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #include "CCPUParticle3DPlaneCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -168,7 +168,7 @@ void PUParticle3DPlaneCollider::updatePUAffector( PUParticle3D *particle, float PUParticle3DPlaneCollider* PUParticle3DPlaneCollider::create() { - auto ppc = new PUParticle3DPlaneCollider(); + auto ppc = new (std::nothrow) PUParticle3DPlaneCollider(); ppc->autorelease(); return ppc; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h index c7d4475462..e312be4093 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #define __CC_PU_PARTICLE_3D_PLANE_COLLIDER_H__ #include "CCPUParticle3DBaseCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DPlane.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.cpp index e2bad6f6aa..1fe6f9349e 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DPlaneColliderTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h index c8dcb90032..ae58177ba5 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_PLANE_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_PLANE_COLLIDER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.cpp index 37cbd22d22..86c4d8172d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DRandomiser.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -150,7 +151,7 @@ void PUParticle3DRandomiser::postUpdateAffector(float deltaTime) PUParticle3DRandomiser* PUParticle3DRandomiser::create() { - auto pr = new PUParticle3DRandomiser(); + auto pr = new (std::nothrow) PUParticle3DRandomiser(); pr->autorelease(); return pr; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h index 21ebb36c41..89a9b9293c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_RANDOMISER_H__ #define __CC_PU_PARTICLE_3D_RANDOMISER_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.cpp index 1223172895..b3c1dc8324 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DRandomiserTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h index 7cba597569..dbd52bc9f1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_RANDOMISER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_RANDOMISER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.cpp index 5f3f1a9d78..1294c02e01 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DScaleAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -42,10 +43,10 @@ PUParticle3DScaleAffector::PUParticle3DScaleAffector(void) : _dynScaleXYZSet(false), _sinceStartSystem(false) { - _dynScaleX = new PUDynamicAttributeFixed(); - _dynScaleY = new PUDynamicAttributeFixed(); - _dynScaleZ = new PUDynamicAttributeFixed(); - _dynScaleXYZ = new PUDynamicAttributeFixed(); + _dynScaleX = new (std::nothrow) PUDynamicAttributeFixed(); + _dynScaleY = new (std::nothrow) PUDynamicAttributeFixed(); + _dynScaleZ = new (std::nothrow) PUDynamicAttributeFixed(); + _dynScaleXYZ = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleX))->setValue(DEFAULT_X_SCALE); (static_cast(_dynScaleY))->setValue(DEFAULT_Y_SCALE); (static_cast(_dynScaleZ))->setValue(DEFAULT_Z_SCALE); @@ -87,7 +88,7 @@ void PUParticle3DScaleAffector::setDynScaleX(PUDynamicAttribute* dynScaleX) if (resetToDefault) { CC_SAFE_DELETE(_dynScaleX); - _dynScaleX = new PUDynamicAttributeFixed(); + _dynScaleX = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleX))->setValue(DEFAULT_X_SCALE); _dynScaleXSet = false; } @@ -112,7 +113,7 @@ void PUParticle3DScaleAffector::resetDynScaleY(bool resetToDefault) { CC_SAFE_DELETE(_dynScaleY); - _dynScaleY = new PUDynamicAttributeFixed(); + _dynScaleY = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleY))->setValue(DEFAULT_X_SCALE); _dynScaleYSet = false; } @@ -136,7 +137,7 @@ void PUParticle3DScaleAffector::resetDynScaleZ(bool resetToDefault) if (resetToDefault) { CC_SAFE_DELETE(_dynScaleZ); - _dynScaleZ = new PUDynamicAttributeFixed(); + _dynScaleZ = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleZ))->setValue(DEFAULT_X_SCALE); _dynScaleYSet = false; } @@ -160,7 +161,7 @@ void PUParticle3DScaleAffector::resetDynScaleXYZ(bool resetToDefault) if (resetToDefault) { CC_SAFE_DELETE(_dynScaleXYZ); - _dynScaleXYZ = new PUDynamicAttributeFixed(); + _dynScaleXYZ = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleXYZ))->setValue(DEFAULT_XYZ_SCALE); _dynScaleXYZSet = false; } @@ -259,7 +260,7 @@ void PUParticle3DScaleAffector::updatePUAffector( PUParticle3D *particle, float PUParticle3DScaleAffector* PUParticle3DScaleAffector::create() { - auto psa = new PUParticle3DScaleAffector(); + auto psa = new (std::nothrow) PUParticle3DScaleAffector(); psa->autorelease(); return psa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h index 7a261aa269..c36b33208c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_SCALE_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_SCALE_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.cpp index 6d5e5308b0..04006d3959 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DScaleAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h index ed5ba434f7..4143e68d91 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SCALE_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SCALE_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.cpp index c40d8b8c3e..673b31924b 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DScaleVelocityAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -35,7 +36,7 @@ PUParticle3DScaleVelocityAffector::PUParticle3DScaleVelocityAffector(void) : _sinceStartSystem(false), _stopAtFlip(false) { - _dynScaleVelocity = new PUDynamicAttributeFixed(); + _dynScaleVelocity = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleVelocity))->setValue(DEFAULT_VELOCITY_SCALE); } //----------------------------------------------------------------------- @@ -98,14 +99,14 @@ void PUParticle3DScaleVelocityAffector::resetDynScaleVelocity(bool resetToDefaul if (resetToDefault) { CC_SAFE_DELETE(_dynScaleVelocity); - _dynScaleVelocity = new PUDynamicAttributeFixed(); + _dynScaleVelocity = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynScaleVelocity))->setValue(DEFAULT_VELOCITY_SCALE); } } PUParticle3DScaleVelocityAffector* PUParticle3DScaleVelocityAffector::create() { - auto psva = new PUParticle3DScaleVelocityAffector(); + auto psva = new (std::nothrow) PUParticle3DScaleVelocityAffector(); psva->autorelease(); return psva; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h index 08b054631a..24956dd36b 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_SCALE_VELOCITY_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_SCALE_VELOCITY_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.cpp index 48eadefb01..8f6f8ac10d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,11 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #include "CCPUParticle3DScaleVelocityAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h index 7419575572..47fa2b138f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SCALE_VELOCITY_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SCALE_VELOCITY_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.cpp index 50eeeeda9f..cee8f8bd74 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DSineForceAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -107,7 +108,7 @@ void PUParticle3DSineForceAffector::updatePUAffector( PUParticle3D *particle, fl PUParticle3DSineForceAffector* PUParticle3DSineForceAffector::create() { - auto psfa = new PUParticle3DSineForceAffector(); + auto psfa = new (std::nothrow) PUParticle3DSineForceAffector(); psfa->autorelease(); return psfa; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h index 8f7279750f..81670f51cc 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.cpp index f76b207208..faf3103363 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DSineForceAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h index 937e6e4909..fd34817c6e 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SINE_FORCE_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SINE_FORCE_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.cpp index af18a31066..fb8ea2264a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DSphereCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -193,7 +194,7 @@ void PUParticle3DSphereCollider::preUpdateAffector( float deltaTime ) PUParticle3DSphereCollider* PUParticle3DSphereCollider::create() { - auto psc = new PUParticle3DSphereCollider(); + auto psc = new (std::nothrow) PUParticle3DSphereCollider(); psc->autorelease(); return psc; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h index dd10c9e525..5148690a66 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #define __CC_PU_PARTICLE_3D_SPHERE_COLLIDER_H__ #include "CCPUParticle3DBaseCollider.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DSphere.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.cpp index 2d80791a0a..8649604a5b 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DSphereColliderTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h index c941fdfbb3..f16dd10465 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SPHERE_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SPHERE_COLLIDER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.cpp index 1bdf11e162..45e67d6e86 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DTextureAnimator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -249,7 +250,7 @@ void PUParticle3DTextureAnimator::updatePUAffector( PUParticle3D *particle, floa PUParticle3DTextureAnimator* PUParticle3DTextureAnimator::create() { - auto pta = new PUParticle3DTextureAnimator(); + auto pta = new (std::nothrow) PUParticle3DTextureAnimator(); pta->autorelease(); return pta; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h index 97c147dd29..f8ce17ba54 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_TEXTURE_ANIMATOR_H__ #define __CC_PU_PARTICLE_3D_TEXTURE_ANIMATOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.cpp index dd5cdbe88f..7ea0e58e3f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DTextureAnimatorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h index e9cb092e9f..eaca5f2d06 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_TEXTURE_ANIMATOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_TEXTURE_ANIMATOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.cpp index 49f7b79b14..947d83cfc4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DTextureRotator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -38,9 +39,9 @@ PUParticle3DTextureRotator::PUParticle3DTextureRotator(void) : _scaledRotationSpeed(0.0f), _twoPiRad(float(2.0 * M_PI)) { - _dynRotation = new PUDynamicAttributeFixed(); + _dynRotation = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRotation))->setValue(DEFAULT_ROTATION); - _dynRotationSpeed = new PUDynamicAttributeFixed(); + _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); } //----------------------------------------------------------------------- @@ -156,7 +157,7 @@ void PUParticle3DTextureRotator::updatePUAffector( PUParticle3D *particle, float PUParticle3DTextureRotator* PUParticle3DTextureRotator::create() { - auto ptr = new PUParticle3DTextureRotator(); + auto ptr = new (std::nothrow) PUParticle3DTextureRotator(); ptr->autorelease(); return ptr; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h index d056b5a96b..4d917ecf96 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_TEXTURE_ROTATOR_H__ #define __CC_PU_PARTICLE_3D_TEXTURE_ROTATOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.cpp index c7d92e23b9..b4761c3c73 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DTextureRotatorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h index 367d9ee9a4..d2833f0b48 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_TEXTURE_ROTATOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_TEXTURE_ROTATOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.cpp index b9f7d9b8ca..0719272825 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DVelocityMatchingAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -111,7 +112,7 @@ void PUParticle3DVelocityMatchingAffector::updatePUAffector( PUParticle3D *parti PUParticle3DVelocityMatchingAffector* PUParticle3DVelocityMatchingAffector::create() { - auto pvma = new PUParticle3DVelocityMatchingAffector(); + auto pvma = new (std::nothrow) PUParticle3DVelocityMatchingAffector(); pvma->autorelease(); return pvma; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h index dd062fbc31..de66d6f173 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_VELOCITY_MATCHING_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_VELOCITY_MATCHING_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.cpp index cc7ad0081e..a0c984cff0 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DVelocityMatchingAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h index 6d68283877..f8c89510e2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_VELOCITY_MATCHING_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_VELOCITY_MATCHING_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.cpp index dd3139c71a..fd87c686a9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DVortexAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ PUParticle3DVortexAffector::PUParticle3DVortexAffector(void) : PUParticle3DAffector(), _rotationVector(DEFAULT_ROTATION_VECTOR) { - _dynRotationSpeed = new PUDynamicAttributeFixed(); + _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); } //----------------------------------------------------------------------- @@ -117,7 +118,7 @@ void PUParticle3DVortexAffector::preUpdateAffector( float deltaTime ) PUParticle3DVortexAffector* PUParticle3DVortexAffector::create() { - auto pvf = new PUParticle3DVortexAffector(); + auto pvf = new (std::nothrow) PUParticle3DVortexAffector(); pvf->autorelease(); return pvf; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h index 56754064d2..0cbc19bb58 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_VORTEX_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_VORTEX_AFFECTOR_H__ -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.cpp index 4c7fa1fa2c..837e8563f0 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DVortexAffectorTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h index c3a057a210..c50b362911 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_VORTEX_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_VORTEX_AFFECTOR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.cpp b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.cpp index b903c6ede6..80a302413a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" #include "base/ccMacros.h" NS_CC_BEGIN @@ -41,7 +42,7 @@ PUParticle3DBehaviour::~PUParticle3DBehaviour( void ) PUParticle3DBehaviour* PUParticle3DBehaviour::clone() { - auto pb = new PUParticle3DBehaviour; + auto pb = new (std::nothrow) PUParticle3DBehaviour; pb->autorelease(); copyAttributesTo(pb); return pb; diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h index 086575df47..db66adf56a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.cpp b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.cpp index b43c7de89f..7afb72f5ad 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DBehaviourManager.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" NS_CC_BEGIN PUParticle3DBehaviourManager::PUParticle3DBehaviourManager() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h index 047177d0e9..761dff6bf6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,9 +27,9 @@ #define __CC_PU_PARTICLE_3D_BEHAVIOUR_MANAGER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h" using namespace std; NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.cpp index d4a6ac8b06..d28a5416e3 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DBehaviourTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h index 0206689c3b..dad71d1649 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_BEHAVIOUR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BEHAVIOUR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.cpp b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.cpp index 468bb28941..55a3869c9c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" #include "base/ccMacros.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h index a6087433fd..02cb758c79 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,8 +28,8 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.cpp index 7e96865102..c9cd693571 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DSlaveBehaviourTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourManager.h" NS_CC_BEGIN PUParticle3DSlaveBehaviourTranslator::PUParticle3DSlaveBehaviourTranslator() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h index bbfd5bc057..d1779e60e1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviourTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SLAVE_BEHAVIOUR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SLAVE_BEHAVIOUR_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.cpp index c4dbed2c3e..866affe2f6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DBoxEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -106,7 +107,7 @@ void PUParticle3DBoxEmitter::initParticlePosition(PUParticle3D* particle) PUParticle3DBoxEmitter* PUParticle3DBoxEmitter::create() { - auto pe = new PUParticle3DBoxEmitter(); + auto pe = new (std::nothrow) PUParticle3DBoxEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h index 1bf52e8ee6..b71451c541 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_BOX_EMITTER_H__ #define __CC_PU_PARTICLE_3D_BOX_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.cpp index ec34c6d101..8456df9634 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DBoxEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h index ac42669bd5..b377ebbcc9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_BOX_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BOX_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.cpp index d1b7c9772f..35254de425 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DCircleEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" #include "base/ccRandom.h" NS_CC_BEGIN @@ -185,7 +186,7 @@ void PUParticle3DCircleEmitter::initParticleDirection(PUParticle3D* particle) PUParticle3DCircleEmitter* PUParticle3DCircleEmitter::create() { - auto pe = new PUParticle3DCircleEmitter(); + auto pe = new (std::nothrow) PUParticle3DCircleEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h index e632688fa7..badb70e910 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_CIRCLE_EMITTER_H__ #define __CC_PU_PARTICLE_3D_CIRCLE_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.cpp index d26737a917..f576c9bda6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DCircleEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h index ec2625b088..1b6a8d767c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_CIRCLE_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_CIRCLE_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.cpp index 11b4353d6c..ae0351b00c 100755 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" NS_CC_BEGIN @@ -100,29 +101,29 @@ _isMarkedForEmission(false) { //particleType = PT_EMITTER; //mAliasType = AT_EMITTER; - _dynEmissionRate = new PUDynamicAttributeFixed(); + _dynEmissionRate = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynEmissionRate))->setValue(DEFAULT_EMISSION_RATE); - _dynTotalTimeToLive = new PUDynamicAttributeFixed(); + _dynTotalTimeToLive = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynTotalTimeToLive))->setValue(DEFAULT_TIME_TO_LIVE); - _dynParticleMass = new PUDynamicAttributeFixed(); + _dynParticleMass = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynParticleMass))->setValue(DEFAULT_MASS); - _dynVelocity = new PUDynamicAttributeFixed(); + _dynVelocity = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynVelocity))->setValue(DEFAULT_VELOCITY); - _dynDuration = new PUDynamicAttributeFixed(); + _dynDuration = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynDuration))->setValue(DEFAULT_DURATION); - _dynRepeatDelay = new PUDynamicAttributeFixed(); + _dynRepeatDelay = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynRepeatDelay))->setValue(DEFAULT_REPEAT_DELAY); - _dynAngle = new PUDynamicAttributeFixed(); + _dynAngle = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynAngle))->setValue(DEFAULT_ANGLE); // Set the dimensions attributes to 0; the default is to use the default dimensions of the ParticleTechnique - _dynParticleAllDimensions = new PUDynamicAttributeFixed(); + _dynParticleAllDimensions = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynParticleAllDimensions))->setValue(DEFAULT_DIMENSIONS); - _dynParticleWidth = new PUDynamicAttributeFixed(); + _dynParticleWidth = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynParticleWidth))->setValue(DEFAULT_WIDTH); - _dynParticleHeight = new PUDynamicAttributeFixed(); + _dynParticleHeight = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynParticleHeight))->setValue(DEFAULT_HEIGHT); - _dynParticleDepth = new PUDynamicAttributeFixed(); + _dynParticleDepth = new (std::nothrow) PUDynamicAttributeFixed(); (static_cast(_dynParticleDepth))->setValue(DEFAULT_DEPTH); } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h index bca1dc1510..4c55055ada 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,9 +28,9 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/CCParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/CCParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.cpp index 1d6c1e266c..3946eb194b 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,14 +24,14 @@ ****************************************************************************/ #include "CCPUParticle3DEmitterManager.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h" NS_CC_BEGIN PUParticle3DEmitterManager::PUParticle3DEmitterManager() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h index 4616f7c404..d91c25d465 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,16 +27,16 @@ #define __CC_PU_PARTICLE_3D_EMITTER_MANAGER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DBoxEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DCircleEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h" using namespace std; NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.cpp index 44574f779b..4a8cafcf23 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,10 +24,10 @@ ****************************************************************************/ #include "CCPUParticle3DEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h index d29b36a825..cdbbf3c692 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.cpp index 53209e2962..40a785f5db 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DLineEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" NS_CC_BEGIN // Constants @@ -228,7 +229,7 @@ void PUParticle3DLineEmitter::initParticleDirection(PUParticle3D* particle) PUParticle3DLineEmitter* PUParticle3DLineEmitter::create() { - auto pe = new PUParticle3DLineEmitter(); + auto pe = new (std::nothrow) PUParticle3DLineEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h index 3a8787c816..00868e9c02 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_LINE_EMITTER_H__ #define __CC_PU_PARTICLE_3D_LINE_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.cpp index 69e1cc5857..25c3774793 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DLineEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h index 2d7c4b4aff..23b160ad11 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_LINE_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_LINE_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DLineEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.cpp index 28718e2fbf..a065fd2590 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DMeshSurfaceEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" NS_CC_BEGIN // Constants @@ -305,9 +306,9 @@ const PUTriangle::PositionAndNormal MeshInfo::getRandomPositionAndNormal (const // } // // // Allocate space for the vertices and indices -// vertices = new Vec3[vertexCount]; -// normals = new Vec3[vertexCount]; -// indices = new unsigned long[indexCount]; +// vertices = new (std::nothrow) Vec3[vertexCount]; +// normals = new (std::nothrow) Vec3[vertexCount]; +// indices = new (std::nothrow) unsigned long[indexCount]; // added_shared = false; // // // Run through the submeshes again, adding the data into the arrays @@ -572,12 +573,12 @@ void PUParticle3DMeshSurfaceEmitter::build(void) } // Generate meshinfo. - _meshInfo = new MeshInfo(_meshName, _distribution, _orientation, _scale); + _meshInfo = new (std::nothrow) MeshInfo(_meshName, _distribution, _orientation, _scale); } PUParticle3DMeshSurfaceEmitter* PUParticle3DMeshSurfaceEmitter::create() { - auto pe = new PUParticle3DMeshSurfaceEmitter(); + auto pe = new (std::nothrow) PUParticle3DMeshSurfaceEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h index 48a3d9f1f6..e2ee82fd1a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_MESH_SURFACE_EMITTER_H__ #define __CC_PU_PARTICLE_MESH_SURFACE_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.cpp index 95ca34753a..358df7a90d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DMeshSurfaceEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h index 9184d28638..00bc5f44af 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_MESH_SURFACE_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_MESH_SURFACE_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DMeshSurfaceEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.cpp index 13940e916b..9f1bd7781f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DPointEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -40,7 +41,7 @@ PUParticle3DPointEmitter::~PUParticle3DPointEmitter( void ) PUParticle3DPointEmitter* PUParticle3DPointEmitter::create() { - auto pe = new PUParticle3DPointEmitter(); + auto pe = new (std::nothrow) PUParticle3DPointEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h index 8665e5782a..33be918ed7 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_POINT_EMITTER_H__ #define __CC_PU_PARTICLE_3D_POINT_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.cpp index 5b97f46d4a..58a8313be1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DPointEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h index d4f24eb19b..487b30a79f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_POINT_EMITTER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_POINT_EMITTER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPointEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.cpp index 427f972e7c..c20a90932c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DPositionEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -120,7 +121,7 @@ void PUParticle3DPositionEmitter::initParticlePosition(PUParticle3D* particle) PUParticle3DPositionEmitter* PUParticle3DPositionEmitter::create() { - auto pe = new PUParticle3DPositionEmitter(); + auto pe = new (std::nothrow) PUParticle3DPositionEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h index 7fa2adbf0b..e718cf9a25 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_POSITION_EMITTER_H__ #define __CC_PU_PARTICLE_3D_POSITION_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.cpp index e1277ed219..e222e99177 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DPositionEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h index 1a974ef52a..556c035c7d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_POSITION_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_POSITION_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DPositionEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.cpp index 3b5e1f2e38..b5dda6318e 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DSlaveEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DSlaveBehaviour.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -147,7 +148,7 @@ void PUParticle3DSlaveEmitter::notifyStart (void) PUParticle3DSlaveEmitter* PUParticle3DSlaveEmitter::create() { - auto pe = new PUParticle3DSlaveEmitter(); + auto pe = new (std::nothrow) PUParticle3DSlaveEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h index 809a75c099..56fc6abdc7 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,8 +27,8 @@ #ifndef __CC_PU_PARTICLE_3D_SLAVE_EMITTER_H__ #define __CC_PU_PARTICLE_3D_SLAVE_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" NS_CC_BEGIN //FIXME diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.cpp index 2f923293a1..00d018a495 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DSlaveEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h index a5686bbb8c..f898bfe731 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SLAVE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SLAVE_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSlaveEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.cpp index 4df44d719b..ab658ab56d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +24,8 @@ ****************************************************************************/ #include "CCPUParticle3DSphereSurfaceEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" NS_CC_BEGIN // Constants @@ -99,7 +100,7 @@ void PUParticle3DSphereSurfaceEmitter::initParticleDirection(PUParticle3D* parti PUParticle3DSphereSurfaceEmitter* PUParticle3DSphereSurfaceEmitter::create() { - auto pe = new PUParticle3DSphereSurfaceEmitter(); + auto pe = new (std::nothrow) PUParticle3DSphereSurfaceEmitter(); pe->autorelease(); return pe; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h index 78a9cd8370..56e3ee204f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,11 +23,10 @@ THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_PU_PARTICLE_3D_SPHERE_SURFACE_EMITTER_H__ #define __CC_PU_PARTICLE_3D_SPHERE_SURFACE_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.cpp index 1210974746..a5179643d1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DSphereSurfaceEmitterTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h index 631add1d44..67f96eef5a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitterTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_SPHERE_SURFACE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_SPHERE_SURFACE_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DSphereSurfaceEmitter.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.cpp index ce30282b19..8d5fe91d9d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ #include "CCPUParticle3DVertexEmitter.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //// Constants diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.h b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.h index 71c5d08822..1135535c13 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DVertexEmitter.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +27,7 @@ #ifndef __CC_PU_PARTICLE_3D_VERTEX_EMITTER_H__ #define __CC_PU_PARTICLE_3D_VERTEX_EMITTER_H__ -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" #include //Particle3DVertexEmitter NOT SUPPORT YET diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.cpp index 61ad713052..c5ea029de2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN // Constants @@ -77,7 +78,7 @@ void PUParticle3DDoAffectorEventHandler::handle (PUParticleSystem3D* particleSys PUParticle3DDoAffectorEventHandler* PUParticle3DDoAffectorEventHandler::create() { - auto peh = new PUParticle3DDoAffectorEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoAffectorEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h index 076b1a5ab1..1c2f5f5166 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.cpp index c55bcc8bd6..cbc96db897 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoAffectorEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h index 33201271fa..9a3c972cf1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_AFFECTOR_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_AFFECTOR_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.cpp index 0646facad2..1f604e5b93 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -153,7 +154,7 @@ void PUParticle3DDoEnableComponentEventHandler::handle (PUParticleSystem3D* part PUParticle3DDoEnableComponentEventHandler* PUParticle3DDoEnableComponentEventHandler::create() { - auto peh = new PUParticle3DDoEnableComponentEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoEnableComponentEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h index bfb2fff613..e4ba660b0f 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,8 +28,8 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.cpp index eff020f3da..240fe851f5 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoEnableComponentEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h index d44702ed43..2d428af985 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_ENABLE_COMPONENT_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_ENABLE_COMPONENT_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.cpp index b118afeaac..4fbccd0fc0 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -39,7 +40,7 @@ void PUParticle3DDoExpireEventHandler::handle (PUParticleSystem3D* particleSyste PUParticle3DDoExpireEventHandler* PUParticle3DDoExpireEventHandler::create() { - auto peh = new PUParticle3DDoExpireEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoExpireEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h index 9756c5c96f..d2e3f0b775 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.cpp index b1de2f99be..0777ab5fc3 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoExpireEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h index b4c18b061c..cea24d72ea 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_EXPIRE_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_EXPIRE_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.cpp index 6ff359ee27..1287839f94 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -39,7 +40,7 @@ void PUParticle3DDoFreezeEventHandler::handle (PUParticleSystem3D* particleSyste PUParticle3DDoFreezeEventHandler* PUParticle3DDoFreezeEventHandler::create() { - auto peh = new PUParticle3DDoFreezeEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoFreezeEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h index 0dc431d2a1..bdc5308f08 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.cpp index 98eb4e69cc..c1e846590c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoFreezeEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h index 1edc43370d..7d59c719f6 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_FREEZE_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_FREEZE_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.cpp index 5459195892..f471148fad 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -245,7 +246,7 @@ void PUParticle3DDoPlacementParticleEventHandler::removeAsListener(void) PUParticle3DDoPlacementParticleEventHandler* PUParticle3DDoPlacementParticleEventHandler::create() { - auto peh = new PUParticle3DDoPlacementParticleEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoPlacementParticleEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h index 7e3debc5c0..43196f0ec4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,8 +28,8 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.cpp index 4f957baec0..088517c671 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h index 1487041fe0..f696632992 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_PLACEMENT_PARTICLE_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_PLACEMENT_PARTICLE_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.cpp index 021729e688..47b7378b58 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -78,7 +79,7 @@ void PUParticle3DDoScaleEventHandler::handle (PUParticleSystem3D* particleSystem PUParticle3DDoScaleEventHandler* PUParticle3DDoScaleEventHandler::create() { - auto peh = new PUParticle3DDoScaleEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoScaleEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h index b34e344580..3783ced89c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.cpp index 43d4c1133a..f04e0b97e9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoScaleEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h index 1afb07394c..3327b962b2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_SCALE_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_SCALE_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.cpp index 9f2286a0d2..bd09ba6df1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -36,7 +37,7 @@ void PUParticle3DDoStopSystemEventHandler::handle (PUParticleSystem3D* particleS PUParticle3DDoStopSystemEventHandler* PUParticle3DDoStopSystemEventHandler::create() { - auto peh = new PUParticle3DDoStopSystemEventHandler(); + auto peh = new (std::nothrow) PUParticle3DDoStopSystemEventHandler(); peh->autorelease(); return peh; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h index 0136579beb..7faefb3c67 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.cpp index cb2e8ba323..06eaa41444 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DDoStopSystemEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h index 450597aa23..d5086c96ac 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_STOP_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_STOP_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.cpp index 0c27ac2ff3..86169a749e 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h index 357d86107b..0c11cd9978 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.cpp index ea0240c8f7..1a55598cc8 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,14 +23,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandler.h" NS_CC_BEGIN PUParticle3DEventHandlerManager::PUParticle3DEventHandlerManager() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h index 643e1423bc..9de982dc76 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,20 +22,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_PU_PARTICLE_3D_EVENT_HANDLER_MANAGER_H__ #define __CC_PU_PARTICLE_3D_EVENT_HANDLER_MANAGER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoAffectorEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoEnableComponentEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoExpireEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoFreezeEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoPlacementParticleEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoScaleEventHandlerTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DDoStopSystemEventHandlerTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.cpp index 6f47665949..e02d09067d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DEventHandlerTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h index 59beed37b1..0a15e055af 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,13 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_PU_PARTICLE_3D_EVENT_HANDLER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_EVENT_HANDLER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.cpp index da4d881144..39db4d89e2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" -#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerManager.h" #include "base/ccMacros.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h index c81ab9dcaf..1ce83972e3 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.cpp index ebdde9377e..3d9ddc36d2 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,18 +23,18 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" NS_CC_BEGIN PUParticle3DObserverManager::PUParticle3DObserverManager() diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h index 39ac8c890a..c0115be10a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,19 +27,19 @@ #define __CC_PU_PARTICLE_3D_OBSERVER_MANAGER_H__ #include "base/CCRef.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.cpp index 44df7c4a46..166abe517d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h index aff4fc23f7..d38e5af735 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.cpp index 3c344b36f5..168dcba22c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -70,7 +71,7 @@ void PUParticle3DOnClearObserver::postUpdateObserver(float timeElapsed) PUParticle3DOnClearObserver* PUParticle3DOnClearObserver::create() { - auto pco = new PUParticle3DOnClearObserver(); + auto pco = new (std::nothrow) PUParticle3DOnClearObserver(); pco->autorelease(); return pco; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h index a83aaa6673..205b29a381 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.cpp index 4d51ec3d1a..32f0214f96 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnClearObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h index d5fc6f2305..30513d6ee5 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_CLEAR_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_CLEAR_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnClearObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.cpp index 0a59bdd5ac..51977763d4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -35,7 +36,7 @@ bool PUParticle3DOnCollisionObserver::observe( PUParticle3D* particle, float tim PUParticle3DOnCollisionObserver* PUParticle3DOnCollisionObserver::create() { - auto pco = new PUParticle3DOnCollisionObserver(); + auto pco = new (std::nothrow) PUParticle3DOnCollisionObserver(); pco->autorelease(); return pco; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h index 3c90e30cea..4ad37f3594 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.cpp index b2181a9934..4b0fd02c06 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnCollisionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h index 95caab49af..abdafba869 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_COLLISION_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_COLLISION_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCollisionObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.cpp index b7089e68d2..69c8253d8d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -98,7 +99,7 @@ bool PUParticle3DOnCountObserver::observe (PUParticle3D* particle, float timeEla PUParticle3DOnCountObserver* PUParticle3DOnCountObserver::create() { - auto pco = new PUParticle3DOnCountObserver(); + auto pco = new (std::nothrow) PUParticle3DOnCountObserver(); pco->autorelease(); return pco; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h index 53b13fbfae..9cabfb268b 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.cpp index d68772fca2..b0d387abbd 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnCountObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h index eb6bad969f..4e7df752bb 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_COUNT_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_COUNT_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnCountObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.cpp index a93ea8dbf8..3cb395f0de 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN //----------------------------------------------------------------------- @@ -37,7 +38,7 @@ bool PUParticle3DOnEmissionObserver::observe (PUParticle3D* particle, float time PUParticle3DOnEmissionObserver* PUParticle3DOnEmissionObserver::create() { - auto peo = new PUParticle3DOnEmissionObserver(); + auto peo = new (std::nothrow) PUParticle3DOnEmissionObserver(); peo->autorelease(); return peo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h index 382f38a701..a09210d969 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.cpp index 56fab38b72..661ae301f9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnEmissionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h index 0faad5ac04..2e42ed7a17 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_EMISSION_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_EMISSION_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEmissionObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.cpp index 2282ea34ca..3d3cc176d0 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -47,7 +48,7 @@ bool PUParticle3DOnEventFlagObserver::observe (PUParticle3D* particle, float tim PUParticle3DOnEventFlagObserver* PUParticle3DOnEventFlagObserver::create() { - auto peo = new PUParticle3DOnEventFlagObserver(); + auto peo = new (std::nothrow) PUParticle3DOnEventFlagObserver(); peo->autorelease(); return peo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h index fb1eb78e3c..479b597fd8 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.cpp index ac9d6a9e57..0f504e8907 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnEventFlagObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h index 1e84aeb3f3..bc75bdbed5 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_EVENT_FLAG_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_EVENT_FLAG_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnEventFlagObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.cpp index 25c61e2d50..ca24e4274a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -38,7 +39,7 @@ bool PUParticle3DOnExpireObserver::observe (PUParticle3D* particle, float timeEl PUParticle3DOnExpireObserver* PUParticle3DOnExpireObserver::create() { - auto peo = new PUParticle3DOnExpireObserver(); + auto peo = new (std::nothrow) PUParticle3DOnExpireObserver(); peo->autorelease(); return peo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h index 66ba4a9333..3c0f9e789a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.cpp index 2ac782ae05..5909f50581 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnExpireObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h index fa973008b8..7adf292db9 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_EXPIRE_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_EXPIRE_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnExpireObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.cpp index be49d48a49..b52b31b869 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -77,7 +78,7 @@ bool PUParticle3DOnPositionObserver::observe (PUParticle3D* particle, float time PUParticle3DOnPositionObserver* PUParticle3DOnPositionObserver::create() { - auto ppo = new PUParticle3DOnPositionObserver(); + auto ppo = new (std::nothrow) PUParticle3DOnPositionObserver(); ppo->autorelease(); return ppo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h index d46f799722..19262351fa 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.cpp index 37cb6b7667..bf491ee2ba 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnPositionObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h index e449f17d43..b4936815be 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_POSITION_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_POSITION_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnPositionObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.cpp index e57df545b5..93cb4b1128 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -82,7 +83,7 @@ void PUParticle3DOnQuotaObserver::postUpdateObserver(float deltaTime) PUParticle3DOnQuotaObserver* PUParticle3DOnQuotaObserver::create() { - auto pqo = new PUParticle3DOnQuotaObserver(); + auto pqo = new (std::nothrow) PUParticle3DOnQuotaObserver(); pqo->autorelease(); return pqo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h index 5e509b6971..0721661250 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.cpp index 75f3ffb8cb..fe6c042433 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnQuotaObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h index 6983559c17..c581787712 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,13 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_PU_PARTICLE_3D_ON_QUOTA_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_QUOTA_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnQuotaObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.cpp index d629cbd553..43ebb3f8d4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -32,42 +33,42 @@ const float PUParticle3DOnRandomObserver::DEFAULT_THRESHOLD = 0.5f; //----------------------------------------------------------------------- PUParticle3DOnRandomObserver::PUParticle3DOnRandomObserver(void) : - PUParticle3DObserver(), - _threshold(DEFAULT_THRESHOLD) + PUParticle3DObserver(), + _threshold(DEFAULT_THRESHOLD) { } //----------------------------------------------------------------------- void PUParticle3DOnRandomObserver::preUpdateObserver(float deltaTime) { - // Call parent - PUParticle3DObserver::preUpdateObserver(deltaTime); + // Call parent + PUParticle3DObserver::preUpdateObserver(deltaTime); - // Handle the _observe here - handleObserve(0, deltaTime); + // Handle the _observe here + handleObserve(0, deltaTime); } //----------------------------------------------------------------------- void PUParticle3DOnRandomObserver::updateObserver(PUParticle3D *particle, float deltaTime, bool firstParticle) { - // No need to determine per particle + // No need to determine per particle } //----------------------------------------------------------------------- bool PUParticle3DOnRandomObserver::observe (PUParticle3D* particle, float timeElapsed) { - return (CCRANDOM_0_1() > _threshold); + return (CCRANDOM_0_1() > _threshold); } PUParticle3DOnRandomObserver* PUParticle3DOnRandomObserver::create() { - auto pro = new PUParticle3DOnRandomObserver(); - pro->autorelease(); - return pro; + auto pro = new (std::nothrow) PUParticle3DOnRandomObserver(); + pro->autorelease(); + return pro; } void PUParticle3DOnRandomObserver::copyAttributesTo( PUParticle3DObserver* observer ) { - PUParticle3DObserver::copyAttributesTo(observer); - PUParticle3DOnRandomObserver* onRandomObserver = static_cast(observer); - onRandomObserver->_threshold = _threshold; + PUParticle3DObserver::copyAttributesTo(observer); + PUParticle3DOnRandomObserver* onRandomObserver = static_cast(observer); + onRandomObserver->_threshold = _threshold; } NS_CC_END diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h index d3d9f321fa..2de660ed35 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.cpp index a53a68ce9e..aa20c82755 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnRandomObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h index 3a8ca93e13..154f3a7448 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_RANDOM_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_RANDOM_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnRandomObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.cpp index a87011c9e8..9966a88469 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -105,7 +106,7 @@ bool PUParticle3DOnTimeObserver::observe (PUParticle3D* particle, float timeElap PUParticle3DOnTimeObserver* PUParticle3DOnTimeObserver::create() { - auto pto = new PUParticle3DOnTimeObserver(); + auto pto = new (std::nothrow) PUParticle3DOnTimeObserver(); pto->autorelease(); return pto; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h index eb08532a2c..447536f588 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.cpp index c57d0254a0..24c236ad98 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnTimeObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h index a5289c941a..75f157bc14 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_ON_TIME_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ON_TIME_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnTimeObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.cpp index 6d64ccb4fd..cd960caa66 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" NS_CC_BEGIN @@ -70,7 +71,7 @@ bool PUParticle3DOnVelocityObserver::observe (PUParticle3D* particle, float time PUParticle3DOnVelocityObserver* PUParticle3DOnVelocityObserver::create() { - auto pvo = new PUParticle3DOnVelocityObserver(); + auto pvo = new (std::nothrow) PUParticle3DOnVelocityObserver(); pvo->autorelease(); return pvo; } diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h index 6c49901d7a..8cd598116a 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include #include diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.cpp b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.cpp index 0012eec5e7..fbdece79e8 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,9 +24,9 @@ ****************************************************************************/ #include "CCPUParticle3DOnVelocityObserverTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h index 85223c20e9..511bc4b6f1 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserverTranslator.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +26,9 @@ #ifndef __CC_PU_PARTICLE_3D_DO_CLEAR_OBSERVER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DO_CLEAR_OBSERVER_TRANSLATOR_H__ -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" -#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DOnVelocityObserver.h" NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.cpp b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.cpp index 3b59c5ead5..b8908afae4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/CCParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" +#include "extensions/Particle3D/CCParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" #include "renderer/CCTextureCache.h" @@ -51,7 +52,7 @@ const PUBillboardChain::TexCoordDirection PUParticle3DBeamRender::DEFAULT_TEXTUR PUParticle3DBeamRender* PUParticle3DBeamRender::create( const std::string &texFile ) { - auto br = new PUParticle3DBeamRender(); + auto br = new (std::nothrow) PUParticle3DBeamRender(); br->autorelease(); br->_texFile = texFile; return br; @@ -248,7 +249,7 @@ void PUParticle3DBeamRender::prepare() std::stringstream ss; ss << this; _billboardChainName = "Beam" + ss.str(); - _billboardChain = new PUBillboardChain(_billboardChainName, _texFile); + _billboardChain = new (std::nothrow) PUBillboardChain(_billboardChainName, _texFile); _billboardChain->setDynamic(true); _billboardChain->setNumberOfChains(_quota); _billboardChain->setMaxChainElements(_maxChainElements); @@ -268,7 +269,7 @@ void PUParticle3DBeamRender::prepare() _billboardChain->addChainElement(i, element); } - PUParticle3DBeamVisualData* visualData = new PUParticle3DBeamVisualData(i, _billboardChain); + PUParticle3DBeamVisualData* visualData = new (std::nothrow) PUParticle3DBeamVisualData(i, _billboardChain); for (size_t numDev = 0; numDev < _numberOfSegments; ++numDev) { // Initialise the positions diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h index 3c63a02cf0..3093207edf 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,10 +28,10 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/CCParticle3DRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" +#include "extensions/Particle3D/CCParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" #include NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.cpp b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.cpp index 8b28cee6ee..2ca3023c5c 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "base/CCDirector.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" @@ -663,7 +664,7 @@ void PUBillboardChain::init( const std::string &texFile ) _glProgramState = glProgramState; - _meshCommand = new MeshCommand(); + _meshCommand = new (std::nothrow) MeshCommand(); _meshCommand->setTransparent(true); _meshCommand->setDepthTestEnabled(true); _meshCommand->setDepthWriteEnabled(false); diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h index d2ab769fc0..6111263a6d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp index b292e98653..345a57a1a4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/CCParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/CCParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" #include "renderer/CCTextureCache.h" @@ -56,7 +57,7 @@ static bool compareParticle3D(PUParticle3D* left, PUParticle3D* right) PUParticle3DQuadRender* PUParticle3DQuadRender::create(const std::string& texFile) { - auto ret = new PUParticle3DQuadRender(); + auto ret = new (std::nothrow) PUParticle3DQuadRender(); ret->autorelease(); ret->initRender(texFile); return ret; @@ -408,7 +409,7 @@ PUParticle3DQuadRender* PUParticle3DQuadRender::clone() PUParticle3DModelRender* PUParticle3DModelRender::create( const std::string& modelFile, const std::string &texFile /*= ""*/ ) { - auto ret = new PUParticle3DModelRender(); + auto ret = new (std::nothrow) PUParticle3DModelRender(); ret->_modelFile = modelFile; ret->_texFile = texFile; return ret; @@ -528,7 +529,7 @@ void PUParticle3DEntityRender::initRender( const std::string &texFile ) _glProgramState = glProgramState; - _meshCommand = new MeshCommand(); + _meshCommand = new (std::nothrow) MeshCommand(); _meshCommand->setTransparent(true); _meshCommand->setDepthTestEnabled(_depthTest); _meshCommand->setDepthWriteEnabled(_depthWrite); @@ -564,7 +565,7 @@ PUParticle3DBoxRender::~PUParticle3DBoxRender() PUParticle3DBoxRender* PUParticle3DBoxRender::create( const std::string &texFile ) { - auto br = new PUParticle3DBoxRender(); + auto br = new (std::nothrow) PUParticle3DBoxRender(); br->autorelease(); br->initRender(texFile); return br; @@ -715,7 +716,7 @@ PUParticle3DBoxRender* PUParticle3DBoxRender::clone() PUParticle3DSphereRender* PUParticle3DSphereRender::create( const std::string &texFile) { - auto sr = new PUParticle3DSphereRender(); + auto sr = new (std::nothrow) PUParticle3DSphereRender(); sr->autorelease(); sr->initRender(texFile); return sr; diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h index 11d253ba35..0588f9ad01 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/CCParticle3DRender.h" +#include "extensions/Particle3D/CCParticle3DRender.h" #include NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.cpp b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.cpp index 6e7bec3619..a9bf8d37de 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "base/CCDirector.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h index 8db40f32ff..b8a703ae82 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,7 +28,7 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBillboardChain.h" #include NS_CC_BEGIN diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.cpp b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.cpp index c55fcce104..88230bbbd4 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.cpp +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.cpp @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "Particle3D/CCParticleSystem3D.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" +#include "extensions/Particle3D/CCParticleSystem3D.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h" #include "renderer/CCMeshCommand.h" #include "renderer/CCRenderer.h" #include "renderer/CCTextureCache.h" @@ -51,7 +52,7 @@ const Vec4 PUParticle3DRibbonTrailRender::DEFAULT_COLOUR_CHANGE(0.5, 0.5, 0.5, 0 PUParticle3DRibbonTrailRender* PUParticle3DRibbonTrailRender::create( const std::string &texFile ) { - auto br = new PUParticle3DRibbonTrailRender(); + auto br = new (std::nothrow) PUParticle3DRibbonTrailRender(); br->autorelease(); br->_texFile = texFile; return br; @@ -239,7 +240,7 @@ void PUParticle3DRibbonTrailRender::prepare() { // Create RibbonTrail //Ogre::SceneManager* sceneManager = mParentTechnique->getParentSystem()->getSceneManager(); - _trail = new PURibbonTrail(_ribbonTrailName, _texFile); + _trail = new (std::nothrow) PURibbonTrail(_ribbonTrailName, _texFile); _trail->setNumberOfChains(_quota); _trail->setMaxChainElements(_maxChainElements); if (_setLength) @@ -264,7 +265,7 @@ void PUParticle3DRibbonTrailRender::prepare() //visualData->node->setInheritOrientation(false); auto node = Node::create(); _childNode->addChild(node); - PUParticle3DRibbonTrailVisualData* visualData = new PUParticle3DRibbonTrailVisualData(node, _trail); + PUParticle3DRibbonTrailVisualData* visualData = new (std::nothrow) PUParticle3DRibbonTrailVisualData(node, _trail); visualData->index = i; _allVisualData.push_back(visualData); // Managed by this renderer _visualData.push_back(visualData); // Used to assign to a particle diff --git a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h index 96b8fb907a..e96ab6b31d 100644 --- a/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h +++ b/extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (C) 2013 Henry van Merode. All rights reserved. + Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,11 +28,11 @@ #include "base/CCRef.h" #include "math/CCMath.h" -#include "Particle3D/CCParticle3DRender.h" -#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" -#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h" -#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" +#include "extensions/Particle3D/CCParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" +#include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrail.h" +#include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include NS_CC_BEGIN