Changeset 10090 in orxonox.OLD

Timestamp:

Dec 18, 2006, 12:13:47 PM (17 years ago)

Author:

patrick

Message:

mount points found but not yet parsed

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/obj/objModel.cc (modified) (1 diff)
• lib/graphics/importer/oif/resource_oif.cc (modified) (1 diff)
• lib/graphics/importer/static_model.cc (modified) (1 diff)
• lib/graphics/importer/static_model_data.cc (modified) (1 diff)
• world_entities/npcs/npc_test.cc (modified) (2 diffs)
• world_entities/npcs/npc_test.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

branches/mount_points/src/lib/graphics/importer/obj/objModel.cc

@@ -44 +44 @@
 
   this->finalize();
+
+  this->extractMountPoints();
 }
 

branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc

@@ -33 +33 @@
   else
   {
-    PRINTF(0)("NOT FOUND OIF: %s\n", fileName.c_str());
+    PRINTF(4)("NOT FOUND OIF: %s\n", fileName.c_str());
 //     std::string modelFileName = this->Resource::locateFile(modelName);
 //     //std::string skinFileName = this->Resource::locateFile(skinName);

branches/mount_points/src/lib/graphics/importer/static_model.cc

@@ -105 +105 @@
   for( ; groupPtr != NULL; groupPtr = groupPtr->next)
   {
+    //PRINTF(0)("Found a MountPoint: %s\n", groupName.c_str());
+
     // get the name of this group and check if it's a mout point identifier
     std::string groupName = groupPtr->name;
     if( groupName.find("MP.", 0) != std::string::npos)
-    {}
+    {
+      PRINTF(0)("Found a MountPoint: %s\n", groupName.c_str());
+
+    }
   }
 }

branches/mount_points/src/lib/graphics/importer/static_model_data.cc

@@ -368 +368 @@
 bool StaticModelData::addGroup(const std::string& groupString)
 {
-  PRINTF(0)("Read Group: %s.\n", groupString.c_str());
+  PRINTF(4)("Read Group: %s.\n", groupString.c_str());
   if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
   {

branches/mount_points/src/world_entities/npcs/npc_test.cc

@@ -39 +39 @@
   this->registerObject(this, NPC2::_objectList);
 
-  if ((float)rand()/RAND_MAX > .5f)
-    this->loadModel("models/ships/bolido.obj", 6);
-  else
-    this->loadModel("models/ships/gobblin.obj", 6);
+//   if ((float)rand()/RAND_MAX > .5f)
+//     this->loadModel("models/ships/bolido.obj", 6);
+//   else
+//     this->loadModel("models/ships/gobblin.obj", 6);
 
 
@@ -84 +84 @@
  * Just override this function with whatever you want to be drawn.
  */
-void NPC2::draw() const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
-//     shader->activateShader();
-
-  this->getModel()->draw();
-//   shader->deactivateShader();
-
-
-/*  if (this->model)
-    this->model->draw();*/
-  glPopMatrix();
-}
+// void NPC2::draw() const
+// {
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+//   float matrix[4][4];
+//
+//   /* translate */
+//   glTranslatef (this->getAbsCoor ().x,
+//                 this->getAbsCoor ().y,
+//                 this->getAbsCoor ().z);
+//   /* rotate */
+//   this->getAbsDir ().matrix (matrix);
+//   glMultMatrixf((float*)matrix);
+//
+// //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
+// //     shader->activateShader();
+//
+//   if( this->getModel())
+//     this->getModel()->draw();
+// //   shader->deactivateShader();
+//
+//
+// /*  if (this->model)
+//     this->model->draw();*/
+//   glPopMatrix();
+// }
 
 

branches/mount_points/src/world_entities/npcs/npc_test.h

@@ -22 +22 @@
 
   virtual void tick(float dt);
-  virtual void draw() const;
+//   virtual void draw() const;
 
  private:

branches/mount_points/src/world_entities/world_entity.cc

@@ -271 +271 @@
 void WorldEntity::loadObjectInformationFile(const std::string& fileName)
 {
-  PRINTF(0)("loading the oif File: %s\n", fileName.c_str());
+  PRINTF(4)("loading the oif File: %s\n", fileName.c_str());
 
   this->oiFile = new ObjectInformationFile(fileName);