Changeset 6512 in orxonox.OLD for trunk/src/lib/particles

Timestamp:

Jan 17, 2006, 10:01:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadParams is now virtual.
ALL THE CLASSES HAVE TO CALL

SuperClass::loadParams(root);

isntead of:
static_cast<SuperClass*>(this)→loadParams(root);

which was quite stupid anyways

Location:

trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (1 diff)
• particle_emitter.h (modified) (1 diff)
• particle_engine.h (modified) (1 diff)
• particle_system.cc (modified) (1 diff)
• particle_system.h (modified) (1 diff)

trunk/src/lib/particles/particle_emitter.cc

@@ -93 +93 @@
 void ParticleEmitter::loadParams(const TiXmlElement* root)
 {
-  static_cast<PNode*>(this)->loadParams(root);
+  PNode::loadParams(root);
 
   LoadParam(root, "type", this, ParticleEmitter, setType)

trunk/src/lib/particles/particle_emitter.h

@@ -39 +39 @@
 
   void init();
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   /* controlling the emitter: interface */

trunk/src/lib/particles/particle_engine.h

@@ -37 +37 @@
   inline static ParticleEngine* getInstance() { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
 
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   void tick(float dt);

trunk/src/lib/particles/particle_system.cc

@@ -116 +116 @@
 void ParticleSystem::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
-  static_cast<PhysicsInterface*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
+  PhysicsInterface::loadParams(root);
 
   LoadParam(root, "max-count", this, ParticleSystem, setMaxCount)

trunk/src/lib/particles/particle_system.h

@@ -74 +74 @@
 
   void init();
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   void setType(const char* particleType);