Changeset 9818 in orxonox.OLD for branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc
- Timestamp:
- Sep 25, 2006, 12:10:07 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc
r9760 r9818 76 76 if (glIsTexture(noise3DTexName)) 77 77 glDeleteTextures(1, &noise3DTexName); 78 79 delete shader;80 78 } 81 79 … … 122 120 this->skydome->setTexture(noise3DTexName); 123 121 124 this->shader = newShader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",122 this->shader = Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert", 125 123 ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.frag"); 126 124 127 this->shader ->activateShader();125 this->shader.activateShader(); 128 126 129 127 Shader::Uniform(shader, "Noise").set(0); … … 133 131 this->cloudcolor = new Shader::Uniform(shader, "CloudColor"); 134 132 135 this->shader ->deactivateShader();136 137 this->skydome->setShader( shader);133 this->shader.deactivateShader(); 134 135 this->skydome->setShader(&shader); 138 136 } 139 137 … … 163 161 164 162 // Can only be set after the loadParams call 165 this->shader ->activateShader();163 this->shader.activateShader(); 166 164 Shader::Uniform(shader, "Scale").set(this->scale); 167 165 this->skycolor->set … … 169 167 this->cloudcolor->set 170 168 (cloudColor.x, cloudColor.y, cloudColor.z); 171 this->shader ->deactivateShader();169 this->shader.deactivateShader(); 172 170 173 171 this->skydome->generateSkyPlane(this->divs, this->planetRadius, this->atmosphericRadius, 1, 1); … … 192 190 this->offsetZ += 0.05 * dt * this->animationSpeed; 193 191 194 this->shader ->activateShader();192 this->shader.activateShader(); 195 193 this->offset->set 196 194 (0.0f, 0.0f, offsetZ); … … 258 256 } 259 257 260 this->shader ->deactivateShader();258 this->shader.deactivateShader(); 261 259 } 262 260 }
Note: See TracChangeset
for help on using the changeset viewer.