Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9821 in orxonox.OLD for branches/new_class_id


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/graphics/shader.cc

    r9819 r9821  
    1818#include "shader.h"
    1919
    20 #include "stdlibincl.h"
    2120#include "compiler.h"
    2221//#include <stdio.h>
  • branches/new_class_id/src/world_entities/environments/mapped_water.cc

    r9820 r9821  
    2424#include "shell_command.h"
    2525#include "script_class.h"
     26
     27#include "resource_shader.h"
    2628
    2729#include "class_id_DEPRECATED.h"
     
    164166{
    165167  // 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");
    168169
    169170  this->shader.activateShader();
  • branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc

    r9818 r9821  
    2828#include "t_animation.h"
    2929#include "script_class.h"
     30
     31#include "resource_shader.h"
    3032
    3133#include "class_id_DEPRECATED.h"
     
    120122    this->skydome->setTexture(noise3DTexName);
    121123
    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");
    124125
    125126    this->shader.activateShader();
Note: See TracChangeset for help on using the changeset viewer.