Changeset 2778 in orxonox.OLD

Timestamp:

Nov 10, 2004, 3:54:08 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: reimplemented class material. searcher works now, all options are really set.

Location:

orxonox/branches/importer/importer

Files:

• material.cc (modified) (7 diffs)
• material.h (modified) (3 diffs)
• object.cc (modified) (2 diffs)

orxonox/branches/importer/importer/material.cc

@@ -1 +1 @@
 #include "material.h"
-
-Material* Material::firstMat = NULL;
-Material* Material::currentMat = NULL;
 
 Material::Material()
 {
   init();
+  
+  setName ("");
 }
 
@@ -16 +15 @@
 }
 
+Material* Material::addMaterial(char* mtlName)
+{
+  Material* newMat = new Material(mtlName);
+  Material* tmpMat = this;
+  while (tmpMat->nextMat != NULL)
+    {
+      tmpMat = tmpMat->nextMat;
+    }
+      tmpMat->nextMat = newMat;
+      return newMat;
+  
+}
+
 void Material::init(void)
 {
-  if (firstMat == NULL)
-    firstMat = this;
-  else 
-    currentMat->nextMat = this;
-  currentMat = this;
   nextMat = NULL;
+
+  setIllum(1);
+  setDiffuse(0,0,0);
+  setAmbient(0,0,0);
+  setSpecular(0,0,0);
+  setTransparency(0.0);
 }
 
@@ -29 +42 @@
 void Material::setName (char* mtlName)
 {
-  name = mtlName;
-  //printf ("adding new Material: %s, %p\n", firstMat->name, firstMat);
+  strcpy(name, mtlName);
+  //  printf ("adding new Material: %s, %p\n", this->getName(), this);
 
+}
+char* Material::getName (void)
+{
+  return name;
 }
 
@@ -50 +67 @@
   diffuse[1] = g;
   diffuse[2] = b;
-  printf ("setting Diffuse Color to r=%f g=%f b=%f\n", r, g, b);
+  //  printf ("setting Diffuse Color to r=%f g=%f b=%f\n", r, g, b);
 }
 void Material::setDiffuse (char* rgb)
@@ -64 +81 @@
   ambient[1] = g;
   ambient[2] = b;
-  printf ("setting Ambient Color to r=%f g=%f b=%f\n", r, g, b);
+  //  printf ("setting Ambient Color to r=%f g=%f b=%f\n", r, g, b);
 }
 void Material::setAmbient (char* rgb)
@@ -78 +95 @@
   specular[1] = g;
   specular[2] = b;
-  printf ("setting Specular Color to r=%f g=%f b=%f\n", r, g, b);
+  //printf ("setting Specular Color to r=%f g=%f b=%f\n", r, g, b);
 }
 void Material::setSpecular (char* rgb)
@@ -98 +115 @@
   setTransparency (atof(tr));
 }
+
+
+Material* Material::search (char* mtlName)
+{
+  Material* searcher = this;
+  while (searcher != NULL)
+    {
+      if (!strcmp (searcher->getName(), mtlName))
+        return searcher;
+      searcher = searcher->nextMat;
+    }
+  return NULL;
+}
+
+bool Material::select (void)
+{
+  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
+}

orxonox/branches/importer/importer/material.h

@@ -11 +11 @@
   Material ();
   Material (char* mtlName);
+  Material* addMaterial(char* mtlName);
+
   void init(void);
   ~Material ();
-  
+
+
   void setName (char* mtlName);
+  char* getName (void);
   void setIllum (int illum);
   void setIllum (char* illum);
@@ -26 +30 @@
   void setTransparency (char* trans);
 
+  Material* search (char* mtlName);
 
   bool select (void);
 
+  Material* nextMat;
+
  private:
-  char* name;
+  char name [50];
   int illumModel;
   float diffuse [3];
@@ -37 +44 @@
   float transparency;
 
-  Material* nextMat;
-  static Material* firstMat;
-  static Material* currentMat;
 };
 #endif

orxonox/branches/importer/importer/object.cc

@@ -191 +191 @@
   vertices = new Array();
   faces = new Array();
-  
+  material = new Material();
+  Material* tmpMat = material;
   while(!MTL_FILE->eof())
     {
@@ -201 +202 @@
       if (!strncmp(Buffer, "newmtl ", 2))
         {
-          material = new Material(Buffer+7);
+          tmpMat = tmpMat->addMaterial(Buffer+7);
+          printf ("%s, %p\n", tmpMat->getName(), tmpMat);
         }
       // setting a illumMode
       else if (!strncmp(Buffer, "illum", 5))
         {
-          material->setIllum(Buffer+6);
+          tmpMat->setIllum(Buffer+6);
+
         }
       // setting Diffuse Color
       else if (!strncmp(Buffer, "Kd", 2))
         {
-          material->setDiffuse(Buffer+3);
+          tmpMat->setDiffuse(Buffer+3);
         }
       // setting Ambient Color
       else if (!strncmp(Buffer, "Ka", 2))
         {
-          material->setAmbient(Buffer+3);
+          tmpMat->setAmbient(Buffer+3);
         }
       // setting Specular Color
       else if (!strncmp(Buffer, "Ks", 2))
         {
-          material->setSpecular(Buffer+3);
-        }
-     
-
-
+          tmpMat->setSpecular(Buffer+3);
+        }
     }
   return true;