Changeset 9821 in orxonox.OLD for branches/new_class_id
- Timestamp:
- Sep 25, 2006, 12:28:05 PM (18 years ago)
- Location:
- branches/new_class_id/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/lib/graphics/shader.cc
r9819 r9821 18 18 #include "shader.h" 19 19 20 #include "stdlibincl.h"21 20 #include "compiler.h" 22 21 //#include <stdio.h> -
branches/new_class_id/src/world_entities/environments/mapped_water.cc
r9820 r9821 24 24 #include "shell_command.h" 25 25 #include "script_class.h" 26 27 #include "resource_shader.h" 26 28 27 29 #include "class_id_DEPRECATED.h" … … 164 166 { 165 167 // load shader files 166 shader = Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", 167 ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag"); 168 shader = ResourceShader( "/shaders/mapped_water.vert", "/shaders/mapped_water.frag"); 168 169 169 170 this->shader.activateShader(); -
branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc
r9818 r9821 28 28 #include "t_animation.h" 29 29 #include "script_class.h" 30 31 #include "resource_shader.h" 30 32 31 33 #include "class_id_DEPRECATED.h" … … 120 122 this->skydome->setTexture(noise3DTexName); 121 123 122 this->shader = Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert", 123 ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.frag"); 124 this->shader = ResourceShader("/shaders/cloud.vert", "/shaders/cloud.frag"); 124 125 125 126 this->shader.activateShader();
Note: See TracChangeset
for help on using the changeset viewer.