Changeset 9821 in orxonox.OLD for branches/new_class_id/src/world_entities/environments

Timestamp:

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

Author:

bensch

Message:

Shaders now fully support the ResourceShader Paradigm

File:

• branches/new_class_id/src/world_entities/environments/mapped_water.cc (modified) (2 diffs)

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();