Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8370 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Jun 14, 2006, 11:12:52 AM (18 years ago)
Author:
bensch
Message:

doxy

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

Legend:

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

    r8369 r8370  
    173173  return true;
    174174}
    175 
     175/**
     176 * @brief Deselect Material (if one is selected).
     177 */
    176178void Material::unselect()
    177179{
     
    186188
    187189/**
    188  * Sets the Material Illumination Model.
    189  * illu illumination Model in int form
     190 * @brief Sets the Material Illumination Model.
     191 * @param illu illumination Model in int form
    190192 */
    191193void Material::setIllum (int illum)
     
    196198
    197199/**
    198  * Sets the Material Diffuse Color.
     200 * @brief Sets the Material Diffuse Color.
    199201 * @param r Red Color Channel.a
    200202 * @param g Green Color Channel.
     
    213215
    214216/**
    215  * Sets the Material Ambient Color.
     217 * @brief Sets the Material Ambient Color.
    216218 * @param r Red Color Channel.
    217219 * @param g Green Color Channel.
     
    228230
    229231/**
    230  * Sets the Material Specular Color.
     232 * @brief Sets the Material Specular Color.
    231233 * @param r Red Color Channel.
    232234 * @param g Green Color Channel.
     
    243245
    244246/**
    245  * Sets the Material Shininess.
     247 * @brief Sets the Material Shininess.
    246248 * @param shini stes the Shininess from float.
    247249*/
     
    252254
    253255/**
    254  * Sets the Material Transparency.
     256 * @brief Sets the Material Transparency.
    255257 * @param trans stes the Transparency from int.
    256258*/
     
    262264
    263265/**
    264  * Adds a Texture Path to the List of already existing Paths
     266 * @brief Adds a Texture Path to the List of already existing Paths
    265267 * @param pathName The Path to add.
    266268*/
     
    272274// MAPPING //
    273275
     276
     277/**
     278 * @brief Sets the Diffuse map of this Texture.
     279 * @param texture The Texture to load
     280 * @param textureNumber The Texture-Number from 0 to GL_MAX_TEXTURE_UNITS
     281 */
    274282void Material::setDiffuseMap(const Texture& texture, unsigned int textureNumber)
    275283{
     
    287295 * @brief Sets the Materials Diffuse Map
    288296 * @param dMap the Name of the Image to Use
    289 */
     297 * @param textureNumber The Texture-Number from 0 to GL_MAX_TEXTURE_UNITS
     298 */
    290299void Material::setDiffuseMap(const std::string& dMap, GLenum target, unsigned int textureNumber)
    291300{
     
    313322/**
    314323 * @brief Sets the Materials Diffuse Map
    315  * @param surface pointer to SDL_Surface which shall be used as texture
    316 */
     324 * @param surface pointer to SDL_Surface which shall be used as texture.
     325 * @param target the GL-Target to load the Surface to.
     326 * @param textureNumber The Texture-Number from 0 to GL_MAX_TEXTURE_UNITS.
     327 */
    317328void Material::setSDLDiffuseMap(SDL_Surface *surface, GLenum target, unsigned int textureNumber)
    318329{
     
    335346
    336347/**
    337  * @brief renders viewport buffer (?? or another buffer ;-)) to a texture
    338  * @param textureNumber select the texture unit that will be overwritten
    339 */
     348 * @brief Renders to a Texture.
     349 * @param textureNumber The Texture-Number from 0 to GL_MAX_TEXTURE_UNITS.
     350 * @param target The GL-Target.
     351 * @param level the MipMap-Level to render to.
     352 * @param xoffset The offset in the Source from the left.
     353 * @param yoffset The offset in the Source from the top (or bottom).
     354 * @param x The Offset in the Destination from the left.
     355 * @param y The Offset in the Destination from the top (or bottom).
     356 * @param width The width of the region to copy.
     357 * @param height The height of the region to copy.
     358 */
    340359void Material::renderToTexture(unsigned int textureNumber, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
    341360{
     
    382401
    383402
    384 
     403/**
     404 * @returns the Maximim Texture Unit the users OpenGL-Implementation supports.
     405 */
    385406unsigned int Material::getMaxTextureUnits()
    386407{
  • trunk/src/lib/graphics/importer/material.h

    r8369 r8370  
    7171    float            shininess;        //!< The shininess of the Material.
    7272    float            transparency;     //!< The transperency of the Material.
    73     GLenum           sFactor;
    74     GLenum           tFactor;
     73    GLenum           sFactor;          //!< The Blending Factor for the Source.
     74    GLenum           tFactor;          //!< The Blending Factor for the Destination.
    7575
    76     std::vector<Texture> textures;    //!< An Array of Textures.
     76    std::vector<Texture> textures;     //!< An Array of Textures.
    7777
    7878    Texture*         ambientTexture;   //!< The ambient texture of the Material.
    7979    Texture*         specularTexture;  //!< The specular texture of the Material.
     80};
    8081
    81 
    82 };
    8382#endif
Note: See TracChangeset for help on using the changeset viewer.