Changeset 4466 in orxonox.OLD for orxonox/trunk/src
- Timestamp:
- Jun 2, 2005, 1:37:53 AM (19 years ago)
- Location:
- orxonox/trunk/src/lib/graphics/importer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/graphics/importer/material.h
r4370 r4466 15 15 16 16 #ifndef NULL 17 #define NULL 0 17 #define NULL 0 //!< a pointer to NULL 18 18 #endif 19 19 20 20 // FORWARD DEFINITIONS // 21 21 class Texture; 22 23 22 24 23 //! Class to handle Materials. … … 46 45 void setTransparency (char* trans); 47 46 48 49 50 static void addTexturePath(const char* pathName);51 47 // MAPPING // 52 48 void setDiffuseMap(const char* dMap); … … 55 51 void setBump(const char* bump); 56 52 53 static void addTexturePath(const char* pathName); 54 57 55 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. 65 63 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. 69 67 }; 70 68 #endif -
orxonox/trunk/src/lib/graphics/importer/texture.h
r4381 r4466 3 3 \brief Contains the texture class, that handles the reading of Images into Texutre-files. 4 4 5 \todo free SDL-surface when deleting Material. 6 \todo delete imgNameWithPath after use creation. 5 \todo procedural textures 7 6 */ 8 7 … … 15 14 #include "debug.h" 16 15 17 enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS, 18 TEXTURE_NOISE }; 16 //! an enumerator for different procedural texture-types 17 typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS, 18 TEXTURE_NOISE }; 19 19 20 20 //! A Class, that reads in Textures from different fileformats. 21 21 class Texture 22 22 { 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.28 23 public: 29 24 Texture(const char* imageName = NULL); 30 Texture(TEXTURE_TYPE type, int resolution); 25 // Texture(TEXTURE_TYPE type, int resolution); 26 31 27 ~Texture(void); 32 28 … … 34 30 inline GLuint getTexture(void) {return this->texture;} 35 31 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;} 37 34 38 35 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. 39 41 }; 40 42
Note: See TracChangeset
for help on using the changeset viewer.