Context Navigation

← Previous Change
Next Change →

particles

Timestamp:

May 27, 2005, 7:14:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

Location:

orxonox/branches/physics/src/lib/graphics/particles

Files:

: 3 edited

Legend:

: Unmodified
: Added
: Removed

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

r4328	r4332
30	30	float velocity)
31	31	{
32		this->setClass~~Name (~~"ParticleEmitter");
	32	this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
33	33
34	34	this->type = EMITTER_DOT;

orxonox/branches/physics/src/lib/graphics/particles/particle_engine.cc

r4308	r4332
30	30	ParticleEngine::ParticleEngine ()
31	31	{
32		this->setClass~~Name (~~"ParticleEngine");
	32	this->setClassID(CL_PARTICLE_ENGINE, "ParticleEngine");
33	33
34	34	this->systemList = new tList<ParticleSystem>;

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

r4330	r4332
42	42	ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
43	43	{
44		~~this->setClassName (~~"ParticleSystem");
	44	this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
45	45	this->material = NULL;
46	46	this->name = NULL;

Note: See TracChangeset for help on using the changeset viewer.