Changeset 10130 in orxonox.OLD

Timestamp:

Dec 20, 2006, 4:57:20 PM (17 years ago)

Author:

snellen

Message:

added HeatHazeManager

Location:

branches/heathaze/src

Files:

• lib/graphics/effects (added)
• lib/graphics/effects/HeatHazeManager.cc (added)
• lib/graphics/effects/HeatHazeManager.h (added)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/particles/heat_particles.cc (modified) (2 diffs)
• world_entities/particles/heat_particles.h (modified) (2 diffs)

branches/heathaze/src/world_entities/Makefile.am

@@ -31 +31 @@
                 effects/explosion.cc \
                 effects/billboard.cc \
-                effects/heat_haze.cc\
                 \
                 \
@@ -62 +61 @@
                 effects/explosion.h \
                 effects/billboard.h \
-                effects/heat_haze.cc\
                 \
                 \

branches/heathaze/src/world_entities/WorldEntities.am

@@ -82 +82 @@
                 world_entities/particles/particle_system.cc \
                 world_entities/particles/sprite_particles.cc \
+                world_entities/particles/heat_particles.cc \
                 world_entities/particles/spark_particles.cc \
                 world_entities/particles/model_particles.cc \
@@ -184 +185 @@
                 particles/particle_system.h \
                 particles/sprite_particles.h \
+                particles/heat_particles.h \
                 particles/spark_particles.h \
                 particles/model_particles.h \

branches/heathaze/src/world_entities/particles/heat_particles.cc

@@ -16 +16 @@
 #include "heat_particles.h"
 
-ObjectListDefinition(ProtoWorldEntity);
+ObjectListDefinition(HeatParticles);
 
 
 /**
- * constructs and loads a ProtoWorldEntity from a XML-element
+ * constructs and loads a HeatParticles from a XML-element
  * @param root the XML-element to load from
  */
-ProtoWorldEntity::ProtoWorldEntity(const TiXmlElement* root)
+HeatParticles::HeatParticles(const TiXmlElement* root)
 {
-  this->registerObject(this, ProtoWorldEntity::_objectList);
+ /* this->registerObject(this, HeatParticles::_objectList);
   this->init();
   if (root != NULL)
-    this->loadParams(root);
+    this->loadParams(root);*/
 }
 
@@ -35 +35 @@
  * standard deconstructor
  */
-ProtoWorldEntity::~ProtoWorldEntity ()
+HeatParticles::~HeatParticles ()
 {
 
 }
-
-
-/**
- * initializes the ProtoWorldEntity
- * @todo change this to what you wish
- */
-void ProtoWorldEntity::init()
-{
-  
-}
-
-
-/**
- * loads a ProtoWorldEntity from a XML-element
- * @param root the XML-element to load from
- * @todo make the class Loadable
- */
-void ProtoWorldEntity::loadParams(const TiXmlElement* root)
-{
-  // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-  WorldEntity::loadParam(root);
-
-
-  /**
-   * @todo: make the class Loadable
-   */
-}
-
-
-/**
- * advances the ProtoWorldEntity about time seconds
- * @param time the Time to step
- */
-ProtoWorldEntity::tick(float time)
-{
-
-}
-
-/**
- * draws this worldEntity
- */
-void ProtoWorldEntity::draw () const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir().matrix(matrix);
-  glMultMatrixf((float*)matrix);
-
-  if (model)
-    model->draw();
-  glPopMatrix();
-}
-
-
-/**
- *
- *
- */
-void ProtoWorldEntity::collidesWith (WorldEntity* entity, const Vector& location)
-{
-
-}

branches/heathaze/src/world_entities/particles/heat_particles.h

@@ -7 +7 @@
 #define _HEAT_PARTICLES_H
 
-#include "world_entity.h"
 #include "sprite_particles.h"
 
@@ -19 +18 @@
   virtual ~HeatParticles();
 
-  virtual void loadParams(const TiXmlElement* root);
-  void init();
-
-  virtual void draw() const;
-  virtual void tick(float time);
-
 };