Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3093 in orxonox.OLD for orxonox/branches/images/importer


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/images/importer/material.cc

    r3092 r3093  
    4545  if (name)
    4646    delete []name;
     47  if (diffuseTextureSet)
     48    glDeleteTextures (1, &diffuseTexture);
    4749  if (verbose >= 2)
    4850    printf ("delete Material %s.\n", name);
  • orxonox/branches/images/importer/material.h

    r3091 r3093  
    3131  Material* search (char* mtlName);
    3232  bool select (void);
    33 
    34   GLuint diffuseTexture;
    35   GLuint ambientTexture;
    36   GLuint specularTexture;
    37  
    38   bool diffuseTextureSet;
    39   bool ambientTextureSet;
    40   bool specularTextureSet;
    4133
    4234  void setName (char* mtlName);
     
    8274  float shininess;
    8375  float transparency;
     76
     77  GLuint diffuseTexture;
     78  GLuint ambientTexture;
     79  GLuint specularTexture;
     80 
     81  bool diffuseTextureSet;
     82  bool ambientTextureSet;
     83  bool specularTextureSet;
     84
    8485  Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
    8586
  • orxonox/branches/images/importer/object.cc

    r3084 r3093  
    8080      walker = walker->next;
    8181      delete delWalker;
    82     }
     82    }
     83
     84  if (verbose >=2)
     85    printf("Deleting Materials.\n");
     86  if (material != NULL)
     87    delete material;
     88
    8389}
    8490
     
    245251  if (normals != NULL)
    246252    delete normals;
    247 
    248   if (material != NULL)
    249     delete material;
    250253
    251254  cleanupGroup(firstGroup);
Note: See TracChangeset for help on using the changeset viewer.