Changeset 9818 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 25, 2006, 12:10:07 PM (18 years ago)

Author:

bensch

Message:

Switching to new Shader layout, with Shader and ShaderData. Shaders do not render for the time being

Location:

branches/new_class_id/src/world_entities

Files:

• environments/mapped_water.cc (modified) (17 diffs)
• environments/mapped_water.h (modified) (1 diff)
• weather_effects/cloud_effect.cc (modified) (7 diffs)
• weather_effects/cloud_effect.h (modified) (1 diff)

branches/new_class_id/src/world_entities/environments/mapped_water.cc

@@ -77 +77 @@
 MappedWater::~MappedWater()
 {
-  delete shader;
   delete cam_uni;
   delete color_uni;
@@ -165 +164 @@
 {
   // load shader files
-  shader = new Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
-
-  this->shader->activateShader();
+  shader = Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
+
+  this->shader.activateShader();
   // Set the variable "reflection" to correspond to the first texture unit
   Shader::Uniform(shader, "reflection").set(0);
@@ -199 +198 @@
   cam_uni = new Shader::Uniform(shader, "cameraPos");
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -225 +224 @@
 void MappedWater::resetWaterColor(float r, float g, float b)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->waterColor = Vector(r, g, b);
 
@@ -231 +230 @@
   color_uni->set(waterColor.x, waterColor.y, waterColor.z, 1.0f);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -240 +239 @@
 void MappedWater::resetShineSize(float shine)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->shineSize = shine;
 
@@ -246 +245 @@
   shineSize_uni->set(this->shineSize);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -255 +254 @@
 void MappedWater::resetShineStrength(float strength)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->shineStrength = strength;
 
@@ -261 +260 @@
   shineStrength_uni->set(this->shineStrength);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -270 +269 @@
 void MappedWater::resetReflStrength(float strength)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->reflStrength = strength;
 
@@ -276 +275 @@
   reflStrength_uni->set(this->reflStrength);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -285 +284 @@
 void MappedWater::resetRefraction(float refraction)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->refraction = refraction;
 
@@ -291 +290 @@
   refr_uni->set(this->refraction);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -302 +301 @@
 void MappedWater::resetLightPos(float x, float y, float z)
 {
-  this->shader->activateShader();
+  this->shader.activateShader();
   this->lightPos = Vector(x, y, z);
 
@@ -308 +307 @@
   light_uni->set(lightPos.x, lightPos.y, lightPos.z, 1.0f);
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 }
 
@@ -556 +555 @@
   mat.select();
 
-  this->shader->activateShader();
+  this->shader.activateShader();
 
   // reset the camera uniform to the current cam position
@@ -595 +594 @@
   glEnd();
 
-  this->shader->deactivateShader();
+  this->shader.deactivateShader();
 
   mat.unselect();

branches/new_class_id/src/world_entities/environments/mapped_water.h

@@ -107 +107 @@
 private:
   Material                  mat;
-  Shader*                   shader;
+  Shader                    shader;
   OrxGui::GLGuiBox*         box;
 

branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc

@@ -76 +76 @@
     if (glIsTexture(noise3DTexName))
         glDeleteTextures(1, &noise3DTexName);
-
-    delete shader;
 }
 
@@ -122 +120 @@
     this->skydome->setTexture(noise3DTexName);
 
-    this->shader = new Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",
+    this->shader = Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",
                               ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.frag");
 
-    this->shader->activateShader();
+    this->shader.activateShader();
 
     Shader::Uniform(shader, "Noise").set(0);
@@ -133 +131 @@
     this->cloudcolor = new Shader::Uniform(shader, "CloudColor");
 
-    this->shader->deactivateShader();
-
-    this->skydome->setShader(shader);
+    this->shader.deactivateShader();
+
+    this->skydome->setShader(&shader);
 }
 
@@ -163 +161 @@
 
     // Can only be set after the loadParams call
-    this->shader->activateShader();
+    this->shader.activateShader();
     Shader::Uniform(shader, "Scale").set(this->scale);
     this->skycolor->set
@@ -169 +167 @@
     this->cloudcolor->set
     (cloudColor.x, cloudColor.y, cloudColor.z);
-    this->shader->deactivateShader();
+    this->shader.deactivateShader();
 
     this->skydome->generateSkyPlane(this->divs, this->planetRadius, this->atmosphericRadius, 1, 1);
@@ -192 +190 @@
         this->offsetZ += 0.05 * dt * this->animationSpeed;
 
-        this->shader->activateShader();
+        this->shader.activateShader();
         this->offset->set
         (0.0f, 0.0f, offsetZ);
@@ -258 +256 @@
         }
 
-        this->shader->deactivateShader();
+        this->shader.deactivateShader();
     }
 }

branches/new_class_id/src/world_entities/weather_effects/cloud_effect.h

@@ -143 +143 @@
 
     // SHADER STUFF
-    Shader*          shader;
+    Shader           shader;
     Shader::Uniform* offset;
     Shader::Uniform* skycolor;