Changeset 7229 in orxonox.OLD for branches/resources/src/lib/graphics

Timestamp:

Mar 21, 2006, 3:13:34 PM (19 years ago)

Author:

bensch

Message:

resources: some minor implementations

Location:

branches/resources/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• importer/material.cc (modified) (2 diffs)
• importer/texture.h (modified) (3 diffs)
• text_engine/text.cc (modified) (1 diff)

branches/resources/src/lib/graphics/graphics_engine.cc

@@ -357 +357 @@
 
 #ifdef __WIN32__
+  // renewing GL-settings
+  glEnable(GL_DEPTH_TEST);
+
   // REBUILDING TEXTURES (ON WINDOWS CONTEXT SWITCH)
   const std::list<BaseObject*>* texList = ClassList::getList(CL_TEXTURE);

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

@@ -83 +83 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (m.diffuseTexture != NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->copy(m.diffuseTexture);
+    this->diffuseTexture = dynamic_cast<Texture*>(ResourceManager::getInstance()->copy(m.diffuseTexture));
   this->ambientTexture = NULL; /// FIXME
   this->specularTexture = NULL; /// FIXME
@@ -298 +298 @@
   //! @todo Textures from .mtl-file need special care.
   if (!dMap.empty())
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
+    this->diffuseTexture = dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
   else
     this->diffuseTexture = NULL;

branches/resources/src/lib/graphics/importer/texture.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "lib/util/loading/resource.h"
 
 #include "glincl.h"
@@ -15 +16 @@
 
 //! A Class, that reads in Textures from different fileformats.
-  class Texture : public BaseObject
+  class Texture : public Loading::Resource
   {
     public:
@@ -43 +44 @@
 
     protected:
-
       bool setSurface(SDL_Surface* newSurface);
       bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };

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

@@ -88 +88 @@
   if (!fontFile.empty())
   {
-    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
+    tmpFont = dynamic_cast<Font*>(ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize));
     if (tmpFont != NULL)
       this->font = tmpFont;