Changeset 4466 in orxonox.OLD for orxonox

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:

• material.h (modified) (3 diffs)
• texture.h (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -15 +15 @@
 
 #ifndef NULL
-#define NULL 0
+#define NULL 0            //!< a pointer to NULL
 #endif
 
 // FORWARD DEFINITIONS //
 class Texture;
-
 
 //! Class to handle Materials.
@@ -46 +45 @@
   void setTransparency (char* trans);
 
-
- 
-  static void addTexturePath(const char* pathName);
  // MAPPING //
   void setDiffuseMap(const char* dMap);
@@ -55 +51 @@
   void setBump(const char* bump);
 
+  static void addTexturePath(const char* pathName);
+
  private:
-  char* name;        //!< The Name of the Material.
-  int illumModel;    //!< The IlluminationModel is either flat or smooth.
-  float diffuse [4]; //!< The diffuse color of the Material.
-  float ambient [4]; //!< The ambient color of the Material.
-  float specular [4];//!< The specular color of the Material.
-  float shininess;   //!< The shininess of the Material.
-  float transparency;//!< The transperency of the Material.
+  char*       name;             //!< The Name of the Material.
+  int         illumModel;       //!< The IlluminationModel is either flat or smooth.
+  float       diffuse [4];      //!< The diffuse color of the Material.
+  float       ambient [4];      //!< The ambient color of the Material.
+  float       specular [4];     //!< The specular color of the Material.
+  float       shininess;        //!< The shininess of the Material.
+  float       transparency;     //!< The transperency of the Material.
 
-  Texture* diffuseTexture; //!< The diffuse texture of the Material.
-  Texture* ambientTexture; //!< The ambient texture of the Material.
-  Texture* specularTexture;//!< The specular texture of the Material.
+  Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
+  Texture*    ambientTexture;   //!< The ambient texture of the Material.
+  Texture*    specularTexture;  //!< The specular texture of the Material.
 };
 #endif

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -3 +3 @@
   \brief Contains the texture class, that handles the reading of Images into Texutre-files.
 
-  \todo free SDL-surface when deleting Material.
-  \todo delete imgNameWithPath after use creation.
+  \todo procedural textures
 */
 
@@ -15 +14 @@
 #include "debug.h"
 
-enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
-                    TEXTURE_NOISE };
+//! an enumerator for different procedural texture-types
+typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
+                            TEXTURE_NOISE };
 
 //! A Class, that reads in Textures from different fileformats.
 class Texture
 {
- private:
-  GLuint texture;   //!< The Texture-ID of opengl from this Texture.
-  char* searchTextureInPaths(const char* texName) const;
-
-  bool bAlpha;           //!< if the texture has an alpha channel.
  public:
   Texture(const char* imageName = NULL);
-  Texture(TEXTURE_TYPE type, int resolution);
+  //  Texture(TEXTURE_TYPE type, int resolution);
+
   ~Texture(void);
 
@@ -34 +30 @@
   inline GLuint getTexture(void) {return this->texture;} 
   GLuint loadTexToGL (SDL_Surface* surface);
-  inline bool hasAlpha(void) {return bAlpha;}
+  /** \returns true if texture has alpha, false otherwise */
+  inline bool hasAlpha(void) const {return bAlpha;}
 
   bool loadImage(const char* imageName);
+
+
+ private:
+  GLuint     texture;          //!< The Texture-ID of opengl from this Texture.
+  bool       bAlpha;           //!< if the texture has an alpha channel.
 };