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

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/weather_effects

Files:

• cloud_effect.cc (modified) (7 diffs)
• cloud_effect.h (modified) (1 diff)

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;