Changeset 3093 in orxonox.OLD for orxonox

Timestamp:

Dec 5, 2004, 12:47:33 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: moved things to where they belong

Location:

orxonox/branches/images/importer

Files:

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

orxonox/branches/images/importer/material.cc

@@ -45 +45 @@
   if (name)
     delete []name;
+  if (diffuseTextureSet)
+    glDeleteTextures (1, &diffuseTexture);
   if (verbose >= 2)
     printf ("delete Material %s.\n", name);

orxonox/branches/images/importer/material.h

@@ -31 +31 @@
   Material* search (char* mtlName);
   bool select (void);
-
-  GLuint diffuseTexture;
-  GLuint ambientTexture;
-  GLuint specularTexture;
-  
-  bool diffuseTextureSet;
-  bool ambientTextureSet;
-  bool specularTextureSet;
 
   void setName (char* mtlName);
@@ -82 +74 @@
   float shininess;
   float transparency;
+
+  GLuint diffuseTexture;
+  GLuint ambientTexture;
+  GLuint specularTexture;
+  
+  bool diffuseTextureSet;
+  bool ambientTextureSet;
+  bool specularTextureSet;
+
   Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
 

orxonox/branches/images/importer/object.cc

@@ -80 +80 @@
       walker = walker->next;
       delete delWalker;
-    } 
+    }
+
+  if (verbose >=2)
+    printf("Deleting Materials.\n");
+  if (material != NULL)
+    delete material;
+
 }
 
@@ -245 +251 @@
   if (normals != NULL)
     delete normals;
-
-  if (material != NULL)
-    delete material;
 
   cleanupGroup(firstGroup);