Changeset 6467 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 11, 2006, 11:46:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager and Material

Location:

trunk/src/world_entities/environments

Files:

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

trunk/src/world_entities/environments/water.cc

@@ -23 +23 @@
 #include "material.h"
 
+#include "resource_manager.h"
+#include "shader.h"
+
+
 using namespace std;
 
@@ -43 +47 @@
   this->rebuildGrid();
   this->waterMaterial = new Material();
+  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, (void*)"shaders/water.frag");
+
 }
 
@@ -97 +103 @@
 void Water::draw() const
 {
-  this->waterMaterial->select();
+  this->waterShader->activateShader();
+//  this->waterMaterial->select();
   WorldEntity::draw();
+  Shader::deactivateShader();
 }
 
@@ -109 +117 @@
     {
       this->grid->height(i,j) = this->height*sin(((float)i/(float)this->grid->rows() *phase)+
-          this->height*cos((float)j/(float)this->grid->columns()) * phase);
+          this->height*cos((float)j/(float)this->grid->columns()) * phase * 2.0);
     }
   }

trunk/src/world_entities/environments/water.h

@@ -16 +16 @@
 class Material;
 class Grid;
+class Shader;
 
 //! A Class to handle a WaterEffects
@@ -37 +38 @@
     Grid*           grid;            //!< The water-surface-model to render with
     Material*       waterMaterial;
+    Shader*         waterShader;
     float           height;          //!< The hight of the Water