Changeset 9382

Show
Ignore:
Timestamp:
12/17/08 17:02:42 (4 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk/src/osgPlugins/OpenFlight
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.cpp

    r9138 r9382  
    6565 
    6666  : osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN ), 
     67    _fltOpt( fltOpt ), 
    6768    _dos( *dos ), 
    68     _fltOpt( fltOpt ), 
    6969    _materialPalette( new MaterialPaletteManager( *fltOpt ) ), 
    7070    _texturePalette( new TexturePaletteManager( *this, *fltOpt ) ), 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/LightPointRecords.cpp

    r7756 r9382  
    378378        int32 appearanceIndex = in.readInt32(); 
    379379        int32 animationIndex = in.readInt32(); 
    380         int32 drawOrder = in.readInt32();           // for calligraphic lights 
     380        /*int32 drawOrder =*/ in.readInt32();           // for calligraphic lights 
    381381 
    382382        LightPointAppearancePool* lpAppearancePool = document.getOrCreateLightPointAppearancePool(); 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/LightSourcePaletteManager.cpp

    r8015 r9382  
    3030 
    3131LightSourcePaletteManager::LightSourcePaletteManager( ExportOptions& fltOpt ) 
    32   : _fltOpt( fltOpt ), 
    33     _currIndex( -1 ) 
     32  : _currIndex( -1 ), 
     33    _fltOpt( fltOpt ) 
     34     
    3435{ 
    3536    // TODO: Pay attention to the version here(?) 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/MaterialPaletteManager.cpp

    r8462 r9382  
    2929 
    3030MaterialPaletteManager::MaterialPaletteManager( ExportOptions& fltOpt ) 
    31   : _fltOpt( fltOpt ), 
    32     _currIndex( -1 ) 
     31  : _currIndex( -1 ), 
     32    _fltOpt( fltOpt ) 
    3333{ 
    3434    // TODO: Pay attention to the version here(?) 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/TexturePaletteManager.cpp

    r8003 r9382  
    3131 
    3232TexturePaletteManager::TexturePaletteManager( const FltExportVisitor& nv, const ExportOptions& fltOpt ) 
    33   : _fltOpt( fltOpt ), 
     33  : _currIndex( 0 ), 
    3434    _nv( nv ), 
    35     _currIndex( 0 ) 
     35    _fltOpt( fltOpt ) 
    3636{ 
    3737} 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/TexturePaletteManager.h

    r8003 r9382  
    4646 
    4747protected: 
     48 
    4849    int _currIndex; 
    4950 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp

    r9329 r9382  
    2929 
    3030VertexPaletteManager::VertexPaletteManager( const ExportOptions& fltOpt ) 
    31   : _fltOpt( fltOpt ), 
    32     _currentSizeBytes( 8 ), 
     31  : _currentSizeBytes( 8 ), 
    3332    _current( NULL ), 
    34     _vertices( NULL ) 
     33    _vertices( NULL ), 
     34    _fltOpt( fltOpt ) 
    3535{ 
    3636} 
    … …  
    224224    const int16 sizeBytes = recordSize( recType ); 
    225225 
    226     int16 opcode; 
     226    int16 opcode = 0; 
    227227    switch( recType ) 
    228228    { 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expGeometryRecords.cpp

    r8563 r9382  
    3939// Bit flags for multitexturing 
    4040static unsigned int LAYER_1( 0x80000000 >> 0 ); 
     41#if 0 
     42// unused so if'deffing out 
    4143static unsigned int LAYER_2( 0x80000000 >> 1 ); 
    4244static unsigned int LAYER_3( 0x80000000 >> 2 ); 
    … …  
    4547static unsigned int LAYER_6( 0x80000000 >> 5 ); 
    4648static unsigned int LAYER_7( 0x80000000 >> 6 ); 
    47  
     49#endif 
    4850 
    4951 
    … …  
    127129    }; 
    128130 
    129     const unsigned int TERRAIN_BIT      = 0x80000000u >> 0; 
    130     const unsigned int NO_COLOR_BIT     = 0x80000000u >> 1; 
    131     const unsigned int NO_ALT_COLOR_BIT = 0x80000000u >> 2; 
     131    // const unsigned int TERRAIN_BIT      = 0x80000000u >> 0; 
     132    // const unsigned int NO_COLOR_BIT     = 0x80000000u >> 1; 
     133    // const unsigned int NO_ALT_COLOR_BIT = 0x80000000u >> 2; 
    132134    const unsigned int PACKED_COLOR_BIT = 0x80000000u >> 3; 
    133     const unsigned int FOOTPRINT_BIT    = 0x80000000u >> 4;    // Terrain culture cutout 
     135    // const unsigned int FOOTPRINT_BIT    = 0x80000000u >> 4;    // Terrain culture cutout 
    134136    const unsigned int HIDDEN_BIT       = 0x80000000u >> 5; 
    135     const unsigned int ROOFLINE_BIT     = 0x80000000u >> 6; 
     137    // const unsigned int ROOFLINE_BIT     = 0x80000000u >> 6; 
     138 
    136139    uint32 flags( PACKED_COLOR_BIT ); 
    137140    if (geode.getNodeMask() == 0) 
    … …  
    176179 
    177180 
    178     int8 drawType; 
     181    int8 drawType = SOLID_NO_BACKFACE; 
    179182 
    180183    switch( mode ) 
    … …  
    306309    // Next four bytes: 
    307310    //   15.8: two 2-byte "reserved" fields 
    308     //   15.9: one 4-byte "reserved" field 
     311    //   15.9: one 4-byte "reserved" field; 
    309312    _records->writeInt16( 0 ); // Reserved 
    310313    _records->writeInt16( -1 ); // Shader index 
    … …  
    334337    }; 
    335338 
    336     const unsigned int TERRAIN_BIT      = 0x80000000u >> 0; 
    337     const unsigned int NO_COLOR_BIT     = 0x80000000u >> 1; 
    338     const unsigned int NO_ALT_COLOR_BIT = 0x80000000u >> 2; 
     339    // const unsigned int TERRAIN_BIT      = 0x80000000u >> 0; 
     340    //const unsigned int NO_COLOR_BIT     = 0x80000000u >> 1; 
     341    //const unsigned int NO_ALT_COLOR_BIT = 0x80000000u >> 2; 
    339342    const unsigned int PACKED_COLOR_BIT = 0x80000000u >> 3; 
    340     const unsigned int FOOTPRINT_BIT    = 0x80000000u >> 4;    // Terrain culture cutout 
     343    //const unsigned int FOOTPRINT_BIT    = 0x80000000u >> 4;    // Terrain culture cutout 
    341344    const unsigned int HIDDEN_BIT       = 0x80000000u >> 5; 
    342     const unsigned int ROOFLINE_BIT     = 0x80000000u >> 6; 
     345    //const unsigned int ROOFLINE_BIT     = 0x80000000u >> 6; 
    343346    uint32 flags( PACKED_COLOR_BIT ); 
    344347    if (geode.getNodeMask() == 0) 
    … …  
    559562    // Attribute Mask 
    560563    static const unsigned int HAS_POSITION      = 0x80000000u >> 0; 
    561     static const unsigned int HAS_COLOR_INDEX   = 0x80000000u >> 1; 
     564    // static const unsigned int HAS_COLOR_INDEX   = 0x80000000u >> 1; 
    562565    static const unsigned int HAS_RGBA_COLOR    = 0x80000000u >> 2; 
    563566    static const unsigned int HAS_NORMAL        = 0x80000000u >> 3; 
    … …  
    791794 
    792795    osg::Vec2 defaultCoord( 0., 0. ); 
    793     const osg::StateSet* ss = getCurrentStateSet(); 
     796    // const osg::StateSet* ss = getCurrentStateSet(); 
    794797    for( idx=1; idx<8; idx++) 
    795798    { 
    … …  
    806809                t2 = new osg::Vec2Array; 
    807810            } 
    808             else if (t2->getNumElements() != numVerts) 
     811            else if (static_cast<int>(t2->getNumElements()) != numVerts) 
    809812            { 
    810813                std::ostringstream warning; 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp

    r9063 r9382  
    8888 
    8989    static const unsigned int SAVE_VERTEX_NORMALS_BIT = 0x80000000u >> 0; 
    90     static const unsigned int PACKED_COLOR_MODE_BIT   = 0x80000000u >> 1; 
    91     static const unsigned int CAD_VIEW_MODE_BIT       = 0x80000000u >> 2; 
     90    //static const unsigned int PACKED_COLOR_MODE_BIT   = 0x80000000u >> 1; 
     91    //static const unsigned int CAD_VIEW_MODE_BIT       = 0x80000000u >> 2; 
    9292    uint32 flags( SAVE_VERTEX_NORMALS_BIT ); 
    9393