Changeset 6167 in orxonox.OLD for branches/christmas_branche

Timestamp:

Dec 19, 2005, 11:37:06 PM (19 years ago)

Author:

patrick

Message:

christmas: md2 model loading issues

Location:

branches/christmas_branche/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/christmas_branche/src/lib/event/event_handler.cc

@@ -259 +259 @@
 {
   this->eventsGrabbed = grabEvents;
-  if(!grabEvents)
-    SDL_WM_GrabInput(SDL_GRAB_OFF);
-  else
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+//   if(!grabEvents)
+//     SDL_WM_GrabInput(SDL_GRAB_OFF);
+//   else
+//     SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -36 +36 @@
 using namespace std;
 
-CREATE_FACTORY(MD2Creature, CL_SPACE_SHIP);
+CREATE_FACTORY(MD2Creature, CL_MD2_CREATURE);
 
 /**
@@ -141 +141 @@
   this->registerEvent(KeyMapper::PEV_NEXT_WEAPON);
   this->registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
-  this->registerEvent(SDLK_PAGEUP);
-  this->registerEvent(SDLK_PAGEDOWN);
   this->registerEvent(EV_MOUSE_MOTION);
 

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -120 +120 @@
       }
 
-    PRINTF(4)("fetching %s\n", fileName);
-    if (scaling == 1.0)
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
-    else
-      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);
-    if (modelNumber == 0)
-    this->buildObbTree(4);
+      if( strchr(fileName, '.obj') != NULL)
+      {
+        PRINTF(4)("fetching OBJ file: %s\n", fileName);
+        if (scaling == 1.0)
+          this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
+        else
+          this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);
+
+        if( modelNumber == 0)
+          this->buildObbTree(4);
+      }
+      else if( strchr(fileName, '.md2') != NULL)
+      {
+        PRINTF(4)("fetching MD2 file: %s\n", fileName);
+        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
+      }
   }
   else