Changeset 10052 in orxonox.OLD

Timestamp:

Dec 13, 2006, 12:22:11 AM (17 years ago)

Author:

patrick

Message:

integrating loading to we

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/oif/object_information_file.cc (modified) (1 diff)
• lib/graphics/importer/oif/object_information_file.h (modified) (2 diffs)
• lib/graphics/importer/oif/resource_oif.cc (modified) (2 diffs)
• lib/graphics/importer/oif/resource_oif.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (4 diffs)
• world_entities/world_entity.h (modified) (3 diffs)

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

@@ -21 +21 @@
 
 
+
 /**
  * standard constructor
+ */
+ObjectInformationFile::ObjectInformationFile()
+{
+}
+
+/**
+ *  constructor
  * @todo this constructor is not jet implemented - do it
 */
-ObjectInformationFile::ObjectInformationFile()
+ObjectInformationFile::ObjectInformationFile(const std::string& fileName)
 {
-  this->data = ResourceOIF("adsf").data;
+  // load the oif file
+  this->data = ResourceOIF(fileName).data;
 
 }

branches/mount_points/src/lib/graphics/importer/oif/object_information_file.h

@@ -7 +7 @@
 #define _OBJECT_INFORMATION_FILE_H
 
-#include "vertex_array_model.h"
+#include "base_object.h"
 
 #include "count_pointer.h"
@@ -29 +29 @@
 
 //! A class for object informations
-class ObjectInformationFile : public VertexArrayModel
+class ObjectInformationFile : BaseObject
 {
 
 public:
   ObjectInformationFile();
+  ObjectInformationFile(const std::string& fileName);
   virtual ~ObjectInformationFile();
 

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

@@ -7 +7 @@
 
 
-ResourceOIF::ResourceOIF(const std::string& modelName, const Resources::KeepLevel& keepLevel)
+ResourceOIF::ResourceOIF(const std::string& fileName, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceOIF::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(loadString(modelName));
+  Resources::StorePointer* ptr = this->acquireResource(fileName);
 
   if (ptr)
   {
-    PRINTF(0)("FOUND OIF: %s\n", modelName.c_str());
+    PRINTF(0)("FOUND OIF: %s\n", fileName.c_str());
     //this->acquireData(static_cast<ResourceOIF::OIFResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(0)("NOT FOUND OIF: %s\n", modelName.c_str());
+    PRINTF(0)("NOT FOUND OIF: %s\n", fileName.c_str());
 //     std::string modelFileName = this->Resource::locateFile(modelName);
 //     //std::string skinFileName = this->Resource::locateFile(skinName);
@@ -31 +31 @@
 {
   SubString loadValues(loadString, ',');
-  std::string modelName;
-  std::string skinName;
-  float scale = 1.0f;
+  std::string fileName;
   if (loadValues.size() > 0)
-    modelName = loadValues[0];
-  if (loadValues.size() > 1)
-    skinName = loadValues[1];
-  if (loadValues.size() > 2)
-    scale = MultiType(loadValues[2]).getFloat();
+    fileName = loadValues[0];
 
-  return ResourceOIF(modelName);
+  return ResourceOIF(fileName);
 }
 
-std::string ResourceOIF::loadString(const std::string& modelName)
-{
-  return modelName;
-}
 
 

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

@@ -15 +15 @@
 {
 public:
-  ResourceOIF(const std::string& modelName,
-              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  ResourceOIF(const std::string& fileName, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
   static ResourceOIF createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
-  static std::string loadString(const std::string& modelName);
+
 
 private:

branches/mount_points/src/world_entities/world_entity.cc

@@ -24 +24 @@
 #include "md2/md2Model.h"
 #include "md3/md3_model.h"
+#include "oif/object_information_file.h"
 
 #include "aabb_tree_node.h"
@@ -191 +192 @@
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
+      // creating the model and loading it
       StaticModel* model = new StaticModel();
       *model = ResourceOBJ(fileName, this->scaling);
@@ -201 +203 @@
       else
         delete model;
+
+      // now get the object information file for this model, if any
+      std::string oifName = fileName.substr(0, fileName.length() - 3) + ".oif";
+      this->loadObjectInformationFile( oifName);
     }
     /// LOADING AN MD2-model
@@ -246 +252 @@
 
   this->models[modelNumber] = model;
+}
+
+
+
+/**
+ * loads the object information file for this model
+ * @param fileName the name of the file
+ */
+void WorldEntity::loadObjectInformationFile(const std::string& fileName)
+{
+  PRINTF(0)("loading the oif File: %s", fileName.c_str());
 }
 

branches/mount_points/src/world_entities/world_entity.h

@@ -32 +32 @@
 class AABBTreeNode;
 class Model;
+class ObjectInformationFile;
 
 
@@ -49 +50 @@
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
+
+  void loadObjectInformationFile(const std::string& fileName);
 
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
@@ -185 +188 @@
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
+  ObjectInformationFile*  oiFile;             //!< Reference to the object information file discribing the model of this WE
   std::string             md2TextureFileName; //!< the file name of the md2 model texture, only if this
   std::string             modelLODName;       //!< the name of the model lod file