Changeset 4834 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 11, 2005, 5:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

Location:

orxonox/trunk/src/lib

Files:

• event/event_handler.h (modified) (1 diff)
• event/key_mapper.cc (modified) (2 diffs)
• graphics/graphics_engine.cc (modified) (3 diffs)
• graphics/graphics_engine.h (modified) (1 diff)
• graphics/importer/material.cc (modified) (2 diffs)
• graphics/importer/model.cc (modified) (4 diffs)
• graphics/importer/model.h (modified) (1 diff)
• graphics/text_engine.cc (modified) (1 diff)
• particles/particle_engine.cc (modified) (1 diff)

orxonox/trunk/src/lib/event/event_handler.h

@@ -12 +12 @@
 #include "event_def.h"
 
+// FORWARD DECLARATION
 class EventListener;
-
+template <class T> class tList;
 
 //! The one Event Handler from Orxonox

orxonox/trunk/src/lib/event/key_mapper.cc

@@ -57 +57 @@
 //! this is the mapping array from names to ids: enter all orxonox.conf keys here
 /** @todo use globals.h for this.... everything is done there for those Options,
- * and you do not have to care about The namings
+ * and you do not have to care about The namings, as they might change
  */
 orxKeyMapping map[] = {
-  {&KeyMapper::PEV_UP,                   "Up"},
-  {&KeyMapper::PEV_DOWN,                 "Down"},
-  {&KeyMapper::PEV_LEFT,                 "Left"},
-  {&KeyMapper::PEV_RIGHT,                "Right"},
+  {&KeyMapper::PEV_UP,                   CONFIG_NAME_PLAYER_UP},
+  {&KeyMapper::PEV_DOWN,                 CONFIG_NAME_PLAYER_DOWN},
+  {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT},
+  {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT},
   {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
   {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
 
-  {&KeyMapper::PEV_FIRE1,                "Fire"},
+  {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE},
   {&KeyMapper::PEV_FIRE1,                "Fire1"},
   {&KeyMapper::PEV_FIRE2,                "Fire2"},
@@ -74 +74 @@
 
 
-  {&KeyMapper::PEV_VIEW0,                "view0"},
-  {&KeyMapper::PEV_VIEW1,                "view1"},
-  {&KeyMapper::PEV_VIEW2,                "view2"},
-  {&KeyMapper::PEV_VIEW3,                "view3"},
-  {&KeyMapper::PEV_VIEW4,                "view4"},
-  {&KeyMapper::PEV_VIEW5,                "view5"},
-
-  {&KeyMapper::PEV_NEXT_WORLD,           "Next-World"},
-  {&KeyMapper::PEV_PREVIOUS_WORLD,       "Prev-World"},
-
-  {&KeyMapper::PEV_PAUSE,                "Pause"},
-  {&KeyMapper::PEV_QUIT,                 "Quit"},
+  {&KeyMapper::PEV_VIEW0,                CONFIG_NAME_VIEW0},
+  {&KeyMapper::PEV_VIEW1,                CONFIG_NAME_VIEW1},
+  {&KeyMapper::PEV_VIEW2,                CONFIG_NAME_VIEW2},
+  {&KeyMapper::PEV_VIEW3,                CONFIG_NAME_VIEW3},
+  {&KeyMapper::PEV_VIEW4,                CONFIG_NAME_VIEW4},
+  {&KeyMapper::PEV_VIEW5,                CONFIG_NAME_VIEW5},
+
+  {&KeyMapper::PEV_NEXT_WORLD,           CONFIG_NAME_NEXT_WORLD},
+  {&KeyMapper::PEV_PREVIOUS_WORLD,       CONFIG_NAME_PREV_WORLD},
+
+  {&KeyMapper::PEV_PAUSE,                CONFIG_NAME_PAUSE},
+  {&KeyMapper::PEV_QUIT,                 CONFIG_NAME_QUIT},
   {NULL, NULL}
 };

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -325 +325 @@
   glDisable(GL_CULL_FACE);
   glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
-  glEnable(GL_TEXTURE_2D);
-
-  /* This allows alpha blending of 2D textures with the scene */
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
   glViewport(0, 0, screen->w, screen->h);
@@ -351 +346 @@
 void GraphicsEngine::leave2DMode()
 {
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+
   glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
-
-  glMatrixMode(GL_PROJECTION);
   glPopMatrix();
 
@@ -444 +439 @@
       this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
-      this->geTextCFPS->setPosition(5, 500);
+      this->geTextCFPS->setPosition(5, 5);
       this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
-      this->geTextMaxFPS->setPosition(5, 530);
+      this->geTextMaxFPS->setPosition(5, 35);
       this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
-      this->geTextMinFPS->setPosition(5, 560);
+      this->geTextMinFPS->setPosition(5, 65);
 #endif /* NO_TEXT */
     }

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -68 +68 @@
 
     /** \brief swaps the GL_BUFFERS */
-    static void swapBuffers() { SDL_GL_SwapBuffers(); };
+    inline static void swapBuffers() { SDL_GL_SwapBuffers(); };
 
     void process(const Event  &event);

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -57 +57 @@
 {
   PRINTF(4)("delete Material %s.\n", this->getName());
+
   if (this->diffuseTexture)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
+  if (this->ambientTexture)
+    ResourceManager::getInstance()->unload(this->ambientTexture);
+  if (this->specularTexture)
+    ResourceManager::getInstance()->unload(this->specularTexture);
 }
 
@@ -267 +272 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
 
-  //! \todo check if RESOURCE MANAGER is availiable
-  //! \todo Textures from .mtl-file need special care.
-  this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+  //! @todo check if RESOURCE MANAGER is availiable
+  //! @todo Textures from .mtl-file need special care.
+  if (dMap!= NULL)
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+  else
+    this->diffuseTexture = NULL;
 }
 

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

@@ -159 +159 @@
 
   this->materialList = new tList<Material>;
+  this->materialsExtern = false;
 
   if (this->type == MODEL_VERTEX_ARRAY)
@@ -186 +187 @@
 
   // deleting the MaterialList
-  PRINTF(5)("Deleting Materials.\n");
-  tIterator<Material>* tmpIt = this->materialList->getIterator();
-  Material* material = tmpIt->nextElement();
-
-  //! \todo do we really have to delete this material??
-  while(material)
+  if (!this->materialsExtern)
+  {
+    PRINTF(5)("Deleting Materials.\n");
+
+    tIterator<Material>* tmpIt = this->materialList->getIterator();
+    Material* material = tmpIt->nextElement();
+  //! @todo do we really have to delete this material??
+    while(material)
     {
       delete material;
       material = tmpIt->nextElement();
     }
-  delete tmpIt;
+    delete tmpIt;
+  }
   delete materialList;
   delete this->pModelInfo;
@@ -356 +360 @@
 /**
    \brief finalizes an Model.
-   This funcion is needed, to delete all the Lists, and arrays that are no more needed because they are already imported into openGL. This will be applied at the end of the importing Process.
+ * This funcion is needed, to delete all the Lists, and arrays that are no more
+ * needed because they are already imported into openGL.
+ * This will be applied at the end of the importing Process.
 */
 bool Model::cleanup()
@@ -372 +378 @@
    \param material the Material to add
    \returns the added material
-
-   !! beware the Material will be deleted when the Model gets deleted
+ *
+ * this also tells this Model, that all the Materials are handled externally
+ * with this option set the Materials will not be deleted with the Model.
+ * !! -> NO MATERIALS GET DELETED WITH ONE CALL TO THIS FUNCTION !!
 */
 Material* Model::addMaterial(Material* material)
 {
   this->materialList->add(material);
+  this->materialsExtern = true;
   return material;
 }

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

@@ -190 +190 @@
 
   tList<Material>* materialList;    //!< A list for all the Materials in this Model
+  bool             materialsExtern; //!< If the materials given to this Object are extern.
 };
 

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -919 +919 @@
   // entering 3D-mode
   GraphicsEngine::enter2DMode();
+  glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
   // drawing all the texts
   tIterator<Text>* textIterator = textList->getIterator();

orxonox/trunk/src/lib/particles/particle_engine.cc

@@ -96 +96 @@
   }
 }
-
-
 
 /**