Changeset 8261 in orxonox.OLD

Timestamp:

Jun 8, 2006, 4:06:28 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: deleted sgl file, now in data branch

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (2 diffs)
• rain_effect.cc (modified) (2 diffs)
• sky.sgl (deleted)
• snow_effect.cc (modified) (1 diff)

branches/atmospheric_engine/src/lib/graphics/effects/cloud_effect.cc

@@ -78 +78 @@
         this->cloudTexture = "pictures/sky/cloud1.jpg";
 
-        cloudModel.Load("sky.sgl");
-        cloudModel.Unitize();
+        // cloudModel.Load(ResourceManager::getInstance()->getDataDir() + "/models/cloud.sgl");
+        // cloudModel.Unitize();
 
         // Get the bounding box of the sky dome
@@ -120 +120 @@
 
         this->cloudActivate = true;
-        
 }
 

branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc

@@ -52 +52 @@
         if (this->rainBuffer != NULL)
                 ResourceManager::getInstance()->unload(this->rainBuffer);
-        this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
+        this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/rain.wav", WAV);
 
         //load wind sound
@@ -58 +58 @@
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);
+                this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
         }
 

branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc

@@ -50 +50 @@
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);
+                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
         }