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/Depreciated/State/OSGTextureChunkBase.cpp

    r439 r459  
    108108 
    109109    This chunk wraps glTexImage[123]D (OSG::TextureChunk::_sfImage, 
    110     OSG::TextureChunk::_sfInternalFormat, 
    111     OSG::TextureChunk::_sfExternalFormat), glTexParameter 
    112     (OSG::TextureChunk::_sfMinFilter, OSG::TextureChunk::_sfMagFilter, 
    113     OSG::TextureChunk::_sfWrapS, OSG::TextureChunk::_sfWrapT, 
    114     OSG::TextureChunk::_sfWrapR), glTexEnv (OSG::TextureChunk::_sfEnvMode, 
    115     OSG::TextureChunk::_sfEnvColor, OSG::TextureChunk::_sfPriority). The 
    116     ARB combine extension is also supported, where available 
    117     (OSG::TextureChunk::_sfEnvCombineRGB, 
     110    OSG::TextureChunk::_sfInternalFormat, OSG::TextureChunk::_sfExternalFormat), 
     111    glTexParameter (OSG::TextureChunk::_sfMinFilter, 
     112    OSG::TextureChunk::_sfMagFilter, OSG::TextureChunk::_sfWrapS, 
     113    OSG::TextureChunk::_sfWrapT, OSG::TextureChunk::_sfWrapR), glTexEnv 
     114    (OSG::TextureChunk::_sfEnvMode, OSG::TextureChunk::_sfEnvColor, 
     115    OSG::TextureChunk::_sfPriority). The ARB combine extension is also supported, 
     116    where available (OSG::TextureChunk::_sfEnvCombineRGB, 
    118117    OSG::TextureChunk::_sfEnvScaleRGB, OSG::TextureChunk::_sfEnvSource0RGB, 
    119     OSG::TextureChunk::_sfEnvSource1RGB, 
    120     OSG::TextureChunk::_sfEnvSource2RGB, 
    121     OSG::TextureChunk::_sfEnvOperand0RGB, 
    122     OSG::TextureChunk::_sfEnvOperand1RGB, 
     118    OSG::TextureChunk::_sfEnvSource1RGB, OSG::TextureChunk::_sfEnvSource2RGB, 
     119    OSG::TextureChunk::_sfEnvOperand0RGB, OSG::TextureChunk::_sfEnvOperand1RGB, 
    123120    OSG::TextureChunk::_sfEnvOperand2RGB, 
    124     OSG::TextureChunk::_sfEnvCombineAlpha, 
    125     OSG::TextureChunk::_sfEnvScaleAlpha, 
    126     OSG::TextureChunk::_sfEnvSource0Alpha, 
    127     OSG::TextureChunk::_sfEnvSource1Alpha, 
    128     OSG::TextureChunk::_sfEnvSource2Alpha, 
    129     OSG::TextureChunk::_sfEnvOperand0Alpha, 
     121    OSG::TextureChunk::_sfEnvCombineAlpha,   OSG::TextureChunk::_sfEnvScaleAlpha, 
     122    OSG::TextureChunk::_sfEnvSource0Alpha, OSG::TextureChunk::_sfEnvSource1Alpha, 
     123    OSG::TextureChunk::_sfEnvSource2Alpha, OSG::TextureChunk::_sfEnvOperand0Alpha, 
    130124    OSG::TextureChunk::_sfEnvOperand1Alpha, 
    131     OSG::TextureChunk::_sfEnvOperand2Alpha). It is possible to enable the 
    132     point sprite coordinate replacement 
    133     (OSG::TextureChunk::_sfPointSprite), see \ref PageSystemPointChunk for 
    134     details. The two parameters OSG::TextureChunk::_sfScale and 
    135     OSG::TextureChunk::_sfFrame specify details about the texture. 
     125    OSG::TextureChunk::_sfEnvOperand2Alpha). It is possible to enable the point 
     126    sprite coordinate replacement  (OSG::TextureChunk::_sfPointSprite), see \ref 
     127    PageSystemPointChunk for details. The two parameters 
     128    OSG::TextureChunk::_sfScale and OSG::TextureChunk::_sfFrame specify details 
     129    about the texture. 
    136130 
    137131    On hardware that supports it (i.e. NVidia boards) the texture shader 
     
    148142     
    149143*/ 
     144 
    150145/*! \var GLenum          TextureChunkBase::_sfInternalFormat 
    151146    The internal texture format. 
    152147*/ 
     148 
    153149/*! \var GLenum          TextureChunkBase::_sfExternalFormat 
    154     The external texture format - overwrites  external format of image 
    155     when set to a value not equal to  GL_NONE (which is the default). 
    156 */ 
     150    The external texture format - overwrites  
     151    external format of image when set to a value not equal to  
     152    GL_NONE (which is the default). 
     153*/ 
     154 
    157155/*! \var bool            TextureChunkBase::_sfScale 
    158156    Specifies whether the image should be scaled to the next power of two, 
     
    162160    get around the scaling overhead. 
    163161*/ 
     162 
    164163/*! \var UInt32          TextureChunkBase::_sfFrame 
    165164    Select the frame of the image to be used. See OSG::Image about details 
    166     concerning multi-frame images. @hint For fast update use GL_LINEAR or 
    167     GL_NEAREST filters, as mipmap creation is slow right now. 
    168 */ 
     165    concerning multi-frame images. 
     166    @hint For fast update use GL_LINEAR or GL_NEAREST filters, as mipmap creation is slow right now. 
     167*/ 
     168 
    169169/*! \var GLenum          TextureChunkBase::_sfMinFilter 
    170170    The minimisation filter, default GL_LINEAR_MIPMAP_LINEAR. 
    171171*/ 
     172 
    172173/*! \var GLenum          TextureChunkBase::_sfMagFilter 
    173174    The magnification filter, default GL_LINEAR. 
    174175*/ 
     176 
    175177/*! \var GLenum          TextureChunkBase::_sfWrapS 
    176178    Texture coordinate S wrapping, default GL_REPEAT. 
    177179*/ 
     180 
    178181/*! \var GLenum          TextureChunkBase::_sfWrapT 
    179182    Texture coordinate T wrapping, default GL_REPEAT. 
    180183*/ 
     184 
    181185/*! \var GLenum          TextureChunkBase::_sfWrapR 
    182186    Texture coordinate R wrapping, default GL_REPEAT. 
    183187*/ 
     188 
    184189/*! \var GLenum          TextureChunkBase::_sfEnvMode 
    185190    Texture environment mode, default GL_REPLACE 
    186191*/ 
     192 
    187193/*! \var Color4f         TextureChunkBase::_sfEnvColor 
    188194    Texture environment color default transparent black. 
    189195*/ 
     196 
    190197/*! \var GLenum          TextureChunkBase::_sfEnvCombineRGB 
    191198    Texture environment rgb combine mode, default GL_MODULATE 
    192199*/ 
     200 
    193201/*! \var GLenum          TextureChunkBase::_sfEnvCombineAlpha 
    194202    Texture environment alpha combine mode, default GL_MODULATE 
    195203*/ 
     204 
    196205/*! \var Real32          TextureChunkBase::_sfEnvScaleRGB 
    197206    Texture environment combine rgb scale factor, default 1.f 
    198207*/ 
     208 
    199209/*! \var Real32          TextureChunkBase::_sfEnvScaleAlpha 
    200210    Texture environment combine alpha scale factor, default 1.f 
    201211*/ 
     212 
    202213/*! \var GLenum          TextureChunkBase::_sfEnvSource0RGB 
    203214    Texture environment combine source 0 rgb, default GL_TEXTURE 
    204215*/ 
     216 
    205217/*! \var GLenum          TextureChunkBase::_sfEnvSource1RGB 
    206218    Texture environment combine source 1 rgb, default GL_PREVIOUS_EXT 
    207219*/ 
     220 
    208221/*! \var GLenum          TextureChunkBase::_sfEnvSource2RGB 
    209222    Texture environment combine source 2 rgb, default GL_CONSTANT_EXT 
    210223*/ 
     224 
    211225/*! \var GLenum          TextureChunkBase::_sfEnvSource0Alpha 
    212226    Texture environment combine source 0 alpha, default GL_TEXTURE 
    213227*/ 
     228 
    214229/*! \var GLenum          TextureChunkBase::_sfEnvSource1Alpha 
    215230    Texture environment combine source 1 alpha, default GL_PREVIOUS_EXT 
    216231*/ 
     232 
    217233/*! \var GLenum          TextureChunkBase::_sfEnvSource2Alpha 
    218234    Texture environment combine source 2 alpha, default GL_CONSTANT_EXT 
    219235*/ 
     236 
    220237/*! \var GLenum          TextureChunkBase::_sfEnvOperand0RGB 
    221238    Texture environment combine operand 0 rgb, default GL_SRC_COLOR 
    222239*/ 
     240 
    223241/*! \var GLenum          TextureChunkBase::_sfEnvOperand1RGB 
    224242    Texture environment combine operand 1 rgb, default GL_SRC_COLOR 
    225243*/ 
     244 
    226245/*! \var GLenum          TextureChunkBase::_sfEnvOperand2RGB 
    227246    Texture environment combine operand 2 rgb, default GL_SRC_ALPHA 
    228247*/ 
     248 
    229249/*! \var GLenum          TextureChunkBase::_sfEnvOperand0Alpha 
    230250    Texture environment combine operand 0 alpha, default GL_SRC_ALPHA 
    231251*/ 
     252 
    232253/*! \var GLenum          TextureChunkBase::_sfEnvOperand1Alpha 
    233254    Texture environment combine operand 1 alpha, default GL_SRC_ALPHA 
    234255*/ 
     256 
    235257/*! \var GLenum          TextureChunkBase::_sfEnvOperand2Alpha 
    236258    Texture environment combine operand 2 alpha, default GL_SRC_ALPHA 
    237259*/ 
     260 
    238261/*! \var GLenum          TextureChunkBase::_sfGLId 
    239262    The OpenGL texture id for this texture. 
    240263*/ 
     264 
    241265/*! \var Int32           TextureChunkBase::_sfIgnoreGLForAspect 
    242266    Don't do any GL calls for aspect of given id. 
    243267*/ 
     268 
    244269/*! \var bool            TextureChunkBase::_sfPointSprite 
    245270    Flag to use this texture for Point Sprites. 
    246271*/ 
     272 
    247273/*! \var Real32          TextureChunkBase::_sfPriority 
    248274    Priority of this texture, between 0 and 1, the default is 0. 
    249275*/ 
     276 
    250277/*! \var GLenum          TextureChunkBase::_sfShaderOperation 
    251278    Shader operation of this texture unit, default GL_NONE. If unit 0 uses 
    252279    GL_NONE, shading is switched off. 
    253280*/ 
     281 
    254282/*! \var GLenum          TextureChunkBase::_sfShaderInput 
    255283    Input texture unit for this shader's operation. 
    256284*/ 
     285 
    257286/*! \var Real32          TextureChunkBase::_mfShaderOffsetMatrix 
    258287    The 2x2 transformation matrix for offset textures. 
    259288*/ 
     289 
    260290/*! \var Real32          TextureChunkBase::_sfShaderOffsetScale 
    261291    The scaling factor for scaled offset textures. 
    262292*/ 
     293 
    263294/*! \var Real32          TextureChunkBase::_sfShaderOffsetBias 
    264295    The bias factor for scaled offset textures. 
    265296*/ 
     297 
    266298/*! \var GLenum          TextureChunkBase::_sfShaderRGBADotProduct 
    267299    The RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV value. 
    268300*/ 
     301 
    269302/*! \var UInt8           TextureChunkBase::_sfShaderCullModes 
    270303    The CULL_MODES_NV value, coded into a single byte. The first 4 bits of 
    271     the byte are used to indicate the wnated cull modes, a value of 0 
    272     signifies GL_LESS, a value of 1 GL_GEQUAL. Bit 0 (mask 1) is used for 
    273     the S coordinate, bit 1 (mask 2) for T, bit 2 (mask 4) for R and bit 4 
     304    the byte are used to indicate the wnated cull modes, a value of 0  
     305    signifies GL_LESS, a value of 1 GL_GEQUAL. Bit 0 (mask 1) is used for  
     306    the S coordinate, bit 1 (mask 2) for T, bit 2 (mask 4) for R and bit 4  
    274307    (mask 8) for Q. 
    275308*/ 
     309 
    276310/*! \var Vec3f           TextureChunkBase::_sfShaderConstEye 
    277     The CONST_EYE_NV value, i.e. the constant eye position used by the 
     311    The CONST_EYE_NV value, i.e. the constant eye position used by the  
    278312    DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV shader. 
    279313*/ 
     314 
    280315/*! \var Real32          TextureChunkBase::_sfLodBias 
    281316    Bias of LOD calculation for texture access. 
    282317*/ 
     318 
    283319/*! \var Int32           TextureChunkBase::_sfDirtyLeft 
    284     Left coordinate of the dirty rectangle to use for 
    285     imageContentChanged(). This doesn't make sense to be stored in files, 
     320    Left coordinate of the dirty rectangle to use for  
     321    imageContentChanged(). This doesn't make sense to be stored in files,  
    286322    it does make sense on a cluster, though, that's why it's external. 
    287323*/ 
     324 
    288325/*! \var Int32           TextureChunkBase::_sfDirtyMinX 
    289     Minimum X coordinate of the dirty rectangle to use for 
    290     imageContentChanged(). This doesn't make sense to be stored in files, 
     326    Minimum X coordinate of the dirty rectangle to use for  
     327    imageContentChanged(). This doesn't make sense to be stored in files,  
    291328    it does make sense on a cluster, though, that's why it's external. 
    292329*/ 
     330 
    293331/*! \var Int32           TextureChunkBase::_sfDirtyMaxX 
    294     Maximum X coordinate of the dirty rectangle to use for 
    295     imageContentChanged(). This doesn't make sense to be stored in files, 
     332    Maximum X coordinate of the dirty rectangle to use for  
     333    imageContentChanged(). This doesn't make sense to be stored in files,  
    296334    it does make sense on a cluster, though, that's why it's external. 
    297335*/ 
     336 
    298337/*! \var Int32           TextureChunkBase::_sfDirtyMinY 
    299     Minimum Y coordinate of the dirty rectangle to use for 
    300     imageContentChanged(). This doesn't make sense to be stored in files, 
     338    Minimum Y coordinate of the dirty rectangle to use for  
     339    imageContentChanged(). This doesn't make sense to be stored in files,  
    301340    it does make sense on a cluster, though, that's why it's external. 
    302341*/ 
     342 
    303343/*! \var Int32           TextureChunkBase::_sfDirtyMaxY 
    304     Maximum Y coordinate of the dirty rectangle to use for 
    305     imageContentChanged(). This doesn't make sense to be stored in files, 
     344    Maximum Y coordinate of the dirty rectangle to use for  
     345    imageContentChanged(). This doesn't make sense to be stored in files,  
    306346    it does make sense on a cluster, though, that's why it's external. 
    307347*/ 
     348 
    308349/*! \var Int32           TextureChunkBase::_sfDirtyMinZ 
    309     Minimum Z coordinate of the dirty rectangle to use for 
    310     imageContentChanged(). This doesn't make sense to be stored in files, 
     350    Minimum Z coordinate of the dirty rectangle to use for  
     351    imageContentChanged(). This doesn't make sense to be stored in files,  
    311352    it does make sense on a cluster, though, that's why it's external. 
    312353*/ 
     354 
    313355/*! \var Int32           TextureChunkBase::_sfDirtyMaxZ 
    314     Maximum Z coordinate of the dirty rectangle to use for 
    315     imageContentChanged(). This doesn't make sense to be stored in files, 
     356    Maximum Z coordinate of the dirty rectangle to use for  
     357    imageContentChanged(). This doesn't make sense to be stored in files,  
    316358    it does make sense on a cluster, though, that's why it's external. 
    317359*/ 
     360 
    318361/*! \var Real32          TextureChunkBase::_sfAnisotropy 
    319362    Anisotropic filtering the default 1.0f means isotropic filtering. 
    320363*/ 
     364 
    321365/*! \var Color4f         TextureChunkBase::_sfBorderColor 
    322366    Texture border color 
    323367*/ 
     368 
    324369/*! \var GLenum          TextureChunkBase::_sfCompareMode 
    325370     
    326371*/ 
     372 
    327373/*! \var GLenum          TextureChunkBase::_sfCompareFunc 
    328374     
    329375*/ 
     376 
    330377/*! \var GLenum          TextureChunkBase::_sfDepthMode 
    331378     
    332379*/ 
     380 
    333381 
    334382void TextureChunkBase::classDescInserter(TypeObject &oType) 
     
    21592207    "</FieldContainer>\n", 
    21602208    "\\ingroup GrpSystemState\n" 
     2209    "\n" 
    21612210    "See \\ref PageSystemTextureChunk for a description.\n" 
     2211    "\n" 
    21622212    "This chunk wraps glTexImage[123]D (OSG::TextureChunk::_sfImage,\n" 
    21632213    "OSG::TextureChunk::_sfInternalFormat, OSG::TextureChunk::_sfExternalFormat),\n" 
     
    21812231    "OSG::TextureChunk::_sfScale and OSG::TextureChunk::_sfFrame specify details\n" 
    21822232    "about the texture.\n" 
     2233    "\n" 
    21832234    "On hardware that supports it (i.e. NVidia boards) the texture shader\n" 
    21842235    "extension(s) are also available.\n" 
     2236    "\n" 
    21852237    "\\deprecated Use OSG::TextureObjChunk instead.\n" 
    21862238    );