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

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

Files:

• environments/water.cc (modified) (2 diffs)
• environments/water.h (modified) (2 diffs)
• skybox.cc (modified) (3 diffs)
• skybox.h (modified) (1 diff)

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

branches/new_class_id/src/world_entities/skybox.cc

@@ -27 +27 @@
 #include "network_game_manager.h"
 #include "converter.h"
-#include "util/loading/resource_manager.h"
+#include "resource_texture.h"
 
 #include "debug.h"
@@ -113 +113 @@
     if (this->material[i])
       delete this->material[i];
-    if (this->cubeTexture[i])
-      ResourceManager::getInstance()->unload(this->cubeTexture[i]);
   }
 }
@@ -175 +173 @@
                                   const std::string& posZ, const std::string& posX, const std::string& negX)
 {
-  this->cubeTexture[0] = (Texture*)ResourceManager::getInstance()->load(negX, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT);
-  this->cubeTexture[1] = (Texture*)ResourceManager::getInstance()->load(posX, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT);
-
-  this->cubeTexture[2] = (Texture*)ResourceManager::getInstance()->load(negY, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT);
-  this->cubeTexture[3] = (Texture*)ResourceManager::getInstance()->load(posY, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT);
-
-  this->cubeTexture[4] = (Texture*)ResourceManager::getInstance()->load(negZ, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT);
-  this->cubeTexture[5] = (Texture*)ResourceManager::getInstance()->load(posZ, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT);
+  this->cubeTexture[0] = ResourceTexture(negX, GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT);
+  this->cubeTexture[1] = ResourceTexture(posX, GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT);
+
+  this->cubeTexture[2] = ResourceTexture(negY, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT);
+  this->cubeTexture[3] = ResourceTexture(posY, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT);
+
+  this->cubeTexture[4] = ResourceTexture(negZ, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT);
+  this->cubeTexture[5] = ResourceTexture(posZ, GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT);
 }
 

branches/new_class_id/src/world_entities/skybox.h

@@ -65 +65 @@
 
   Material*       material[6];     //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
-  Texture*        cubeTexture[6];  //!< Textures for the CubeMap.
+  Texture         cubeTexture[6];  //!< Textures for the CubeMap.
 
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.