Changeset 9388

Show
Ignore:
Timestamp:
12/18/08 12:06:57 (6 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk
Files:
14 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osg/Image

    r9348 r9388  
    319319        const PixelBufferObject* getPixelBufferObject() const { return _bufferObject.get(); } 
    320320        
    321         virtual void update(NodeVisitor* nv) {} 
    322          
     321        virtual void update(NodeVisitor* /*nv*/) {}         
    323322 
    324323        /** method for sending pointer events to images that are acting as front ends to interactive surfaces such as a vnc or browser window.  Return true if handled. */ 
    325         virtual bool sendPointerEvent(int x, int y, int buttonMask) { return false; } 
     324        virtual bool sendPointerEvent(int /*x*/, int /*y*/, int /*buttonMask*/) { return false; } 
    326325 
    327326        /** method for sending key events to images that are acting as front ends to interactive surfaces such as a vnc or browser window.  Return true if handled.*/ 
    328         virtual bool sendKeyEvent(int key, bool keyDown) { return false; } 
     327        virtual bool sendKeyEvent(int /*key*/, bool /*keyDown*/) { return false; } 
    329328 
    330329        /** method for passing frame information to the custom Image classes, to be called only when objects associated with imagery are not culled.*/ 
    331         virtual void setFrameLastRendered(const osg::FrameStamp* frameStamp) {} 
     330        virtual void setFrameLastRendered(const osg::FrameStamp* /*frameStamp*/) {} 
    332331 
    333332    protected : 
  • OpenSceneGraph/trunk/include/osgAnimation/EaseMotion

    r9370 r9388  
    170170        { 
    171171            CLAMP, 
    172             LOOP, 
     172            LOOP 
    173173        }; 
    174174        Motion(float startValue = 0, float duration = 1, float changeValue = 1, TimeBehaviour tb = CLAMP) : _time(0), _startValue(startValue), _changeValue(changeValue), _duration(duration), _behaviour(tb) {} 
  • OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp

    r9124 r9388  
    647647    { 
    648648     
    649         float byteError = 0.0f; 
     649        //float byteError = 0.0f; 
    650650        float byteMultiplier = 255.0f/(maxValue-minValue); 
    651651        float byteInvMultiplier = 1.0f/byteMultiplier; 
    652652 
    653         float shortError = 0.0f; 
     653        //float shortError = 0.0f; 
    654654        float shortMultiplier = 65535.0f/(maxValue-minValue); 
    655655        float shortInvMultiplier = 1.0f/shortMultiplier; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Box.cpp

    r8588 r9388  
    88#include <osgWidget/Box> 
    99 
    10 bool osgWidget_Box_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_Box_readData(osg::Object& /*obj*/, osgDB::Input& fr)  
     11{ 
    1112        /* 
    1213        osgWidget::Box& box = static_cast<osgWidgegt::Box&>(obj); 
     
    4647} 
    4748 
    48 bool osgWidget_Box_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    49         const osgWidget::Box& model = static_cast<const osgWidget::Box&>(obj); 
     49bool osgWidget_Box_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     50{ 
     51        // const osgWidget::Box& model = static_cast<const osgWidget::Box&>(obj); 
    5052         
    5153        fw.indent() << fw.wrapString("Box stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/EmbeddedWindow.cpp

    r8588 r9388  
    88#include <osgWidget/Window> 
    99 
    10 bool osgWidget_EmbeddedWindow_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_EmbeddedWindow_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
     11{ 
    1112        osgWidget::warn() << "EmbeddedWindow read" << std::endl; 
    1213         
     
    1415} 
    1516 
    16 bool osgWidget_EmbeddedWindow_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::Window::EmbeddedWindow& model =  
    18                 static_cast<const osgWidget::Window::EmbeddedWindow&>(obj) 
    19         ; 
     17bool osgWidget_EmbeddedWindow_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19        // const osgWidget::Window::EmbeddedWindow& model = static_cast<const osgWidget::Window::EmbeddedWindow&>(obj); 
    2020         
    2121        fw.indent() << fw.wrapString("EmbeddedWindow stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Frame.cpp

    r8588 r9388  
    88#include <osgWidget/Frame> 
    99 
    10 bool osgWidget_Frame_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_Frame_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
     11{ 
    1112        osgWidget::warn() << "Frame read" << std::endl; 
    1213         
     
    1415} 
    1516 
    16 bool osgWidget_Frame_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::Frame& model = static_cast<const osgWidget::Frame&>(obj); 
     17bool osgWidget_Frame_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19        // const osgWidget::Frame& model = static_cast<const osgWidget::Frame&>(obj); 
    1820         
    1921        fw.indent() << fw.wrapString("Frame stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Input.cpp

    r8588 r9388  
    88#include <osgWidget/Input> 
    99 
    10 bool osgWidget_Input_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_Input_readData(osg::Object& /*obj*/, osgDB::Input& fr)  
     11{ 
    1112        osgWidget::warn() << "Input read" << std::endl; 
    1213         
     
    1415} 
    1516 
    16 bool osgWidget_Input_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::Input& model = static_cast<const osgWidget::Input&>(obj); 
     17bool osgWidget_Input_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19        // const osgWidget::Input& model = static_cast<const osgWidget::Input&>(obj); 
    1820         
    1921        fw.indent() << fw.wrapString("Input stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Label.cpp

    r8588 r9388  
    88#include <osgWidget/Label> 
    99 
    10 bool osgWidget_Label_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_Label_readData(osg::Object& /*obj*/, osgDB::Input& fr)  
     11{ 
    1112        osgWidget::warn() << "Label read" << std::endl; 
    1213         
     
    1415} 
    1516 
    16 bool osgWidget_Label_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::Label& model = static_cast<const osgWidget::Label&>(obj); 
     17bool osgWidget_Label_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19        // const osgWidget::Label& model = static_cast<const osgWidget::Label&>(obj); 
    1820         
    1921        fw.indent() << fw.wrapString("Label stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Table.cpp

    r8588 r9388  
    88#include <osgWidget/Table> 
    99 
    10 bool osgWidget_Table_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_Table_readData(osg::Object& /*obj*/, osgDB::Input& fr) { 
    1111        osgWidget::warn() << "Table read" << std::endl; 
    1212         
     
    1414} 
    1515 
    16 bool osgWidget_Table_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::Table& model = static_cast<const osgWidget::Table&>(obj); 
     16bool osgWidget_Table_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     17{ 
     18        // const osgWidget::Table& model = static_cast<const osgWidget::Table&>(obj); 
    1819         
    1920        fw.indent() << fw.wrapString("Table stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Widget.cpp

    r8588 r9388  
    1515} 
    1616 
    17 bool osgWidget_Widget_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    18         const osgWidget::Widget& model = static_cast<const osgWidget::Widget&>(obj); 
     17bool osgWidget_Widget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19 
     20        // const osgWidget::Widget& model = static_cast<const osgWidget::Widget&>(obj); 
    1921         
    2022        fw.indent() << fw.wrapString("Widget stuff...") << std::endl; 
     
    2325} 
    2426 
    25 bool osgWidget_NotifyWidget_readData(osg::Object& obj, osgDB::Input& fr) { 
     27bool osgWidget_NotifyWidget_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
     28{ 
    2629        osgWidget::warn() << "NotifyWidget read" << std::endl; 
    2730         
     
    2932} 
    3033 
    31 bool osgWidget_NotifyWidget_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    32         const osgWidget::NotifyWidget& model = static_cast<const osgWidget::NotifyWidget&>(obj); 
     34bool osgWidget_NotifyWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     35{ 
     36        // const osgWidget::NotifyWidget& model = static_cast<const osgWidget::NotifyWidget&>(obj); 
    3337         
    3438        fw.indent() << fw.wrapString("NotifyWidget stuff...") << std::endl; 
     
    3741} 
    3842 
    39 bool osgWidget_NullWidget_readData(osg::Object& obj, osgDB::Input& fr) { 
     43bool osgWidget_NullWidget_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
     44{ 
    4045        osgWidget::warn() << "NullWidget read" << std::endl; 
    4146         
     
    4348} 
    4449 
    45 bool osgWidget_NullWidget_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    46         const osgWidget::NullWidget& model = static_cast<const osgWidget::NullWidget&>(obj); 
     50bool osgWidget_NullWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     51{ 
     52        // const osgWidget::NullWidget& model = static_cast<const osgWidget::NullWidget&>(obj); 
    4753         
    4854        fw.indent() << fw.wrapString("NullWidget stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/WindowManager.cpp

    r8588 r9388  
    88#include <osgWidget/WindowManager> 
    99 
    10 bool osgWidget_WindowManager_readData(osg::Object& obj, osgDB::Input& fr) { 
     10bool osgWidget_WindowManager_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
     11{ 
    1112        osgWidget::warn() << "WindowManager read" << std::endl; 
    1213         
     
    1415} 
    1516 
    16 bool osgWidget_WindowManager_writeData(const osg::Object& obj, osgDB::Output& fw) { 
    17         const osgWidget::WindowManager& model = static_cast<const osgWidget::WindowManager&>(obj); 
     17bool osgWidget_WindowManager_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) 
     18{ 
     19        // const osgWidget::WindowManager& model = static_cast<const osgWidget::WindowManager&>(obj); 
    1820         
    1921        fw.indent() << fw.wrapString("WindowManager stuff...") << std::endl; 
  • OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.cpp

    r9358 r9388  
    284284     
    285285 
    286     float minHeight = 0.0; 
     286    //float minHeight = 0.0; 
    287287    float scaleHeight = _terrainTile->getTerrain() ? _terrainTile->getTerrain()->getVerticalScale() : 1.0f; 
    288288 
     
    312312                    { 
    313313                        if (switchLayer->getActiveLayer()>=0 && 
    314                             switchLayer->getActiveLayer()<switchLayer->getNumLayers() && 
     314                            static_cast<unsigned int>(switchLayer->getActiveLayer())<switchLayer->getNumLayers() && 
    315315                            switchLayer->getLayer(switchLayer->getActiveLayer())) 
    316316                        { 
     
    698698        if (switchLayer) 
    699699        { 
    700             if (switchLayer->getActiveLayer()<0 || switchLayer->getActiveLayer()>=switchLayer->getNumLayers()) 
     700            if (switchLayer->getActiveLayer()<0 ||  
     701                static_cast<unsigned int>(switchLayer->getActiveLayer())>=switchLayer->getNumLayers()) 
    701702            { 
    702703                continue; 
  • OpenSceneGraph/trunk/src/osgTerrain/Locator.cpp

    r8987 r9388  
    3434    osg::Object(locator,copyop), 
    3535    _coordinateSystemType(locator._coordinateSystemType), 
    36     _ellipsoidModel(locator._ellipsoidModel), 
    3736    _format(locator._format), 
    3837    _cs(locator._cs), 
     38    _ellipsoidModel(locator._ellipsoidModel), 
    3939    _transform(locator._transform), 
    4040    _definedInFile(locator._definedInFile), 
  • OpenSceneGraph/trunk/src/osgTerrain/TerrainTile.cpp

    r9358 r9388  
    4141TerrainTile::TerrainTile(): 
    4242    _terrain(0), 
     43    _dirty(false), 
    4344    _hasBeenTraversal(false), 
    4445    _requiresNormals(true), 
    45     _treatBoundariesToValidDataAsDefaultValue(false), 
    46     _dirty(false) 
     46    _treatBoundariesToValidDataAsDefaultValue(false) 
    4747{ 
    4848    setThreadSafeRefUnref(true); 
     
    5252    Group(terrain,copyop), 
    5353    _terrain(0), 
     54    _dirty(false), 
    5455    _hasBeenTraversal(false), 
    5556    _elevationLayer(terrain._elevationLayer), 
    5657    _colorLayers(terrain._colorLayers), 
    5758    _requiresNormals(terrain._requiresNormals), 
    58     _treatBoundariesToValidDataAsDefaultValue(terrain._treatBoundariesToValidDataAsDefaultValue), 
    59     _dirty(false) 
     59    _treatBoundariesToValidDataAsDefaultValue(terrain._treatBoundariesToValidDataAsDefaultValue) 
    6060{ 
    6161    if (terrain.getTerrainTechnique())