Changeset 5790 in orxonox.OLD

Timestamp:

Nov 27, 2005, 12:17:07 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: rescale of the screen-size should reload Models too on windows

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (2 diffs)
• importer/abstract_model.h (modified) (1 diff)
• importer/model.cc (modified) (4 diffs)
• importer/model.h (modified) (1 diff)
• importer/texture.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -35 +35 @@
  #include "texture.h"
  #include "list.h"
+ #include "model.h"
 #endif
 using namespace std;
@@ -308 +309 @@
     glViewport(0, 0, width, height);                     // Reset The Current Viewport
 
+#ifdef __WIN32__
     // REBUILDING TEXTURES (ON WINDOWS CONTEXT SWITCH)
-#ifdef __WIN32__
     std::list<BaseObject*>* texList = ClassList::getList(CL_TEXTURE);
     if (texList != NULL)
-      {
-        std::list<BaseObject*>::iterator reTex;
-        for (reTex = texList->begin(); reTex != texList->end(); reTex++)
-          dynamic_cast<Texture*>(*reTex)->rebuild();
-      }
+    {
+      std::list<BaseObject*>::iterator reTex;
+      for (reTex = texList->begin(); reTex != texList->end(); reTex++)
+        dynamic_cast<Texture*>(*reTex)->rebuild();
+    }
+    // REBUILDING MODELS
+    std::list<BaseObject*>* modelList = ClassList::getList(CL_MODEL);
+    if (texList != NULL)
+    {
+      std::list<BaseObject*>::iterator reModel;
+      for (reModel = modelList->begin(); reModel != modelList->end(); reModel++)
+        dynamic_cast<Model*>(*reModel)->rebuild();
+    }
 #endif /* __WIN32__ */
 }

trunk/src/lib/graphics/importer/abstract_model.h

@@ -128 +128 @@
 
   public:
-    AbstractModel() {}
-    virtual ~AbstractModel() {}
+    AbstractModel() { }
+    virtual ~AbstractModel() { }
 
     inline const modelInfo* getModelInfo() const { return this->pModelInfo; }

trunk/src/lib/graphics/importer/model.cc

@@ -143 +143 @@
 Model::Model(const char* modelName, MODEL_TYPE type)
 {
+  this->setClassID(CL_MODEL, "Model");
   PRINTF(4)("new 3D-Model is being created\n");
   this->setName(modelName);
@@ -178 +179 @@
   PRINTF(4)("Deleting Model ");
   if (this->getName())
-    {
-      PRINT(4)("%s\n", this->getName());
-    }
+  {
+    PRINT(4)("%s\n", this->getName());
+  }
   else
-      PRINT(4)("\n");
+  {
+    PRINT(4)("\n");
+  }
+  this->cleanup();
 
   PRINTF(5)("Deleting display Lists.\n");
@@ -216 +220 @@
   //if (this->type == MODEL_DISPLAY_LIST)
     //this->deleteArrays();
-  this->cleanup();
+  //  this->cleanup();
 
   /* load the ModelInfo */
@@ -230 +234 @@
 
   this->finalized = true;
+}
+
+/**
+ * rebuild the Model from the Information we got.
+ */
+void Model::rebuild()
+{
+  PRINTF(3)("Rebuilding Model '%s'\n", this->getName());
+  this->finalize();
+
 }
 

trunk/src/lib/graphics/importer/model.h

@@ -114 +114 @@
   void draw(char* groupName) const;
 
+  void rebuild();
+
   /** @returns Count of the Models (Groups) in this File */
   inline int getGroupCount() const { return this->groupCount; };

trunk/src/lib/graphics/importer/texture.cc

@@ -118 +118 @@
   if (this->image != NULL)
     {
-      PRINTF(1)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
+      PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
       this->loadTexToGL();
     }