Changeset 3913 in orxonox.OLD

Timestamp:

Apr 21, 2005, 1:38:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: importer: functionality improvement

Location:

orxonox/trunk/src

Files:

• lib/graphics/importer/model.cc (modified) (5 diffs)
• lib/graphics/importer/model.h (modified) (3 diffs)
• lib/graphics/importer/objModel.cc (modified) (2 diffs)
• world_entities/skybox.cc (modified) (1 diff)

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

@@ -27 +27 @@
 using namespace std;
 
+//////////////////
+// DE-CONSTRUCT //
+//////////////////
 /**
    \brief Creates a 3D-Model. and assigns it a Name.
@@ -313 +316 @@
 // MESH //
 //////////
+/**
+   \brief adds a new Material to the Material List
+   \param material the Material to add
+   \returns the added material
+
+   !! beware the Material will be deleted when the Model gets deleted
+*/
+Material* Model::addMaterial(Material* material)
+{
+  this->materialList->add(material);
+  return material;
+}
+
+/**
+   \brief adds a new Material to the Material List
+   \param material the name of the Material to add
+   \returns the added material
+*/
+Material* Model::addMaterial(const char* materialName)
+{
+  
+  Material* newMat = new Material();
+  newMat->setName(materialName);
+
+  // adding material to the List of materials
+  this->materialList->add(newMat);  
+  return newMat;
+}
+
+Material* Model::findMaterialByName(const char* materialName)
+{
+  tIterator<Material>* tmpIt = this->materialList->getIterator();
+  Material* material = tmpIt->nextElement();
+  while(material)
+    {
+      if (!strcmp(material->getName(), materialName))
+        {
+          delete tmpIt;
+          return material;
+        }
+      material = tmpIt->nextElement();
+    }
+  delete tmpIt;
+  return NULL;
+}
+
 /**
    \brief parses a group String
@@ -534 +583 @@
    \param matString the Material that will be set.
 */
-bool Model::addUseMtl(const char* matString)
+bool Model::setMaterial(const char* matString)
 {
   if (this->currentGroup->faceCount > 0)
@@ -550 +599 @@
    \param mtl the Material that will be set.
 */
-bool Model::addUseMtl(Material* mtl)
+bool Model::setMaterial(Material* mtl)
 {
   if (this->currentGroup->faceCount > 0)
@@ -572 +621 @@
 */
 bool Model::buildVertexNormals ()
-{
-  
+{  
   PRINTF(4)("Normals are being calculated.\n");
 

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

@@ -101 +101 @@
   Material* material;   //!< Initial pointer to the Material. This can hold many materials, because Material can be added with Material::addMaterial(..)
 
+  Material* findMaterialByName(const char* materialName);
+
   void cubeModel(void);
 
@@ -115 +117 @@
   int getGroupCount() const;
 
+  Material* addMaterial(Material* material);
+  Material* addMaterial(const char* materialName);
+
   bool addGroup(const char* groupString);
   bool addVertex(const char* vertexString);
@@ -124 +129 @@
   bool addVertexTexture(const char* vTextureString);
   bool addVertexTexture(float u, float v);
-  bool addUseMtl(const char* mtlString);
-  bool addUseMtl(Material* mtl);
+  bool setMaterial(const char* mtlString);
+  bool setMaterial(Material* mtl);
   void finalize(void);
 };

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

@@ -153 +153 @@
       else if (!strncmp(buffer, "usemtl ", 7))
         {
-          this->addUseMtl (buffer+7);
+          this->setMaterial (buffer+7);
         }
 
@@ -222 +222 @@
         {
           tmpMat = tmpMat->addMaterial(buffer+7);
-          //      PRINTF(2)("%s, %p\n", tmpMat->getName(), tmpMat);
         }
       // setting a illumMode

orxonox/trunk/src/world_entities/skybox.cc

@@ -187 +187 @@
   model->addVertexNormal (-1.0, 0.0, 0.0);
 
-  model->addUseMtl(material[0]);
+  model->setMaterial(material[0]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,2,4, 4,3,4, 6,4,4, 5,1,4); // top
-  model->addUseMtl(material[1]);
+  model->setMaterial(material[1]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,4,2, 8,1,2, 2,2,2, 1,3,2); // bottom
-  model->addUseMtl(material[2]);
+  model->setMaterial(material[2]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,3, 2,2,3, 4,3,3, 3,4,3); // left
-  model->addUseMtl(material[3]);
+  model->setMaterial(material[3]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,3,1, 6,4,1, 8,1,1, 7,2,1); // right
-  model->addUseMtl(material[4]);
+  model->setMaterial(material[4]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,6, 8,2,6, 6,3,6, 4,4,6); // front
-  model->addUseMtl(material[5]);
+  model->setMaterial(material[5]);
   model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,1,5, 1,2,5, 3,3,5, 5,4,5); // back