Changeset 3093 in orxonox.OLD for orxonox/branches/images/importer
- Timestamp:
- Dec 5, 2004, 12:47:33 AM (20 years ago)
- Location:
- orxonox/branches/images/importer
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/images/importer/material.cc
r3092 r3093 45 45 if (name) 46 46 delete []name; 47 if (diffuseTextureSet) 48 glDeleteTextures (1, &diffuseTexture); 47 49 if (verbose >= 2) 48 50 printf ("delete Material %s.\n", name); -
orxonox/branches/images/importer/material.h
r3091 r3093 31 31 Material* search (char* mtlName); 32 32 bool select (void); 33 34 GLuint diffuseTexture;35 GLuint ambientTexture;36 GLuint specularTexture;37 38 bool diffuseTextureSet;39 bool ambientTextureSet;40 bool specularTextureSet;41 33 42 34 void setName (char* mtlName); … … 82 74 float shininess; 83 75 float transparency; 76 77 GLuint diffuseTexture; 78 GLuint ambientTexture; 79 GLuint specularTexture; 80 81 bool diffuseTextureSet; 82 bool ambientTextureSet; 83 bool specularTextureSet; 84 84 85 Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists. 85 86 -
orxonox/branches/images/importer/object.cc
r3084 r3093 80 80 walker = walker->next; 81 81 delete delWalker; 82 } 82 } 83 84 if (verbose >=2) 85 printf("Deleting Materials.\n"); 86 if (material != NULL) 87 delete material; 88 83 89 } 84 90 … … 245 251 if (normals != NULL) 246 252 delete normals; 247 248 if (material != NULL)249 delete material;250 253 251 254 cleanupGroup(firstGroup);
Note: See TracChangeset
for help on using the changeset viewer.