Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4466 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jun 2, 2005, 1:37:53 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: doxygen-tags

Location:
orxonox/trunk/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/graphics/importer/material.h

    r4370 r4466  
    1515
    1616#ifndef NULL
    17 #define NULL 0
     17#define NULL 0            //!< a pointer to NULL
    1818#endif
    1919
    2020// FORWARD DEFINITIONS //
    2121class Texture;
    22 
    2322
    2423//! Class to handle Materials.
     
    4645  void setTransparency (char* trans);
    4746
    48 
    49  
    50   static void addTexturePath(const char* pathName);
    5147 // MAPPING //
    5248  void setDiffuseMap(const char* dMap);
     
    5551  void setBump(const char* bump);
    5652
     53  static void addTexturePath(const char* pathName);
     54
    5755 private:
    58   char* name;        //!< The Name of the Material.
    59   int illumModel;    //!< The IlluminationModel is either flat or smooth.
    60   float diffuse [4]; //!< The diffuse color of the Material.
    61   float ambient [4]; //!< The ambient color of the Material.
    62   float specular [4];//!< The specular color of the Material.
    63   float shininess;   //!< The shininess of the Material.
    64   float transparency;//!< The transperency of the Material.
     56  char*       name;             //!< The Name of the Material.
     57  int         illumModel;       //!< The IlluminationModel is either flat or smooth.
     58  float       diffuse [4];      //!< The diffuse color of the Material.
     59  float       ambient [4];      //!< The ambient color of the Material.
     60  float       specular [4];     //!< The specular color of the Material.
     61  float       shininess;        //!< The shininess of the Material.
     62  float       transparency;     //!< The transperency of the Material.
    6563
    66   Texture* diffuseTexture; //!< The diffuse texture of the Material.
    67   Texture* ambientTexture; //!< The ambient texture of the Material.
    68   Texture* specularTexture;//!< The specular texture of the Material.
     64  Texture*    diffuseTexture;  //!< The diffuse texture of the Material.
     65  Texture*    ambientTexture;  //!< The ambient texture of the Material.
     66  Texture*    specularTexture;  //!< The specular texture of the Material.
    6967};
    7068#endif
  • orxonox/trunk/src/lib/graphics/importer/texture.h

    r4381 r4466  
    33  \brief Contains the texture class, that handles the reading of Images into Texutre-files.
    44
    5   \todo free SDL-surface when deleting Material.
    6   \todo delete imgNameWithPath after use creation.
     5  \todo procedural textures
    76*/
    87
     
    1514#include "debug.h"
    1615
    17 enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
    18                     TEXTURE_NOISE };
     16//! an enumerator for different procedural texture-types
     17typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
     18                            TEXTURE_NOISE };
    1919
    2020//! A Class, that reads in Textures from different fileformats.
    2121class Texture
    2222{
    23  private:
    24   GLuint texture;   //!< The Texture-ID of opengl from this Texture.
    25   char* searchTextureInPaths(const char* texName) const;
    26 
    27   bool bAlpha;           //!< if the texture has an alpha channel.
    2823 public:
    2924  Texture(const char* imageName = NULL);
    30   Texture(TEXTURE_TYPE type, int resolution);
     25  //  Texture(TEXTURE_TYPE type, int resolution);
     26
    3127  ~Texture(void);
    3228
     
    3430  inline GLuint getTexture(void) {return this->texture;}
    3531  GLuint loadTexToGL (SDL_Surface* surface);
    36   inline bool hasAlpha(void) {return bAlpha;}
     32  /** \returns true if texture has alpha, false otherwise */
     33  inline bool hasAlpha(void) const {return bAlpha;}
    3734
    3835  bool loadImage(const char* imageName);
     36
     37
     38 private:
     39  GLuint     texture;          //!< The Texture-ID of opengl from this Texture.
     40  bool       bAlpha;           //!< if the texture has an alpha channel.
    3941};
    4042
Note: See TracChangeset for help on using the changeset viewer.