Changeset 6693 in orxonox.OLD for branches/network/src/lib/graphics

Timestamp:

Jan 25, 2006, 2:19:46 PM (19 years ago)

Author:

patrick

Message:

branches: removed spaceshipcontrol branche

Location:

branches/network/src/lib/graphics

Files:

• importer/material.cc (modified) (2 diffs)
• importer/md2Model.cc (modified) (1 diff)
• shader.cc (modified) (1 diff)
• text_engine/text.cc (modified) (1 diff)

branches/network/src/lib/graphics/importer/material.cc

@@ -81 +81 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (m.diffuseTexture != NULL)
-    this->diffuseTexture = m.diffuseTexture; /// HACK shoudl be:(Texture*)ResourceManager::getInstance()->load();
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->copy(m.diffuseTexture);
   this->ambientTexture = NULL; /// FIXME
   this->specularTexture = NULL; /// FIXME
@@ -303 +303 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap != NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
   else
     this->diffuseTexture = NULL;

branches/network/src/lib/graphics/importer/md2Model.cc

@@ -78 +78 @@
 {
   /* this creates the data container via ressource manager */
-  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);
+  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName);
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");

branches/network/src/lib/graphics/shader.cc

@@ -106 +106 @@
 Shader* Shader::getShader(const char* vertexShaderFile, const char* fragmentShaderFile)
 {
-  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, (void*)fragmentShaderFile);
+  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, fragmentShaderFile);
 }
 

branches/network/src/lib/graphics/text_engine/text.cc

@@ -92 +92 @@
   if (fontFile != NULL)
   {
-    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
+    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
     if (tmpFont != NULL)
       this->font = tmpFont;