Changeset 3069 in orxonox.OLD for orxonox/trunk/importer

Timestamp:

Dec 3, 2004, 6:34:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: fixed Material Problem

Location:

orxonox/trunk/importer

Files:

• framework.cc (modified) (1 diff)
• material.cc (modified) (10 diffs)
• material.h (modified) (1 diff)
• object.cc (modified) (2 diffs)

orxonox/trunk/importer/framework.cc

@@ -1 +1 @@
 #include "framework.h"
 
-int verbose = 4;
+int verbose = 1;
 
 void DrawGLScene()

orxonox/trunk/importer/material.cc

@@ -44 +44 @@
 {
   if (verbose >= 2)
-    printf ("delete Material %s\n", name);
+    printf ("delete Material %s.\n", name);
   if (nextMat != NULL)
     delete nextMat;
@@ -57 +57 @@
 {
   if (verbose >=2)
-    printf ("adding Material %s\n", mtlName);
+    printf ("adding Material %s.\n", mtlName);
   Material* newMat = new Material(mtlName);
   Material* tmpMat = this;
@@ -64 +64 @@
       tmpMat = tmpMat->nextMat;
     }
-      tmpMat->nextMat = newMat;
-      return newMat;
+  tmpMat->nextMat = newMat;
+  return newMat;
   
 }
@@ -75 +75 @@
 {
   if (verbose >= 3)
-    printf ("initializing new Material\n");
+    printf ("initializing new Material.\n");
   nextMat = NULL;
 
@@ -93 +93 @@
 void Material::setName (char* mtlName)
 {
-  if (verbose >= 3)
-    printf("setting Material Name to %s", mtlName);
+  //  if (verbose >= 3)
+    printf("setting Material Name to %s.\n", mtlName);
+  name = new char [strlen(mtlName)];
   strcpy(name, mtlName);
   //  printf ("adding new Material: %s, %p\n", this->getName(), this);
@@ -135 +136 @@
 {
   if (verbose >= 3)
-    printf ("setting Diffuse Color of Material %s to r=%f g=%f b=%f\n", name, r, g, b);
+    printf ("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", name, r, g, b);
   diffuse[0] = r;
   diffuse[1] = g;
@@ -162 +163 @@
 {
   if (verbose >=3)
-    printf ("setting Ambient Color of Material %s to r=%f g=%f b=%f\n", name, r, g, b);
+    printf ("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", name, r, g, b);
   ambient[0] = r;
   ambient[1] = g;
@@ -188 +189 @@
 {
   if (verbose >= 3)
-    printf ("setting Specular Color of Material %s to r=%f g=%f b=%f\n", name, r, g, b);
+    printf ("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", name, r, g, b);
   specular[0] = r;
   specular[1] = g;
@@ -229 +230 @@
 {
   if (verbose >= 3)
-    printf ("setting Transparency of Material %s to %f\n", name, trans);
+    printf ("setting Transparency of Material %s to %f.\n", name, trans);
   transparency = trans;
 }
@@ -265 +266 @@
       searcher = searcher->nextMat;
     }
+  if (verbose >=3)
+    printf ("not found\n");
   return NULL;
 }

orxonox/trunk/importer/material.h

@@ -48 +48 @@
 
  private:
-  char name [50];
+  char* name;
   int illumModel;
   float diffuse [4];

orxonox/trunk/importer/object.cc

@@ -391 +391 @@
       else if (!strncmp(Buffer, "s ", 2))
         {
-          if (verbose >= 1)
+          if (verbose >= 2)
             printf("smoothing groups not supportet yet. line: %s\n", Buffer);
         }
@@ -644 +644 @@
               if (verbose >= 2)
                 printf ("using material %s for coming Faces.\n", tmpFace->materialString);
-              material->search(tmpFace->materialString)->select();
+              Material* tmpMat;
+              if ((tmpMat = material->search(tmpFace->materialString)) != NULL)
+                tmpMat->select();
 
             }