Show
Ignore:
Timestamp:
12/29/06 10:28:00 (2 years ago)
Author:
cneumann
Message:

- regenerated all base files to include the full set

of access functions for non-ptr mfields.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Source/System/Material/Simple/OSGSimpleMaterialBase.cpp

    r439 r459  
    7676    \ingroup GrpSystemMaterial 
    7777 
    78     The simple material class. See \ref PageSystemMaterialSimpleMaterial 
    79     for a description. 
     78    The simple material class. See \ref PageSystemMaterialSimpleMaterial for a 
     79    description. 
    8080 
    8181    This material wraps the standard calls to glMaterial() in 
    82     OSG::SimpleMaterial::_sfAmbient, OSG::SimpleMaterial::_sfDiffuse, 
    83     OSG::SimpleMaterial::_sfEmission, OSG::SimpleMaterial::_sfSpecular, 
    84     OSG::SimpleMaterial::_sfShininess. In addition it supports transparency 
    85     (OSG::SimpleMaterial::_sfTransparency), can switch lighting 
    86     (OSG::SimpleMaterial::_sfLit) and the color material 
     82    OSG::SimpleMaterial::_sfAmbient, OSG::SimpleMaterial::_sfDiffuse,  
     83    OSG::SimpleMaterial::_sfEmission, OSG::SimpleMaterial::_sfSpecular,  
     84    OSG::SimpleMaterial::_sfShininess. In addition it supports transparency  
     85    (OSG::SimpleMaterial::_sfTransparency), can switch lighting  
     86    (OSG::SimpleMaterial::_sfLit) and the color material  
    8787    (OSG::SimpleMaterial::_sfColorMaterial). 
    8888 */ 
     
    9595    The ambient color for the material. 
    9696*/ 
     97 
    9798/*! \var Color3r         SimpleMaterialBase::_sfDiffuse 
    9899    The diffuse color for the material. 
    99100*/ 
     101 
    100102/*! \var Color3r         SimpleMaterialBase::_sfSpecular 
    101103    The color used for the specular highlight on the object. 
    102104*/ 
     105 
    103106/*! \var Real            SimpleMaterialBase::_sfShininess 
    104     The shininess value to use when lighting the object.  Higher values 
    105     equal smaller and brighter highlights. 
     107    The shininess value to use when lighting the object.  Higher values equal smaller and brighter highlights. 
    106108*/ 
     109 
    107110/*! \var Color3r         SimpleMaterialBase::_sfEmission 
    108111     
    109112*/ 
     113 
    110114/*! \var Real            SimpleMaterialBase::_sfTransparency 
    111115    Defines how transparent objects are rendered with this material. 
    112116*/ 
     117 
    113118/*! \var bool            SimpleMaterialBase::_sfLit 
    114119     
    115120*/ 
     121 
    116122/*! \var GLenum          SimpleMaterialBase::_sfColorMaterial 
    117123    Defines which color material mode this material affects. 
    118124*/ 
     125 
    119126 
    120127void SimpleMaterialBase::classDescInserter(TypeObject &oType) 
     
    413420    "\n", 
    414421    "\\ingroup GrpSystemMaterial\n" 
     422    "\n" 
    415423    "The simple material class. See \\ref PageSystemMaterialSimpleMaterial for a\n" 
    416424    "description.\n" 
     425    "\n" 
    417426    "This material wraps the standard calls to glMaterial() in\n" 
    418427    "OSG::SimpleMaterial::_sfAmbient, OSG::SimpleMaterial::_sfDiffuse, \n" 
     
    595604} 
    596605#endif 
     606 
     607 
    597608 
    598609