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

Timestamp:

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

Author:

bensch

Message:

orxonox/new_class_id: now it should also be possible, to cache the resources, by suppling a LoadString.
This is vital to loading Resources, when you only know the TypeName and a LoadString, but not the c++-type and the LoadParameters as is the case when loading over the internet.

Location:

branches/new_class_id/src/world_entities/environments

Files:

• water.cc (modified) (2 diffs)
• water.h (modified) (2 diffs)

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

@@ -23 +23 @@
 #include "material.h"
 
-#include "util/loading/resource_manager.h"
-#include "shader.h"
+#include "resource_shader.h"
 
 #include "skybox.h"
@@ -56 +55 @@
 
   this->rebuildGrid();
-  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
+  this->waterShader = ResourceShader("shaders/water.vert", "shaders/water.frag");
 
   // To test the Wave equation

branches/new_class_id/src/world_entities/environments/water.h

@@ -13 +13 @@
 #include "world_entity.h"
 #include "material.h"
-
+#include "shader.h"
 
 /* FORWARD DECLARATION */
 class Grid;
-class Shader;
 
 //! A Class to handle a WaterEffects
@@ -52 +51 @@
 
     Material        waterMaterial;
-    Shader*         waterShader;
+    Shader          waterShader;
 
     float           height;          //!< The hight of the Water