Changeset 7125 in orxonox.OLD for trunk/src/world_entities/environments

Timestamp:

Feb 12, 2006, 6:06:26 PM (19 years ago)

Author:

bensch

Message:

try fix

Location:

trunk/src/world_entities/environments

Files:

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

trunk/src/world_entities/environments/water.cc

@@ -55 +55 @@
 
   this->rebuildGrid();
-  this->waterMaterial = new Material();
   this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
 
@@ -65 +64 @@
 {
   delete this->grid;
-  delete this->waterMaterial;
 }
 

trunk/src/world_entities/environments/water.h

@@ -12 +12 @@
 /* INCLUDES */
 #include "world_entity.h"
+#include "material.h"
+
 
 /* FORWARD DECLARATION */
-class Material;
 class Grid;
 class Shader;
@@ -53 +54 @@
     float           cohesion;        //!< Cohesion.
 
-    Material*       waterMaterial;
+    Material        waterMaterial;
     Shader*         waterShader;
     float           height;          //!< The hight of the Water