Changeset 6645 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 21, 2006, 4:56:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: totally remastered the ResourceManager.
Now it takes MultiTypes instead of (void*) as parameters

1. This is TypeSafe
2. This is easier to use
3. This makes much more sense, and is objectOriented

also made some minor adjustments to the MultiType, some comparisons

also fixed the loading in all the Other classes like material md2 and so on

File:

• trunk/src/world_entities/environments/water.cc (modified) (1 diff)

trunk/src/world_entities/environments/water.cc

@@ -53 +53 @@
   this->rebuildGrid();
   this->waterMaterial = new Material();
-  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, (void*)"shaders/water.frag");
+  this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
 
   this->grid->height(this->grid->columns()/2,this->grid->rows()/2) = 100;