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

add std::nothrow 

modify Copyright
This commit is contained in:
songchengjiang 2015-03-02 16:05:26 +08:00
parent a71aed6cc8
commit 79d892bffc
302 changed files with 1460 additions and 1176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/Particle3D/CCParticle3DAffector.cpp
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

2
extensions/Particle3D/CCParticle3DAffector.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

2
extensions/Particle3D/CCParticle3DEmitter.cpp
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

2
extensions/Particle3D/CCParticle3DEmitter.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

12
extensions/Particle3D/CCParticle3DRender.cpp
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,8 +22,8 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "Particle3D/CCParticleSystem3D.h" #include "extensions/Particle3D/CCParticleSystem3D.h"
#include "Particle3D/CCParticle3DRender.h" #include "extensions/Particle3D/CCParticle3DRender.h"
#include "renderer/CCMeshCommand.h" #include "renderer/CCMeshCommand.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "renderer/CCTextureCache.h" #include "renderer/CCTextureCache.h"
@ -56,7 +56,7 @@ Particle3DQuadRender::~Particle3DQuadRender()
Particle3DQuadRender* Particle3DQuadRender::create(const std::string& texFile) Particle3DQuadRender* Particle3DQuadRender::create(const std::string& texFile)
{ {
auto ret = new Particle3DQuadRender(); auto ret = new (std::nothrow) Particle3DQuadRender();
ret->autorelease(); ret->autorelease();
ret->initQuadRender(texFile); ret->initQuadRender(texFile);
return ret; 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 = IndexBuffer::create(IndexBuffer::IndexType::INDEX_TYPE_SHORT_16, 6 * 10000);
//ret->_indexBuffer->retain(); //ret->_indexBuffer->retain();
_meshCommand = new MeshCommand(); _meshCommand = new (std::nothrow) MeshCommand();
_meshCommand->setTransparent(true); _meshCommand->setTransparent(true);
_meshCommand->setDepthTestEnabled(_depthTest); _meshCommand->setDepthTestEnabled(_depthTest);
_meshCommand->setDepthWriteEnabled(_depthWrite); _meshCommand->setDepthWriteEnabled(_depthWrite);
@ -208,7 +208,7 @@ Particle3DModelRender::~Particle3DModelRender()
Particle3DModelRender* Particle3DModelRender::create(const std::string& modelFile, const std::string &texFile) 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->_modelFile = modelFile;
ret->_texFile = texFile; ret->_texFile = texFile;
return ret; return ret;

2
extensions/Particle3D/CCParticle3DRender.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

2
extensions/Particle3D/CCParticleSystem3D.cpp
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

2
extensions/Particle3D/CCParticleSystem3D.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

11
extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -83,7 +84,7 @@ void PUDynamicAttributeFixed::copyAttributesTo( PUDynamicAttribute* dynamicAttri
PUDynamicAttributeFixed* PUDynamicAttributeFixed::clone() PUDynamicAttributeFixed* PUDynamicAttributeFixed::clone()
{ {
auto af = new PUDynamicAttributeFixed(); auto af = new (std::nothrow) PUDynamicAttributeFixed();
this->copyAttributesTo(af); this->copyAttributesTo(af);
return af; return af;
} }
@ -148,7 +149,7 @@ void PUDynamicAttributeRandom::copyAttributesTo( PUDynamicAttribute* dynamicAttr
PUDynamicAttributeRandom* PUDynamicAttributeRandom::clone() PUDynamicAttributeRandom* PUDynamicAttributeRandom::clone()
{ {
auto ar = new PUDynamicAttributeRandom(); auto ar = new (std::nothrow) PUDynamicAttributeRandom();
this->copyAttributesTo(ar); this->copyAttributesTo(ar);
return ar; return ar;
} }
@ -335,7 +336,7 @@ void PUDynamicAttributeCurved::copyAttributesTo( PUDynamicAttribute* dynamicAttr
PUDynamicAttributeCurved* PUDynamicAttributeCurved::clone() PUDynamicAttributeCurved* PUDynamicAttributeCurved::clone()
{ {
auto ac = new PUDynamicAttributeCurved(); auto ac = new (std::nothrow) PUDynamicAttributeCurved();
this->copyAttributesTo(ac); this->copyAttributesTo(ac);
return ac; return ac;
} }
@ -447,7 +448,7 @@ void PUDynamicAttributeOscillate::copyAttributesTo( PUDynamicAttribute* dynamicA
PUDynamicAttributeOscillate* PUDynamicAttributeOscillate::clone() PUDynamicAttributeOscillate* PUDynamicAttributeOscillate::clone()
{ {
auto ao = new PUDynamicAttributeOscillate(); auto ao = new (std::nothrow) PUDynamicAttributeOscillate();
this->copyAttributesTo(ao); this->copyAttributesTo(ao);
return ao; return ao;
} }

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

16
extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -21,9 +22,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DDynamicAttributeTranslator.h" #include "CCPUParticle3DDynamicAttributeTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
PUParticle3DDynamicAttributeTranslator::PUParticle3DDynamicAttributeTranslator() PUParticle3DDynamicAttributeTranslator::PUParticle3DDynamicAttributeTranslator()
@ -45,24 +45,24 @@ void PUParticle3DDynamicAttributeTranslator::translate(PUScriptCompiler* compile
if (type == token[TOKEN_DYN_RANDOM]) if (type == token[TOKEN_DYN_RANDOM])
{ {
_dynamicAttribute = new PUDynamicAttributeRandom(); _dynamicAttribute = new (std::nothrow) PUDynamicAttributeRandom();
} }
else if (type == token[TOKEN_DYN_CURVED_LINEAR]) else if (type == token[TOKEN_DYN_CURVED_LINEAR])
{ {
_dynamicAttribute = new PUDynamicAttributeCurved(); _dynamicAttribute = new (std::nothrow) PUDynamicAttributeCurved();
} }
else if (type == token[TOKEN_DYN_CURVED_SPLINE]) else if (type == token[TOKEN_DYN_CURVED_SPLINE])
{ {
_dynamicAttribute = new PUDynamicAttributeCurved(); _dynamicAttribute = new (std::nothrow) PUDynamicAttributeCurved();
} }
else if (type == token[TOKEN_DYN_OSCILLATE]) else if (type == token[TOKEN_DYN_OSCILLATE])
{ {
_dynamicAttribute = new PUDynamicAttributeOscillate(); _dynamicAttribute = new (std::nothrow) PUDynamicAttributeOscillate();
} }
else else
{ {
// Create a fixed one. // Create a fixed one.
_dynamicAttribute = new PUDynamicAttributeFixed(); _dynamicAttribute = new (std::nothrow) PUDynamicAttributeFixed();
} }
// Run through properties // Run through properties

10
extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -21,13 +22,12 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#ifndef __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_DYNAMIC_ATTRIBUTE_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -422,7 +423,7 @@ PUForceFieldCalculationFactory* PUForceField::createForceFieldCalculationFactory
else else
{ {
// Use realtime calculation // Use realtime calculation
setForceFieldCalculationFactory(new PURealTimeForceFieldCalculationFactory()); setForceFieldCalculationFactory(new (std::nothrow) PURealTimeForceFieldCalculationFactory());
return getForceFieldCalculationFactory(); return getForceFieldCalculationFactory();
} }
} }

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

7
extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,8 +23,8 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

7
extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +24,8 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DMaterialManager.h" #include "CCPUParticle3DMaterialManager.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DMaterialTranslator.h" #include "CCPUParticle3DMaterialTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,8 +26,8 @@
#ifndef __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_MATERIAL_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN
class PUParticle3DMaterial; class PUParticle3DMaterial;

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DNoise.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DPlane.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

7
extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +24,8 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DRendererTranslator.h" #include "CCPUParticle3DRendererTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h"
NS_CC_BEGIN NS_CC_BEGIN
PUParticle3DRendererTranslator::PUParticle3DRendererTranslator() PUParticle3DRendererTranslator::PUParticle3DRendererTranslator()

13
extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,11 +26,11 @@
#ifndef __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_RENDERER_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h" #include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h"
#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h" #include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DBeamRender.h"
#include "Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h" #include "extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRibbonTrailRender.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN

17
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DScriptCompiler.h" #include "CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -36,7 +37,7 @@ PUObjectAbstractNode::PUObjectAbstractNode(PUAbstractNode *ptr)
PUAbstractNode *PUObjectAbstractNode::clone() const PUAbstractNode *PUObjectAbstractNode::clone() const
{ {
PUObjectAbstractNode *node = new PUObjectAbstractNode(parent); PUObjectAbstractNode *node = new (std::nothrow) PUObjectAbstractNode(parent);
node->file = file; node->file = file;
node->line = line; node->line = line;
node->type = type; node->type = type;
@ -125,7 +126,7 @@ PUPropertyAbstractNode::PUPropertyAbstractNode(PUAbstractNode *ptr)
PUAbstractNode *PUPropertyAbstractNode::clone() const PUAbstractNode *PUPropertyAbstractNode::clone() const
{ {
PUPropertyAbstractNode *node = new PUPropertyAbstractNode(parent); PUPropertyAbstractNode *node = new (std::nothrow) PUPropertyAbstractNode(parent);
node->file = file; node->file = file;
node->line = line; node->line = line;
node->type = type; node->type = type;
@ -310,7 +311,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node)
return; return;
} }
PUObjectAbstractNode *impl = new PUObjectAbstractNode(_current); PUObjectAbstractNode *impl = new (std::nothrow) PUObjectAbstractNode(_current);
impl->line = node->line; impl->line = node->line;
impl->file = node->file; impl->file = node->file;
impl->abstract = false; impl->abstract = false;
@ -341,7 +342,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node)
while(iter1 != temp.end() && (*iter1)->type != CNT_LBRACE) 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->file = (*iter1)->file;
atom->line = (*iter1)->line; atom->line = (*iter1)->line;
atom->type = ANT_ATOM; atom->type = ANT_ATOM;
@ -359,7 +360,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node)
//no brance// //no brance//
else else
{ {
PUPropertyAbstractNode *impl = new PUPropertyAbstractNode(_current); PUPropertyAbstractNode *impl = new (std::nothrow) PUPropertyAbstractNode(_current);
impl->line = node->line; impl->line = node->line;
impl->file = node->file; impl->file = node->file;
impl->name = node->token; impl->name = node->token;
@ -379,7 +380,7 @@ void PUScriptCompiler::visit(PUConcreteNode *node)
} }
else else
{ {
PUAtomAbstractNode *impl = new PUAtomAbstractNode(_current); PUAtomAbstractNode *impl = new (std::nothrow) PUAtomAbstractNode(_current);
impl->line = node->line; impl->line = node->line;
impl->file = node->file; impl->file = node->file;
impl->value = node->token; impl->value = node->token;

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,7 +26,7 @@
#ifndef __CC_PU_SCRIPT_COMPILER_H__ #ifndef __CC_PU_SCRIPT_COMPILER_H__
#define __CC_PU_SCRIPT_COMPILER_H__ #define __CC_PU_SCRIPT_COMPILER_H__
#include "base/CCRef.h" #include "base/CCRef.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org 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 = ':', const char openBracket = '{', closeBracket = '}', colon = ':',
quote = '\"', var = '$'; quote = '\"', var = '$';
PUScriptToken* token = new PUScriptToken; PUScriptToken* token = new (std::nothrow) PUScriptToken;
token->lexeme = lexeme; token->lexeme = lexeme;
token->line = line; token->line = line;

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

40
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -21,7 +22,6 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DScriptParser.h" #include "CCPUParticle3DScriptParser.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -84,7 +84,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
{ {
if(token->lexeme == "import") if(token->lexeme == "import")
{ {
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; 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); 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->parent = node;
temp->file = (*i)->file; temp->file = (*i)->file;
temp->line = (*i)->line; 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); printf("expected import source at line :%d,ScriptParser::parse",node->line);
} }
temp = new PUConcreteNode; temp = new (std::nothrow) PUConcreteNode;
temp->parent = node; temp->parent = node;
temp->file = (*i)->file; temp->file = (*i)->file;
temp->line = (*i)->line; temp->line = (*i)->line;
@ -145,7 +145,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->lexeme == "set") else if(token->lexeme == "set")
{ {
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -161,7 +161,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
// Ogre::StringConverter::toString(node->line), // Ogre::StringConverter::toString(node->line),
// "ScriptParser::parse"); // "ScriptParser::parse");
} }
PUConcreteNode* temp = new PUConcreteNode; PUConcreteNode* temp = new (std::nothrow) PUConcreteNode;
temp->parent = node; temp->parent = node;
temp->file = (*i)->file; temp->file = (*i)->file;
temp->line = (*i)->line; 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); printf("expected variable value at line %d ScriptParser::parse\n",node->line);
} }
temp = new PUConcreteNode; temp = new (std::nothrow) PUConcreteNode;
temp->parent = node; temp->parent = node;
temp->file = (*i)->file; temp->file = (*i)->file;
temp->line = (*i)->line; temp->line = (*i)->line;
@ -204,7 +204,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else else
{ {
node = new PUConcreteNode(); node = new (std::nothrow) PUConcreteNode();
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
node->type = token->type == TID_WORD ? CNT_WORD : CNT_QUOTE; node->type = token->type == TID_WORD ? CNT_WORD : CNT_QUOTE;
@ -240,7 +240,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
if(parent) if(parent)
parent = parent->parent; parent = parent->parent;
node = new PUConcreteNode(); node = new (std::nothrow) PUConcreteNode();
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -283,7 +283,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->type == TID_COLON) else if(token->type == TID_COLON)
{ {
node = new PUConcreteNode(); node = new (std::nothrow) PUConcreteNode();
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; 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)) 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->token = (*j)->lexeme;
tempNode->file = (*j)->file; tempNode->file = (*j)->file;
tempNode->line = (*j)->line; tempNode->line = (*j)->line;
@ -330,7 +330,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->type == TID_LBRACKET) else if(token->type == TID_LBRACKET)
{ {
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -369,7 +369,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
if(parent && parent->type == CNT_LBRACE && parent->parent) if(parent && parent->type == CNT_LBRACE && parent->parent)
parent = parent->parent; parent = parent->parent;
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -399,7 +399,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->type == TID_VARIABLE) else if(token->type == TID_VARIABLE)
{ {
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -420,7 +420,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->type == TID_QUOTE) 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->token = token->lexeme.substr(1, token->lexeme.size() - 2);
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -441,7 +441,7 @@ void PUScriptParser::parse(PUConcreteNodeList& nodes,const PUScriptTokenList& to
} }
else if(token->type == TID_WORD) else if(token->type == TID_WORD)
{ {
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->token = token->lexeme; node->token = token->lexeme;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
@ -488,7 +488,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi
switch(token->type) switch(token->type)
{ {
case TID_VARIABLE: case TID_VARIABLE:
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
node->parent = 0; node->parent = 0;
@ -496,7 +496,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi
node->type = CNT_VARIABLE; node->type = CNT_VARIABLE;
break; break;
case TID_WORD: case TID_WORD:
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
node->parent = 0; node->parent = 0;
@ -504,7 +504,7 @@ void PUScriptParser::parseChunk(PUConcreteNodeList& nodes, const PUScriptTokenLi
node->type = CNT_WORD; node->type = CNT_WORD;
break; break;
case TID_QUOTE: case TID_QUOTE:
node = new PUConcreteNode; node = new (std::nothrow) PUConcreteNode;
node->file = token->file; node->file = token->file;
node->line = token->line; node->line = token->line;
node->parent = 0; node->parent = 0;

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptParser.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -33,7 +34,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptLexer.h"
NS_CC_BEGIN NS_CC_BEGIN

6
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -21,9 +22,8 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DScriptTranslator.h" #include "CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h"
NS_CC_BEGIN NS_CC_BEGIN
PUScriptTranslator::PUScriptTranslator(void) PUScriptTranslator::PUScriptTranslator(void)

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -29,7 +30,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "math/CCMath.h" #include "math/CCMath.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DSimpleSpline.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DSphere.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DTechniqueTranslator.h" #include "CCPUParticle3DTechniqueTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_TECHNIQUE_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN
class PUParticle3DTechniqueTranslator : public PUScriptTranslator class PUParticle3DTechniqueTranslator : public PUScriptTranslator

5
extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DTranslateManager.h" #include "CCPUParticle3DTranslateManager.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN
PUParticle3DTranslateManager::PUParticle3DTranslateManager() PUParticle3DTranslateManager::PUParticle3DTranslateManager()

21
extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -29,15 +30,15 @@
//#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DSystemTranslator.h" //#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DSystemTranslator.h"
//#include "3dparticle/ParticleUniverse/Script/Translater/CCAliasTranslator.h" //#include "3dparticle/ParticleUniverse/Script/Translater/CCAliasTranslator.h"
//#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DTechniqueTranslator.h" //#include "3dparticle/ParticleUniverse/Script/Translater/CCParticle3DTechniqueTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTechniqueTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DRendererTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleEventHandlers/CCPUParticle3DEventHandlerTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviourTranslator.h"
using namespace std; using namespace std;
NS_CC_BEGIN NS_CC_BEGIN

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

3
extensions/Particle3D/ParticleUniverse/CCPUParticle3DUtil.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

37
extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,19 +23,19 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" #include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h"
#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h" #include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitterManager.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h"
#include "Particle3D/CCParticle3DRender.h" #include "extensions/Particle3D/CCParticle3DRender.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DMaterialManager.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DTranslateManager.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DListener.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DListener.h"
#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h" #include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserver.h"
#include "Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h" #include "extensions/Particle3D/ParticleUniverse/ParticleObservers/CCPUParticle3DObserverManager.h"
#include "Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h" #include "extensions/Particle3D/ParticleUniverse/ParticleBehaviours/CCPUParticle3DBehaviour.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -235,7 +236,7 @@ PUParticleSystem3D::~PUParticleSystem3D()
PUParticleSystem3D* PUParticleSystem3D::create() PUParticleSystem3D* PUParticleSystem3D::create()
{ {
auto pups = new PUParticleSystem3D(); auto pups = new (std::nothrow) PUParticleSystem3D();
pups->autorelease(); pups->autorelease();
return pups; return pups;
} }
@ -500,7 +501,7 @@ void PUParticleSystem3D::prepared()
if (emitter->getEmitsType() == PUParticle3D::PT_EMITTER){ if (emitter->getEmitsType() == PUParticle3D::PT_EMITTER){
PUParticle3DEmitter *emitted = static_cast<PUParticle3DEmitter*>(emitter->getEmitsEntityPtr()); PUParticle3DEmitter *emitted = static_cast<PUParticle3DEmitter*>(emitter->getEmitsEntityPtr());
for (unsigned int i = 0; i < _emittedEmitterQuota; ++i){ for (unsigned int i = 0; i < _emittedEmitterQuota; ++i){
auto p = new PUParticle3D(); auto p = new (std::nothrow) PUParticle3D();
p->particleType = PUParticle3D::PT_EMITTER; p->particleType = PUParticle3D::PT_EMITTER;
p->particleEntityPtr = emitted->clone(); p->particleEntityPtr = emitted->clone();
p->particleEntityPtr->retain(); p->particleEntityPtr->retain();
@ -513,7 +514,7 @@ void PUParticleSystem3D::prepared()
PUParticleSystem3D *emitted = static_cast<PUParticleSystem3D*>(emitter->getEmitsEntityPtr()); PUParticleSystem3D *emitted = static_cast<PUParticleSystem3D*>(emitter->getEmitsEntityPtr());
for (unsigned int i = 0; i < _emittedSystemQuota; ++i){ for (unsigned int i = 0; i < _emittedSystemQuota; ++i){
PUParticleSystem3D *clonePS = emitted->clone(); PUParticleSystem3D *clonePS = emitted->clone();
auto p = new PUParticle3D(); auto p = new (std::nothrow) PUParticle3D();
p->particleType = PUParticle3D::PT_TECHNIQUE; p->particleType = PUParticle3D::PT_TECHNIQUE;
p->particleEntityPtr = clonePS; p->particleEntityPtr = clonePS;
p->particleEntityPtr->retain(); p->particleEntityPtr->retain();
@ -528,7 +529,7 @@ void PUParticleSystem3D::prepared()
} }
for (unsigned int i = 0; i < _particleQuota; ++i){ for (unsigned int i = 0; i < _particleQuota; ++i){
auto p = new PUParticle3D(); auto p = new (std::nothrow) PUParticle3D();
p->autorelease(); p->autorelease();
p->copyBehaviours(_behaviourTemplates); p->copyBehaviours(_behaviourTemplates);
_particlePool.addData(p); _particlePool.addData(p);

5
extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -28,7 +29,7 @@
#include "2d/CCNode.h" #include "2d/CCNode.h"
#include "base/CCProtocols.h" #include "base/CCProtocols.h"
#include "math/CCMath.h" #include "math/CCMath.h"
#include "Particle3D/CCParticleSystem3D.h" #include "extensions/Particle3D/CCParticleSystem3D.h"
#include <vector> #include <vector>
#include <map> #include <map>

3
extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

9
extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3DTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,9 +27,9 @@
#define __CC_PU_PARTICLE_SYSTEM_3D_TRANSLATOR_H__ #define __CC_PU_PARTICLE_SYSTEM_3D_TRANSLATOR_H__
//#include <iostream> //#include <iostream>
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -22,9 +23,9 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h" #include "extensions/Particle3D/ParticleUniverse/ParticleEmitters/CCPUParticle3DEmitter.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -27,7 +28,7 @@
#include "base/CCRef.h" #include "base/CCRef.h"
#include "math/CCMath.h" #include "math/CCMath.h"
#include "Particle3D/CCParticle3DAffector.h" #include "extensions/Particle3D/CCParticle3DAffector.h"
#include <vector> #include <vector>
#include <string> #include <string>

55
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,32 +24,32 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DAffectorManager.h" #include "CCPUParticle3DAffectorManager.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollower.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollower.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneCollider.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiser.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereCollider.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffector.h"
NS_CC_BEGIN NS_CC_BEGIN
PUParticle3DAffectorManager::PUParticle3DAffectorManager() PUParticle3DAffectorManager::PUParticle3DAffectorManager()

59
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,34 +27,34 @@
#define __CC_PU_PARTICLE_3D_AFFECTOR_MANAGER_H__ #define __CC_PU_PARTICLE_3D_AFFECTOR_MANAGER_H__
#include "base/CCRef.h" #include "base/CCRef.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLineAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DLinearForceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DParticleFollowerTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPathFollowerTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DPlaneColliderTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DRandomiserTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DScaleVelocityAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSineForceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DSphereColliderTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureAnimatorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DTextureRotatorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVelocityMatchingAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DVortexAffectorTranslator.h"
using namespace std; using namespace std;
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,8 +24,8 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DAffectorTranslator.h" #include "CCPUParticle3DAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorManager.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_AFFECTOR_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DAlignAffector.h" #include "CCPUParticle3DAlignAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -81,7 +82,7 @@ void PUParticle3DAlignAffector::firstParticleUpdate( PUParticle3D *particle, flo
PUParticle3DAlignAffector* PUParticle3DAlignAffector::create() PUParticle3DAlignAffector* PUParticle3DAlignAffector::create()
{ {
auto paa = new PUParticle3DAlignAffector(); auto paa = new (std::nothrow) PUParticle3DAlignAffector();
paa->autorelease(); paa->autorelease();
return paa; return paa;
} }

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_H__
#define __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 NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DAlignAffectorTranslator.h" #include "CCPUParticle3DAlignAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_ALIGN_AFFECTOR_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAlignAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBaseCollider.h" #include "CCPUParticle3DBaseCollider.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_H__ #ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_H__
#define __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" #include "3d/CCAABB.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBaseColliderTranslator.h" #include "CCPUParticle3DBaseColliderTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BASE_COLLIDER_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseCollider.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBaseForceAffector.h" #include "CCPUParticle3DBaseForceAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -27,7 +28,7 @@
#define __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECTOR_H__
#include "math/CCMath.h" #include "math/CCMath.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBaseForceAffectorTranslator.h" #include "CCPUParticle3DBaseForceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECT_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_BASE_FORCE_AFFECT_TRANSLATOR_H__
#define __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 "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseForceAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBoxCollider.h" #include "CCPUParticle3DBoxCollider.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -281,7 +282,7 @@ void PUParticle3DBoxCollider::preUpdateAffector( float deltaTime )
PUParticle3DBoxCollider* PUParticle3DBoxCollider::create() PUParticle3DBoxCollider* PUParticle3DBoxCollider::create()
{ {
auto pbc = new PUParticle3DBoxCollider(); auto pbc = new (std::nothrow) PUParticle3DBoxCollider();
pbc->autorelease(); pbc->autorelease();
return pbc; return pbc;
} }

3
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

11
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,10 +24,10 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DBoxColliderTranslator.h" #include "CCPUParticle3DBoxColliderTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBaseColliderTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxColliderTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_BOX_COLLIDER_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DBoxCollider.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DCollisionAvoidanceAffector.h" #include "CCPUParticle3DCollisionAvoidanceAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
// Constants // Constants
@ -96,7 +97,7 @@ void PUParticle3DCollisionAvoidanceAffector::updatePUAffector( PUParticle3D *par
PUParticle3DCollisionAvoidanceAffector* PUParticle3DCollisionAvoidanceAffector::create() PUParticle3DCollisionAvoidanceAffector* PUParticle3DCollisionAvoidanceAffector::create()
{ {
auto pcaa = new PUParticle3DCollisionAvoidanceAffector(); auto pcaa = new (std::nothrow) PUParticle3DCollisionAvoidanceAffector();
pcaa->autorelease(); pcaa->autorelease();
return pcaa; return pcaa;
} }

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_H__
#define __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 NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DCollisionAvoidanceAffectorTranslator.h" #include "CCPUParticle3DCollisionAvoidanceAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_COLLISION_AVOIDDANCE_AFFECTOR_TRANSLATOR_H__
#define __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 "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DCollisionAvoidanceAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DColorAffector.h" #include "CCPUParticle3DColorAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -126,7 +127,7 @@ void PUParticle3DColorAffector::updatePUAffector( PUParticle3D *particle, float
PUParticle3DColorAffector* PUParticle3DColorAffector::create() PUParticle3DColorAffector* PUParticle3DColorAffector::create()
{ {
auto pca = new PUParticle3DColorAffector(); auto pca = new (std::nothrow) PUParticle3DColorAffector();
pca->autorelease(); pca->autorelease();
return pca; return pca;
} }

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_H__
#define __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" #include "base/ccTypes.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DColorAffectorTranslator.h" #include "CCPUParticle3DColorAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_COLOR_AFFECTOR_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DColorAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DFlockCenteringAffector.h" #include "CCPUParticle3DFlockCenteringAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -67,7 +68,7 @@ void PUParticle3DFlockCenteringAffector::preUpdateAffector( float deltaTime )
PUParticle3DFlockCenteringAffector* PUParticle3DFlockCenteringAffector::create() PUParticle3DFlockCenteringAffector* PUParticle3DFlockCenteringAffector::create()
{ {
auto pfca = new PUParticle3DFlockCenteringAffector(); auto pfca = new (std::nothrow) PUParticle3DFlockCenteringAffector();
pfca->autorelease(); pfca->autorelease();
return pfca; return pfca;
} }

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_H__
#define __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 NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DFlockCenteringAffectorTranslator.h" #include "CCPUParticle3DFlockCenteringAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_FLOCK_CENTERING_AFFECTOR_TRANSLATOR_H__
#define __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 "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DFlockCenteringAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DForceFieldAffector.h" #include "CCPUParticle3DForceFieldAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -316,7 +317,7 @@ void PUParticle3DForceFieldAffector::prepare()
PUParticle3DForceFieldAffector* PUParticle3DForceFieldAffector::create() PUParticle3DForceFieldAffector* PUParticle3DForceFieldAffector::create()
{ {
auto pffa = new PUParticle3DForceFieldAffector(); auto pffa = new (std::nothrow) PUParticle3DForceFieldAffector();
pffa->autorelease(); pffa->autorelease();
return pffa; return pffa;
} }

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,8 +27,8 @@
#ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__
#define __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_H__
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DForceField.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DForceField.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DForceFieldAffectorTranslator.h" #include "CCPUParticle3DForceFieldAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_FORCE_FIELD_AFFECTOR_TRANSLATOR_H__
#define __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 "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DForceFieldAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

11
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DGeometryRotator.h" #include "CCPUParticle3DGeometryRotator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -41,7 +42,7 @@ PUParticle3DGeometryRotator::PUParticle3DGeometryRotator() :
_rotationAxis(DEFAULT_ROTATION_AXIS), _rotationAxis(DEFAULT_ROTATION_AXIS),
_rotationAxisSet(false) _rotationAxisSet(false)
{ {
_dynRotationSpeed = new PUDynamicAttributeFixed(); _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed();
(static_cast<PUDynamicAttributeFixed*>(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); (static_cast<PUDynamicAttributeFixed*>(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED);
}; };
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -64,7 +65,7 @@ void PUParticle3DGeometryRotator::setRotationAxis(const Vec3& rotationAxis)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
void PUParticle3DGeometryRotator::resetRotationAxis(void) void PUParticle3DGeometryRotator::resetRotationAxis(void)
{ {
_dynRotationSpeed = new PUDynamicAttributeFixed(); _dynRotationSpeed = new (std::nothrow) PUDynamicAttributeFixed();
(static_cast<PUDynamicAttributeFixed*>(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED); (static_cast<PUDynamicAttributeFixed*>(_dynRotationSpeed))->setValue(DEFAULT_ROTATION_SPEED);
_rotationAxisSet = false; _rotationAxisSet = false;
} }
@ -164,7 +165,7 @@ void PUParticle3DGeometryRotator::updatePUAffector( PUParticle3D *particle, floa
PUParticle3DGeometryRotator* PUParticle3DGeometryRotator::create() PUParticle3DGeometryRotator* PUParticle3DGeometryRotator::create()
{ {
auto pgr = new PUParticle3DGeometryRotator(); auto pgr = new (std::nothrow) PUParticle3DGeometryRotator();
pgr->autorelease(); pgr->autorelease();
return pgr; return pgr;
} }

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,8 +27,8 @@
#ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__ #ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__
#define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__ #define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_H__
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
NS_CC_BEGIN NS_CC_BEGIN
struct PUParticle3D; struct PUParticle3D;

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DGeometryRotatorTranslator.h" #include "CCPUParticle3DGeometryRotatorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotatorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_GEOMETRY_ROTATOR_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGeometryRotator.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DGravityAffector.h" #include "CCPUParticle3DGravityAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -82,7 +83,7 @@ void PUParticle3DGravityAffector::preUpdateAffector( float deltaTime )
PUParticle3DGravityAffector* PUParticle3DGravityAffector::create() PUParticle3DGravityAffector* PUParticle3DGravityAffector::create()
{ {
auto pga = new PUParticle3DGravityAffector(); auto pga = new (std::nothrow) PUParticle3DGravityAffector();
pga->autorelease(); pga->autorelease();
return pga; return pga;
} }

5
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,7 +27,7 @@
#ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_H__
#define __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" #include "base/ccTypes.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DGravityAffectorTranslator.h" #include "CCPUParticle3DGravityAffectorTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffectorTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__
#define __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__ #define __CC_PU_PARTICLE_3D_GRAVITY_AFFECTOR_TRANSLATOR_H__
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DGravityAffector.h"
NS_CC_BEGIN NS_CC_BEGIN

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DInterParticleCollider.h" #include "CCPUParticle3DInterParticleCollider.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -169,7 +170,7 @@ void PUParticle3DInterParticleCollider::updatePUAffector( PUParticle3D *particle
PUParticle3DInterParticleCollider* PUParticle3DInterParticleCollider::create() PUParticle3DInterParticleCollider* PUParticle3DInterParticleCollider::create()
{ {
auto pipc = new PUParticle3DInterParticleCollider(); auto pipc = new (std::nothrow) PUParticle3DInterParticleCollider();
pipc->autorelease(); pipc->autorelease();
return pipc; return pipc;
} }

3
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,9 +24,9 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DInterParticleColliderTranslator.h" #include "CCPUParticle3DInterParticleColliderTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttributeTranslator.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleColliderTranslator.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -25,9 +26,9 @@
#ifndef __CC_PU_PARTICLE_3D_INNER_PARTICLE_COLLIDER_TRANSLATOR_H__ #ifndef __CC_PU_PARTICLE_3D_INNER_PARTICLE_COLLIDER_TRANSLATOR_H__
#define __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 "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptTranslator.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DScriptCompiler.h"
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DInterParticleCollider.h"
NS_CC_BEGIN NS_CC_BEGIN

9
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -23,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCPUParticle3DJetAffector.h" #include "CCPUParticle3DJetAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticleSystem3D.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticleSystem3D.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -35,7 +36,7 @@ PUParticle3DJetAffector::PUParticle3DJetAffector (void) :
PUParticle3DAffector(), PUParticle3DAffector(),
_scaled(0.0f) _scaled(0.0f)
{ {
_dynAcceleration = new PUDynamicAttributeFixed(); _dynAcceleration = new (std::nothrow) PUDynamicAttributeFixed();
(static_cast<PUDynamicAttributeFixed*>(_dynAcceleration))->setValue(DEFAULT_ACCELERATION); (static_cast<PUDynamicAttributeFixed*>(_dynAcceleration))->setValue(DEFAULT_ACCELERATION);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -76,7 +77,7 @@ void PUParticle3DJetAffector::updatePUAffector( PUParticle3D *particle, float de
PUParticle3DJetAffector* PUParticle3DJetAffector::create() PUParticle3DJetAffector* PUParticle3DJetAffector::create()
{ {
auto pja = new PUParticle3DJetAffector(); auto pja = new (std::nothrow) PUParticle3DJetAffector();
pja->autorelease(); pja->autorelease();
return pja; return pja;
} }

7
extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DJetAffector.h
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc. Copyright (C) 2013 Henry van Merode. All rights reserved.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -26,8 +27,8 @@
#ifndef __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__ #ifndef __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__
#define __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__ #define __CC_PU_PARTICLE_3D_JET_AFFECTOR_H__
#include "Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h" #include "extensions/Particle3D/ParticleUniverse/ParticleAffectors/CCPUParticle3DAffector.h"
#include "Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h" #include "extensions/Particle3D/ParticleUniverse/CCPUParticle3DDynamicAttribute.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
NS_CC_BEGIN NS_CC_BEGIN

Some files were not shown because too many files have changed in this diff Show More