Changeset 10124 in orxonox.OLD

Timestamp:

Dec 20, 2006, 3:10:41 PM (17 years ago)

Author:

snellen

Message:

checkin

Location:

branches/heathaze/src/world_entities/effects

Files:

• heat_haze.cc (modified) (2 diffs)
• heat_haze.h (modified) (2 diffs)

branches/heathaze/src/world_entities/effects/heat_haze.cc

@@ -58 +58 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-  WorldEntity::loadParam(root);
+  WorldEntity::loadParams(root);
 
 
@@ -98 +98 @@
  */
 }
-
-
-/**
- *
- *
- */
-void HeatHaze::collidesWith (WorldEntity* entity, const Vector& location)
-{
-
-}

branches/heathaze/src/world_entities/effects/heat_haze.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "shader.h"
 
 //! A Class to generate a heat haze effect
@@ -30 +31 @@
 
  private:
+  Shader haze;
 
 };