Changeset 9821 in orxonox.OLD

Timestamp:

Sep 25, 2006, 12:28:05 PM (18 years ago)

Author:

bensch

Message:

Shaders now fully support the ResourceShader Paradigm

Location:

branches/new_class_id/src

Files:

• lib/graphics/shader.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (2 diffs)
• world_entities/weather_effects/cloud_effect.cc (modified) (2 diffs)

branches/new_class_id/src/lib/graphics/shader.cc

@@ -18 +18 @@
 #include "shader.h"
 
-#include "stdlibincl.h"
 #include "compiler.h"
 //#include <stdio.h>

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

@@ -24 +24 @@
 #include "shell_command.h"
 #include "script_class.h"
+
+#include "resource_shader.h"
 
 #include "class_id_DEPRECATED.h"
@@ -164 +166 @@
 {
   // load shader files
-  shader = Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert",
-                   ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
+  shader = ResourceShader( "/shaders/mapped_water.vert", "/shaders/mapped_water.frag");
 
   this->shader.activateShader();

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

@@ -28 +28 @@
 #include "t_animation.h"
 #include "script_class.h"
+
+#include "resource_shader.h"
 
 #include "class_id_DEPRECATED.h"
@@ -120 +122 @@
     this->skydome->setTexture(noise3DTexName);
 
-    this->shader = Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",
-                              ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.frag");
+    this->shader = ResourceShader("/shaders/cloud.vert", "/shaders/cloud.frag");
 
     this->shader.activateShader();