Changeset 12598

Show
Ignore:
Timestamp:
06/22/11 14:38:53 (2 years ago)
Author:
robert
Message:

Merged from svn/trunk changeset 12597:

Resolved warnings reported by g++ 4.6's -Wunused-but-set-variable.

Warnings were:

src/osg/ShapeDrawable.cpp: In member function ?void PrimitiveShapeVisitor::createHalfSphere(unsigned int, unsigned int, float, int, float, const Matrix&)?:
src/osg/ShapeDrawable.cpp:1409:11: warning: variable ?nzBase? set but not used [-Wunused-but-set-variable]
src/osg/ShapeDrawable.cpp:1410:11: warning: variable ?nRatioBase? set but not used [-Wunused-but-set-variable]
src/osgUtil/DelaunayTriangulator.cpp: In function ?osgUtil::Triangle_list osgUtil::fillHole(osg::Vec3Array*, std::vector<unsigned int, std::allocator<unsigned int> >)?:
src/osgUtil/DelaunayTriangulator.cpp:569:27: warning: variable ?ptest? set but not used [-Wunused-but-set-variable]
src/osgUtil/DelaunayTriangulator.cpp: In member function ?bool osgUtil::DelaunayTriangulator::triangulate()?:
src/osgUtil/DelaunayTriangulator.cpp:979:45: warning: variable ?curp? set but not used [-Wunused-but-set-variable]
src/osgUtil/RenderStage.cpp: In member function ?void osgUtil::RenderStage::runCameraSetUp(osg::RenderInfo?&)?:
src/osgUtil/RenderStage.cpp:631:18: warning: variable ?stencilAttached? set but not used [-Wunused-but-set-variable]
src/osgText/FadeText.cpp: In member function ?void FadeTextPolytopeData::buildPolytope()?:
src/osgText/FadeText.cpp:74:20: warning: variable ?edge23? set but not used [-Wunused-but-set-variable]
src/osgText/FadeText.cpp:75:20: warning: variable ?edge30? set but not used [-Wunused-but-set-variable]
src/osgText/Text.cpp: In member function ?void osgText::Text::computeBackdropPositions(unsigned int) const?:
src/osgText/Text.cpp:747:10: warning: variable ?is_valid_size? set but not used [-Wunused-but-set-variable]
src/osgGA/NodeTrackerManipulator.cpp: In member function ?virtual bool osgGA::NodeTrackerManipulator::performMovementLeftMouseButton(double, double, double)?:
src/osgGA/NodeTrackerManipulator.cpp:257:21: warning: variable ?lookVector? set but not used [-Wunused-but-set-variable]
src/osgGA/NodeTrackerManipulator.cpp:259:21: warning: variable ?upVector? set but not used [-Wunused-but-set-variable]
src/osgGA/TerrainManipulator.cpp: In member function ?virtual bool osgGA::TerrainManipulator::performMovementMiddleMouseButton(double, double, double)?:
src/osgGA/TerrainManipulator.cpp:217:11: warning: variable ?lookVector? set but not used [-Wunused-but-set-variable]
src/osgGA/TerrainManipulator.cpp:219:11: warning: variable ?upVector? set but not used [-Wunused-but-set-variable]
src/osgVolume/FixedFunctionTechnique.cpp: In member function ?virtual void osgVolume::FixedFunctionTechnique::init()?:
src/osgVolume/FixedFunctionTechnique.cpp:124:30: warning: variable ?tf? set but not used [-Wunused-but-set-variable]
src/osgParticle/FluidProgram.cpp: In member function ?virtual void osgParticle::FluidProgram::execute(double)?:
src/osgParticle/FluidProgram.cpp:38:23: warning: variable ?velBefore? set but not used [-Wunused-but-set-variable]
src/osgShadow/ParallelSplitShadowMap.cpp: In member function ?virtual void osgShadow::ParallelSplitShadowMap::cull(osgUtil::CullVisitor?&)?:
src/osgShadow/ParallelSplitShadowMap.cpp:593:22: warning: variable ?bb? set but not used [-Wunused-but-set-variable]
src/osgTerrain/GeometryTechnique.cpp: In member function ?virtual void osgTerrain::GeometryTechnique::generateGeometry(osgTerrain::GeometryTechnique::BufferData?&, osgTerrain::Locator*, const osg::Vec3d&)?:
src/osgTerrain/GeometryTechnique.cpp:777:12: warning: variable ?i_sampleFactor? set but not used [-Wunused-but-set-variable]
src/osgTerrain/GeometryTechnique.cpp:778:12: warning: variable ?j_sampleFactor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/dds/ReaderWriterDDS.cpp: In function ?osg::Image* ReadDDSFile(std::istream&)?:
src/osgPlugins/dds/ReaderWriterDDS.cpp:314:10: warning: variable ?is3dImage? set but not used [-Wunused-but-set-variable]
src/osgPlugins/dds/ReaderWriterDDS.cpp: In function ?bool WriteDDSFile(const osg::Image*, std::ostream&)?:
src/osgPlugins/dds/ReaderWriterDDS.cpp:721:10: warning: variable ?is3dImage? set but not used [-Wunused-but-set-variable]
src/osgPlugins/hdr/hdrloader.cpp: In static member function ?static bool HDRLoader::load(const char*, bool, HDRLoaderResult&)?:
src/osgPlugins/hdr/hdrloader.cpp:101:10: warning: variable ?cmd? set but not used [-Wunused-but-set-variable]
src/osgPlugins/vtf/ReaderWriterVTF.cpp: In function ?osg::Image* ReadVTFFile(std::istream&)?:
src/osgPlugins/vtf/ReaderWriterVTF.cpp:360:23: warning: variable ?base? set but not used [-Wunused-but-set-variable]
src/osgPlugins/jp2/ReaderWriterJP2.cpp: In function ?int putdata(jas_stream_t*, jas_image_t*, int)?:
src/osgPlugins/jp2/ReaderWriterJP2.cpp:41:13: warning: variable ?linelen? set but not used [-Wunused-but-set-variable]
src/osgPlugins/Inventor/ConvertToInventor.cpp: In member function ?void ConvertToInventor::processGeometry(const osg::Geometry*, ConvertToInventor::InventorState?*)?:
src/osgPlugins/Inventor/ConvertToInventor.cpp:1639:10: warning: variable ?ok? set but not used [-Wunused-but-set-variable]
src/osgPlugins/Inventor/ConvertFromInventor.cpp: In member function ?virtual SbBool? SoVRMLImageTextureOsg::readInstance(SoInput?*, short unsigned int)?:
src/osgPlugins/Inventor/ConvertFromInventor.cpp:1264:16: warning: variable ?retval? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/GeometryRecords.cpp: In member function ?virtual void flt::Face::readRecord(flt::RecordInputStream?&, flt::Document&)?:
src/osgPlugins/OpenFlight/GeometryRecords.cpp:369:19: warning: variable ?secondaryPackedColor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/GeometryRecords.cpp: In member function ?virtual void flt::Mesh::readRecord(flt::RecordInputStream?&, flt::Document&)?:
src/osgPlugins/OpenFlight/GeometryRecords.cpp:942:19: warning: variable ?secondaryPackedColor? set but not used [-Wunused-but-set-variable]
src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp: In member function ?virtual osgDB::ReaderWriter::ReadResult? FLTReaderWriter::readNode(std::istream&, const Options*) const?:
src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp:427:40: warning: variable ?pos? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ive/ShapeAttributeList.cpp: In member function ?void ive::ShapeAttributeList::write(ive::DataOutputStream?*)?:
src/osgPlugins/ive/ShapeAttributeList.cpp:31:48: warning: variable ?it? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp: In member function ?void ac3d::Geode::ProcessGeometry?(std::ostream&, unsigned int)?:
src/osgPlugins/ac/Geode.cpp:806:35: warning: variable ?fRep_s? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:806:43: warning: variable ?fRep_t? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:807:35: warning: variable ?fOffset_s? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:807:46: warning: variable ?fOffset_t? set but not used [-Wunused-but-set-variable]
src/osgPlugins/ac/Geode.cpp:932:38: warning: variable ?primLength? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_geom.cpp: In member function ?virtual bool trpgGeometry::Write(trpgWriteBuffer&)?:
src/osgPlugins/txp/trpage_geom.cpp:615:19: warning: variable ?u? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_material.cpp: In member function ?int trpgMatTable::AddMaterial?(const trpgMaterial&, bool)?:
src/osgPlugins/txp/trpage_material.cpp:103:10: warning: variable ?spaceInTable? set but not used [-Wunused-but-set-variable]
src/osgPlugins/txp/trpage_rarchive.cpp: In member function ?virtual bool trpgr_Archive::ReadHeader?(bool)?:
src/osgPlugins/txp/trpage_rarchive.cpp:261:14: warning: variable ?headerHasTexTable? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp: In member function ?ZRESULT TUnzip::Get(int, ZIPENTRY*)?:
src/osgPlugins/zip/unzip.cpp:4055:8: warning: variable ?hidden? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp:4055:22: warning: variable ?system? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/unzip.cpp:4055:36: warning: variable ?archive? set but not used [-Wunused-but-set-variable]
src/osgPlugins/zip/ZipArchive.cpp: In member function ?virtual bool ZipArchive::getFileNames(osgDB::Archive::FileNameList?&) const?:
src/osgPlugins/zip/ZipArchive.cpp:91:37: warning: variable ?iterEnd? set but not used [-Wunused-but-set-variable]
src/osgPlugins/pvr/ReaderWriterPVR.cpp: In member function ?osgDB::ReaderWriter::ReadResult? ReaderWriterPVR::readPVRStream(std::istream&) const?:
src/osgPlugins/pvr/ReaderWriterPVR.cpp:155:14: warning: variable ?hasAlpha? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp: In function ?osg::Geometry* create3DSphericalDisplayDistortionMesh(const Vec3&, const Vec3&, const Vec3&, double, double, osg::Image*, const Matrix&)?:
src/osgViewer/View.cpp:737:15: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp: In function ?osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const Vec3&, const Vec3&, const Vec3&, double, double, osg::Image*, const Matrix&)?:
src/osgViewer/View.cpp:1130:19: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
src/osgViewer/View.cpp:1118:15: warning: variable ?dx? set but not used [-Wunused-but-set-variable]
src/osgViewer/GraphicsWindowX11.cpp: In member function ?virtual void osgViewer::GraphicsWindowX11::checkEvents()?:
src/osgViewer/GraphicsWindowX11.cpp:1181:10: warning: variable ?destroyWindowRequested? set but not used [-Wunused-but-set-variable]
src/osgPlugins/cfg/ConfigParser.cpp: In member function ?bool osgProducer::CameraConfig::parseFile(const string&)?:
src/osgPlugins/cfg/ConfigParser.cpp:2247:13: warning: variable ?result? set but not used [-Wunused-but-set-variable]
src/osgQt/QGraphicsViewAdapter.cpp: In member function ?bool osgQt::QGraphicsViewAdapter::handlePointerEvent(int, int, int)?:
src/osgQt/QGraphicsViewAdapter.cpp:344:17: warning: variable ?viewportGeometry? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp: In function ?osg::Node* createDistortionSubgraph(osg::Node*, const Vec4&)?:
examples/osgdistortion/osgdistortion.cpp:125:19: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp:126:19: warning: variable ?texcoord? set but not used [-Wunused-but-set-variable]
examples/osgdistortion/osgdistortion.cpp: In function ?osg::Geometry* createDomeDistortionMesh(const Vec3&, const Vec3&, const Vec3&, osg::ArgumentParser?&)?:
examples/osgdistortion/osgdistortion.cpp:358:15: warning: variable ?cursor? set but not used [-Wunused-but-set-variable]
examples/osgposter/osgposter.cpp: In function ?int main(int, char**)?:
examples/osgposter/osgposter.cpp:253:31: warning: variable ?outputTiles? set but not used [-Wunused-but-set-variable]
examples/osgthreadedterrain/osgthreadedterrain.cpp: In function ?int main(int, char**)?:
examples/osgthreadedterrain/osgthreadedterrain.cpp:669:10: warning: variable ?readParameter? set but not used [-Wunused-but-set-variable]
examples/osgtext3D/TextNode.cpp: In member function ?virtual void osgText::Layout::layout(osgText::TextNode?&) const?:
examples/osgtext3D/TextNode.cpp:80:11: warning: variable ?characterHeightScale? set but not used [-Wunused-but-set-variable]
examples/osgvolume/osgvolume.cpp: In function ?int main(int, char**)?:
examples/osgvolume/osgvolume.cpp:678:38: warning: variable ?internalFormatMode? set but not used [-Wunused-but-set-variable]
examples/osgwidgetcanvas/osgwidgetcanvas.cpp: In function ?bool windowMouseOver(osgWidget::Event&)?:
examples/osgwidgetcanvas/osgwidgetcanvas.cpp:27:24: warning: variable ?xy? set but not used [-Wunused-but-set-variable]
examples/osgwidgetcanvas/osgwidgetcanvas.cpp: In function ?bool widgetMouseOver(osgWidget::Event&)?:
examples/osgwidgetcanvas/osgwidgetcanvas.cpp:35:24: warning: variable ?xy? set but not used [-Wunused-but-set-variable]
src/osgPlugins/p3d/ReaderWriterP3D.cpp: In member function ?osg::Node* ReaderWriterP3DXML::parseXmlGraph(osgDB::XmlNode?*, bool, osgDB::Options*) const?:
src/osgPlugins/p3d/ReaderWriterP3D.cpp:2121:10: warning: variable ?readSlide? set but not used [-Wunused-but-set-variable]
applications/present3D/present3D.cpp: In function ?int main(int, char**)?:
applications/present3D/present3D.cpp:639:10: warning: variable ?sizesSpecified? set but not used [-Wunused-but-set-variable]

Location:
OpenSceneGraph/branches/OpenSceneGraph-3.0
Files:
37 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/applications/present3D/present3D.cpp

    r12362 r12598  
    637637    float height = osg::DisplaySettings::instance()->getScreenHeight(); 
    638638    float distance = osg::DisplaySettings::instance()->getScreenDistance(); 
    639     bool sizesSpecified = false; 
    640639    while (arguments.read("-s", width, height, distance))  
    641640    { 
    642         sizesSpecified = true; 
    643          
    644641        osg::DisplaySettings::instance()->setScreenDistance(distance); 
    645642        osg::DisplaySettings::instance()->setScreenHeight(height); 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgdistortion/osgdistortion.cpp

    r12529 r12598  
    123123        osg::Vec2 dy_texcoord(0.0f,1.0f/(float)(noSteps-1)); 
    124124 
    125         osg::Vec3 cursor = bottom; 
    126         osg::Vec2 texcoord = bottom_texcoord; 
    127125        int i,j; 
    128126        for(i=0;i<noSteps;++i) 
    … …  
    356354    float screenRadius = heightVector.length() * 0.5f; 
    357355 
    358     osg::Vec3 cursor = bottom; 
    359356    int i,j; 
    360      
    361      
    362357    if (centerProjection) 
    363358    { 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgposter/osgposter.cpp

    r12529 r12598  
    232232    usage->addCommandLineOption( "--enable-output-poster", "Output the final poster file (Default)." ); 
    233233    usage->addCommandLineOption( "--disable-output-poster", "Don't output the final poster file." ); 
    234     usage->addCommandLineOption( "--enable-output-tiles", "Output all tile files." ); 
    235     usage->addCommandLineOption( "--disable-output-tiles", "Don't output all tile files (Default)." ); 
     234    //usage->addCommandLineOption( "--enable-output-tiles", "Output all tile files." ); 
     235    //usage->addCommandLineOption( "--disable-output-tiles", "Don't output all tile files (Default)." ); 
    236236    usage->addCommandLineOption( "--use-fb", "Use Frame Buffer for rendering tiles (Default, recommended)."); 
    237237    usage->addCommandLineOption( "--use-fbo", "Use Frame Buffer Object for rendering tiles."); 
    … …  
    251251    // Poster arguments 
    252252    bool activeMode = true; 
    253     bool outputPoster = true, outputTiles = false; 
     253    bool outputPoster = true; 
     254    //bool outputTiles = false; 
    254255    int tileWidth = 640, tileHeight = 480; 
    255256    int posterWidth = 640*2, posterHeight = 480*2; 
    … …  
    266267    while ( arguments.read("--enable-output-poster") ) { outputPoster = true; } 
    267268    while ( arguments.read("--disable-output-poster") ) { outputPoster = false; } 
    268     while ( arguments.read("--enable-output-tiles") ) { outputTiles = true; } 
    269     while ( arguments.read("--disable-output-tiles") ) { outputTiles = false; } 
     269    //while ( arguments.read("--enable-output-tiles") ) { outputTiles = true; } 
     270    //while ( arguments.read("--disable-output-tiles") ) { outputTiles = false; } 
    270271    while ( arguments.read("--use-fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; } 
    271272    while ( arguments.read("--use-pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; } 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgtext3D/TextNode.cpp

    r12292 r12598  
    7878 
    7979    float characterWidthScale = 1.0f; 
    80     float characterHeightScale = 1.0f; 
    8180 
    8281    bool textIs3D = (style && style->getThicknessRatio()!=0.0); 
    … …  
    8483    { 
    8584        characterWidthScale = 1.0f/static_cast<float>(resolution.first); 
    86         characterHeightScale = 1.0f/static_cast<float>(resolution.second); 
    8785    } 
    8886 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgthreadedterrain/osgthreadedterrain.cpp

    r12292 r12598  
    667667    osg::Texture::FilterMode filter = osg::Texture::LINEAR; 
    668668 
    669     bool readParameter = false; 
    670669    float minValue, maxValue; 
    671670    float scale = 1.0f; 
    … …  
    675674    while(pos<arguments.argc()) 
    676675    { 
    677         readParameter = false; 
    678676        std::string filename; 
    679677         
    … …  
    681679        { 
    682680            osg::notify(osg::NOTICE)<<"Set layer number to "<<layerNum<<std::endl; 
    683             readParameter = true; 
    684681        } 
    685682 
    … …  
    694691            locator->setCoordinateSystemType(osgTerrain::Locator::GEOCENTRIC); 
    695692            locator->setTransformAsExtents(x,y,x+w,y+h); 
    696             readParameter = true; 
    697693        } 
    698694 
    … …  
    700696        { 
    701697            // define the extents. 
    702             readParameter = true; 
    703698        } 
    704699 
    … …  
    712707        else if (arguments.read(pos, "--hf",filename)) 
    713708        { 
    714             readParameter = true; 
    715              
    716709            osg::notify(osg::NOTICE)<<"--hf "<<filename<<std::endl; 
    717710 
    … …  
    749742        else if (arguments.read(pos, "-d",filename) || arguments.read(pos, "--elevation-image",filename)) 
    750743        { 
    751             readParameter = true; 
    752744            osg::notify(osg::NOTICE)<<"--elevation-image "<<filename<<std::endl; 
    753745 
    … …  
    784776        else if (arguments.read(pos, "-c",filename) || arguments.read(pos, "--image",filename)) 
    785777        { 
    786             readParameter = true; 
    787778            osg::notify(osg::NOTICE)<<"--image "<<filename<<" x="<<x<<" y="<<y<<" w="<<w<<" h="<<h<<std::endl; 
    788779 
    … …  
    819810        else if (arguments.read(pos, "--filter",filterName)) 
    820811        { 
    821             readParameter = true; 
    822              
    823812            if (filterName=="NEAREST") 
    824813            { 
    … …  
    845834        else if (arguments.read(pos, "--tf",minValue, maxValue)) 
    846835        { 
    847             readParameter = true; 
    848  
    849836            osg::ref_ptr<osg::TransferFunction1D> tf = new osg::TransferFunction1D; 
    850837             

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgvolume/osgvolume.cpp

    r12508 r12598  
    534534    arguments.getApplicationUsage()->addCommandLineOption("--t_maxTextureSize <size>","Set the texture maximum resolution in the t (y) dimension."); 
    535535    arguments.getApplicationUsage()->addCommandLineOption("--r_maxTextureSize <size>","Set the texture maximum resolution in the r (z) dimension."); 
    536     arguments.getApplicationUsage()->addCommandLineOption("--compressed","Enable the usage of compressed textures."); 
    537     arguments.getApplicationUsage()->addCommandLineOption("--compressed-arb","Enable the usage of OpenGL ARB compressed textures."); 
    538     arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt1","Enable the usage of S3TC DXT1 compressed textures."); 
    539     arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt3","Enable the usage of S3TC DXT3 compressed textures."); 
    540     arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt5","Enable the usage of S3TC DXT5 compressed textures."); 
    541536    arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-luminance","For each pixel multiply the alpha value by the luminance."); 
    542537    arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance","For each pixel set the alpha value to the luminance."); 
    … …  
    675670    while(arguments.read("--t_maxTextureSize",t_maximumTextureSize)) {} 
    676671    while(arguments.read("--r_maxTextureSize",r_maximumTextureSize)) {} 
    677  
    678     osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT; 
    679     while(arguments.read("--compressed") || arguments.read("--compressed-arb")) { internalFormatMode = osg::Texture::USE_ARB_COMPRESSION; } 
    680  
    681     while(arguments.read("--compressed-dxt1")) { internalFormatMode = osg::Texture::USE_S3TC_DXT1_COMPRESSION; } 
    682     while(arguments.read("--compressed-dxt3")) { internalFormatMode = osg::Texture::USE_S3TC_DXT3_COMPRESSION; } 
    683     while(arguments.read("--compressed-dxt5")) { internalFormatMode = osg::Texture::USE_S3TC_DXT5_COMPRESSION; } 
    684  
    685672 
    686673    // set up colour space operation. 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osgwidgetcanvas/osgwidgetcanvas.cpp

    r12292 r12598  
    2424} 
    2525 
    26 bool windowMouseOver(osgWidget::Event& event) { 
    27     osgWidget::XYCoord xy = event.getWindow()->localXY(event.x, event.y); 
    28  
     26bool windowMouseOver(osgWidget::Event& /*event*/) { 
     27    //osgWidget::XYCoord xy = event.getWindow()->localXY(event.x, event.y); 
    2928    // osgWidget::warn() << "WINDOW " << xy.x() << " - " << xy.y() << std::endl; 
    3029 
    … …  
    3231} 
    3332 
    34 bool widgetMouseOver(osgWidget::Event& event) { 
    35     osgWidget::XYCoord xy = event.getWidget()->localXY(event.x, event.y); 
    36  
     33bool widgetMouseOver(osgWidget::Event& /*event*/) { 
     34    // osgWidget::XYCoord xy = event.getWidget()->localXY(event.x, event.y); 
    3735    // osgWidget::warn() << "WIDGET mouseOver " << xy.x() << " - " << xy.y() << std::endl; 
    3836 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osg/ShapeDrawable.cpp

    r11472 r12598  
    14071407    float zBase=(top?(sinf(lBase)*radius):-radius); 
    14081408    float vBase=(top?(vDelta*(numRows/2)):0.0f); 
    1409     float nzBase=(top?(sinf(lBase)):-1.0f); 
    1410     float nRatioBase=(top?(cosf(lBase)):0.0f); 
    14111409 
    14121410    unsigned int rowbegin = top?numRows/2:0; 
    … …  
    14201418        float zTop = sinf(lTop)*radius; 
    14211419        float vTop = vBase+vDelta; 
    1422         float nzTop= sinf(lTop); 
    1423         float nRatioTop= cosf(lTop); 
    14241420 
    14251421        _functor.begin(GL_QUAD_STRIP); 
    … …  
    14501446        zBase=zTop; 
    14511447        vBase=vTop; 
    1452         nzBase=nzTop; 
    1453         nRatioBase=nRatioTop; 
    1454  
    14551448    } 
    14561449         

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgGA/NodeTrackerManipulator.cpp

    r12157 r12598  
    255255         rotation_matrix.makeRotate(_rotation); 
    256256 
    257          osg::Vec3d lookVector = -getUpVector(rotation_matrix); 
    258257         osg::Vec3d sideVector = getSideVector(rotation_matrix); 
    259          osg::Vec3d upVector = getFrontVector(rotation_matrix); 
    260  
    261258         osg::Vec3d localUp(0.0f,0.0f,1.0f); 
    262259 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgGA/TerrainManipulator.cpp

    r11709 r12598  
    215215 
    216216    // compute look vector. 
    217     Vec3d lookVector = -getUpVector(rotation_matrix); 
    218217    Vec3d sideVector = getSideVector(rotation_matrix); 
    219     Vec3d upVector = getFrontVector(rotation_matrix); 
    220218 
    221219    // CoordinateFrame coordinateFrame = getCoordinateFrame(_center); 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgParticle/FluidProgram.cpp

    r11482 r12598  
    3636             
    3737            // compute force due to friction 
    38             osg::Vec3 velBefore = particle->getVelocity(); 
    3938            osg::Vec3 relative_wind = particle->getVelocity()-_wind;             
    4039            osg::Vec3 wind_force = - relative_wind * Area * (_viscosityCoefficient + _densityCoefficient*relative_wind.length()); 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/Inventor/ConvertToInventor.cpp

    r12578 r12598  
    16541654                                  coords, normals, ivMaterial, texCoords, 
    16551655                                  ivState->ivTexture, shape, indexedRoot, nonIndexedRoot); 
     1656        if (!ok) 
     1657        { 
     1658            OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."<<std::endl; 
     1659        } 
    16561660        break; 
    16571661      } 
    … …  
    16681672                                  coords, normals, ivMaterial, texCoords, 
    16691673                                  ivState->ivTexture, shape, indexedRoot, nonIndexedRoot); 
     1674        if (!ok) 
     1675        { 
     1676            OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."<<std::endl; 
     1677        } 
    16701678 
    16711679        break; 
    … …  
    17171725                                  coords, normals, ivMaterial, texCoords, 
    17181726                                  ivState->ivTexture, shape, indexedRoot, nonIndexedRoot); 
     1727        if (!ok) 
     1728        { 
     1729            OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."<<std::endl; 
     1730        } 
    17191731        break; 
    17201732      } 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/OpenFlight/GeometryRecords.cpp

    r12090 r12598  
    367367        in.forward(7); 
    368368        osg::Vec4 primaryPackedColor = in.readColor32(); 
    369         osg::Vec4 secondaryPackedColor = in.readColor32(); 
     369        /*osg::Vec4 secondaryPackedColor =*/ in.readColor32(); 
    370370        // version >= VERSION_15_1 
    371371        /*int textureMappingIndex =*/ in.readInt16(-1); 
    … …  
    940940        in.forward(7); 
    941941        osg::Vec4 primaryPackedColor = in.readColor32(); 
    942         osg::Vec4 secondaryPackedColor = in.readColor32(); 
     942        /*osg::Vec4 secondaryPackedColor =*/ in.readColor32(); 
    943943        // version >= VERSION_15_1 
    944944        /*int textureMappingIndex =*/ in.readInt16(-1); 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp

    r12297 r12598  
    424424                // The continuation record complicates things a bit. 
    425425 
    426                 // Get current read position in stream. 
    427                 std::istream::pos_type pos = fin.tellg(); 
    428  
    429426                // get opcode and size 
    430427                flt::DataInputStream dataStream(fin.rdbuf()); 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/ac/Geode.cpp

    r6860 r12598  
    930930                        GLenum mode=primitiveset->getMode(); 
    931931                         
    932                         unsigned int primLength; 
    933932                        unsigned int surfaceFlags = 0x00; 
    934933                         
    … …  
    936935                        { 
    937936                        case(osg::PrimitiveSet::POINTS): 
    938                             primLength = 1; 
    939937                            surfaceFlags = 0x02; 
    940938                            break; 
    941939                        case(osg::PrimitiveSet::LINES): 
    942                             primLength = 2; 
    943940                            surfaceFlags = 0x02; 
    944941                            break; 
    945942                        case(osg::PrimitiveSet::TRIANGLES): 
    946                             primLength = 3; 
    947943                            break; 
    948944                        case(osg::PrimitiveSet::QUADS): 
    949                             primLength = 4; 
    950945                            break; 
    951946                        default: 
    952                             primLength = 0; 
    953947                            break; // compute later when =0. 
    954948                        } 
    … …  
    10281022                                    break; // unknown shape 
    10291023                                } 
    1030         /*                        const osg::DrawArrayLengths* drawArrayLengths = static_cast<const osg::DrawArrayLengths*>(primitiveset); 
    1031                                 unsigned int vindex = drawArrayLengths->getFirst(); 
    1032                                 for(osg::DrawArrayLengths::const_iterator primItr = drawArrayLengths->begin(); primItr !=drawArrayLengths->end(); ++primItr) 
    1033                                 { 
    1034                                     unsigned int localPrimLength; 
    1035                                     if (primLength == 0) localPrimLength = *primItr; 
    1036                                     else localPrimLength = primLength; 
    1037                                      
    1038                                     for(GLsizei primCount = 0; primCount < *primItr; ++primCount) 
    1039                                     { 
    1040                                         if ((primCount%localPrimLength)==0) 
    1041                                         { 
    1042                                             OutputSurfHead(iCurrentMaterial,surfaceFlags,localPrimLength, fout); 
    1043                                         } 
    1044                                         OutputVertex(vindex, pVertexIndices, pTexCoords, pTexIndices, fout); 
    1045                                         ++vindex; 
    1046                                     } 
    1047                                      
    1048                                 }*/ 
    10491024                                break; 
    10501025                            } 
    … …  
    10751050                                    break; // unknown shape 
    10761051                                } 
    1077 /*                                if (primLength == 0) 
    1078                                     primLength = primitiveset->getNumIndices(); 
    1079                                  
    1080                                 const osg::DrawElementsUByte* drawElements = static_cast<const osg::DrawElementsUByte*>(primitiveset); 
    1081                                  
    1082                                 unsigned int primCount = 0; 
    1083                                 for(osg::DrawElementsUByte::const_iterator primItr=drawElements->begin(); primItr!=drawElements->end(); ++primCount,++primItr) 
    1084                                 { 
    1085                                      
    1086                                     if ((primCount%primLength) == 0) 
    1087                                     { 
    1088         OutputSurfHead(iCurrentMaterial,surfaceFlags,primLength, fout); 
    1089                                     } 
    1090                                      
    1091                                     unsigned int vindex=*primItr; 
    1092                                     OutputVertex(vindex, pVertexIndices, pTexCoords, pTexIndices, fout); 
    1093                                 } 
    1094                                 */ 
    10951052                                 
    10961053                                break; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/cfg/ConfigParser.cpp

    r12292 r12598  
    226226#include <string.h> 
    227227#include <stdio.h> 
     228#include <errno.h> 
    228229#include <string> 
    229230 
    … …  
    22462247        int pd[2]; 
    22472248        int result = pipe( pd ); 
     2249        if (result<0) 
     2250        { 
     2251            fprintf( stderr, "CameraConfig::parseFile() - pipe() failed, errno= \"%d\".\n",  errno); 
     2252            return false; 
     2253        } 
    22482254 
    22492255        flexer = new yyFlexLexer; 
    … …  
    22532259            close( pd[0] ); 
    22542260            close( 1 ); 
    2255             result = dup( pd[1] ); 
     2261            int result = dup( pd[1] ); 
     2262            if (result<0) 
     2263            { 
     2264                fprintf( stderr, "CameraConfig::parseFile() - dup() failed, errno= \"%d\".\n",  errno); 
     2265                return false; 
     2266            } 
    22562267 
    22572268 
    … …  
    22712282            close( pd[1]); 
    22722283            close( 0 ); 
    2273             result = dup( pd[0] ); 
     2284            int result = dup( pd[0] ); 
     2285            if (result<0) 
     2286            { 
     2287                fprintf( stderr, "CameraConfig::parseFile() - dup() failed, errno= \"%d\".\n",  errno); 
     2288                return false; 
     2289            } 
    22742290 
    22752291            cfg = this; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/dds/ReaderWriterDDS.cpp

    r12541 r12598  
    312312    } 
    313313 
    314     bool is3dImage = false; 
    315314    int depth = 1; 
    316315 
    … …  
    318317    if( ddsd.dwDepth > 0 && (ddsd.dwFlags & DDSD_DEPTH)) 
    319318    { 
    320         is3dImage = true; 
    321319        depth = ddsd.dwDepth; 
    322320    } 
    … …  
    719717    unsigned int pixelSize      = osg::Image::computePixelSizeInBits(pixelFormat, dataType); 
    720718    unsigned int imageSize      = img->getImageSizeInBytes(); 
    721     bool is3dImage = false; 
    722719 
    723720    ddsd.dwWidth  = img->s(); 
    … …  
    727724    if(r > 1)  /* check for 3d image */ 
    728725    { 
    729         is3dImage = true; 
    730726        ddsd.dwDepth = r; 
    731727        SD_flags    |= DDSD_DEPTH; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/hdr/hdrloader.cpp

    r9801 r12598  
    9999    fseek(file, 1, SEEK_CUR); 
    100100 
    101     char cmd[2000]; 
     101    //char cmd[2000]; 
    102102    i = 0; 
    103103    char c = 0, oldc; 
    … …  
    107107        if (c == 0xa && oldc == 0xa) 
    108108            break; 
    109         cmd[i++] = c; 
     109        //cmd[i++] = c; 
    110110    } 
    111111 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/ive/ShapeAttributeList.cpp

    r12292 r12598  
    2929 
    3030    // Write elements of the list 
    31     osgSim::ShapeAttributeList::const_iterator it = begin(); 
    3231    for (const_iterator it = begin(); it != end(); it++) 
    3332    { 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/jp2/ReaderWriterJP2.cpp

    r12217 r12598  
    3939        jas_seqent_t *d[4]; 
    4040        jas_seqent_t v; 
    41         int linelen; 
    4241        int width, height; 
    4342 
    … …  
    6564                d[cmptno] = jas_matrix_getref(data[cmptno], 0, 0); 
    6665            } 
    67             linelen = 0; 
    6866            for (x = 0; x < width; ++x) { 
    6967                for (cmptno = 0; cmptno < numcmpts; ++cmptno) { 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/p3d/ReaderWriterP3D.cpp

    r12292 r12598  
    21192119    osgDB::FilePathList previousPaths = osgDB::getDataFilePathList(); 
    21202120 
    2121     bool readSlide = false; 
    2122  
    21232121    for(osgDB::XmlNode::Children::iterator itr = root->children.begin(); 
    21242122        itr != root->children.end(); 
    … …  
    22432241        else if (readOnlyHoldingPage && cur->name == "holding_slide") 
    22442242        { 
    2245             readSlide = true; 
    22462243            constructor.addSlide(); 
    22472244            parseSlide (constructor, cur); 
    … …  
    22492246        else if (!readOnlyHoldingPage && cur->name == "slide") 
    22502247        { 
    2251             readSlide = true; 
    22522248            constructor.addSlide(); 
    22532249 
    … …  
    22672263        else if (!readOnlyHoldingPage && cur->name == "modify_slide") 
    22682264        { 
    2269             readSlide = true; 
    22702265            int slideNum; 
    22712266            if (getProperty(cur, "slide", slideNum)) 
    … …  
    22812276        else if (!readOnlyHoldingPage && cur->name == "page") 
    22822277        { 
    2283             readSlide = true; 
    22842278            parsePage (constructor, cur); 
    22852279        } 
    22862280        else if (!readOnlyHoldingPage && cur->name == "pdf_document") 
    22872281        { 
    2288             readSlide = true; 
    22892282            parsePdfDocument(constructor, cur); 
    22902283        } 
    22912284        else if (!readOnlyHoldingPage && cur->name == "template_slide") 
    22922285        { 
    2293             readSlide = true; 
    22942286            std::string name; 
    22952287            if (getProperty(cur, "name", name)) 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/pvr/ReaderWriterPVR.cpp

    r12578 r12598  
    153153        GLenum internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG; 
    154154        uint32_t width, height; 
    155         bool hasAlpha; 
    156155         
    157156        if(formatFlags == kPVRTextureFlagTypePVRTC_4 || formatFlags == kPVRTextureFlagTypePVRTC_2 || 
    … …  
    167166            width = header.width; 
    168167            height = header.height; 
    169              
    170             if(header.bitmaskAlpha) 
    171                 hasAlpha = true; 
    172             else 
    173                 hasAlpha = false; 
    174              
     168 
    175169            osg::ref_ptr<osg::Image> image = new osg::Image; 
    176170            if (!image) return ReadResult::INSUFFICIENT_MEMORY_TO_LOAD; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/txp/trpage_geom.cpp

    r12536 r12598  
    612612                buf.Add(td.doubleData[j]); 
    613613            buf.End(); 
    614  
    615             float u; 
    616             for (j=0;j<(unsigned int)num*2;j++) 
    617                 u = (float)td.doubleData[j]; 
    618614        } 
    619615    } 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/txp/trpage_material.cpp

    r12538 r12598  
    101101 
    102102    int baseMat=0; 
    103     bool spaceInTable=false; 
     103    //bool spaceInTable=false; 
    104104    //int offset=baseMat; 
    105105     
    … …  
    113113            if (bm.shadeModel==999) { 
    114114                // this is an 'empty' entry.  Means we won't find it, either. 
    115                 spaceInTable=true; 
     115                //spaceInTable=true; 
    116116                break; 
    117117            } 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/txp/trpage_rarchive.cpp

    r9124 r12598  
    259259    { 
    260260        // bool firstBlock = true; 
    261         bool headerHasTexTable = false; 
    262261        //if the master has textures, we want to use them instead of the tables in the 
    263262        //block archives 
    264         int numTex = 0; 
    265         texTable.GetNumTextures(numTex); 
    266         if(numTex) 
    267             headerHasTexTable = true; 
     263 
    268264        // int numTiles = 0; 
    269265        //tileTable. 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/vtf/ReaderWriterVTF.cpp

    r12292 r12598  
    358358    unsigned int      lrSize; 
    359359    unsigned char *   imageData; 
    360     unsigned int      base; 
    361360    unsigned int      size; 
    362361    int               mip; 
    … …  
    499498 
    500499    // Compute the base position of the high-res image data 
    501     base = vtf_header.header_size + lrSize; 
     500    // unsigned int base = vtf_header.header_size + lrSize; 
    502501 
    503502    // Now, get the internal format, pixel format, and data type from the 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/zip/ZipArchive.cpp

    r12498 r12598  
    8989    { 
    9090        ZipEntryMap::const_iterator iter = mZipIndex.begin(); 
    91         ZipEntryMap::const_iterator iterEnd = mZipIndex.end(); 
    9291 
    9392        for(;iter != mZipIndex.end(); ++iter) 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/zip/unzip.cpp

    r12578 r12598  
    40434043#endif 
    40444044 
    4045  
    4046  
    40474045  unsigned long a = ufi.external_fa; 
    40484046  // zip has an 'attribute' 32bit value. Its lower half is windows stuff 
    … …  
    40534051  //bool readable=  (a&0x01000000)!=0; // unused 
    40544052  //bool executable=(a&0x00400000)!=0; // unused 
    4055   bool hidden=false, system=false, archive=true; 
    40564053  // but in normal hostmodes these are overridden by the lower half... 
    40574054  int host = ufi.version>>8; 
    40584055  if (host==0 || host==7 || host==11 || host==14) 
    40594056  { readonly=  (a&0x00000001)!=0; 
    4060     hidden=    (a&0x00000002)!=0; 
    4061     system=    (a&0x00000004)!=0; 
    40624057    isdir=     (a&0x00000010)!=0; 
    4063     archive=   (a&0x00000020)!=0; 
    40644058  } 
    40654059  // readonly; hidden; system; isdir; archive; 
    … …  
    40704064  if (readonly) ze->attr &= ~S_IWUSR; 
    40714065#else 
     4066  bool hidden=false, system=false, archive=true; 
     4067  if (host==0 || host==7 || host==11 || host==14) 
     4068  { 
     4069    hidden=    (a&0x00000002)!=0; 
     4070    system=    (a&0x00000004)!=0; 
     4071    archive=   (a&0x00000020)!=0; 
     4072  } 
     4073 
    40724074  if (isdir) ze->attr |= FILE_ATTRIBUTE_DIRECTORY; 
     4075  if (readonly) ze->attr|=FILE_ATTRIBUTE_READONLY; 
    40734076  if (archive) ze->attr|=FILE_ATTRIBUTE_ARCHIVE; 
    40744077  if (hidden) ze->attr|=FILE_ATTRIBUTE_HIDDEN; 
    4075   if (readonly) ze->attr|=FILE_ATTRIBUTE_READONLY; 
    40764078  if (system) ze->attr|=FILE_ATTRIBUTE_SYSTEM; 
    40774079#endif 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgQt/QGraphicsViewAdapter.cpp

    r12292 r12598  
    342342        (rightButtonPressed ? Qt::RightButton : Qt::NoButton); 
    343343 
    344     const QRect viewportGeometry = _graphicsView->viewport()->geometry(); 
    345344    const QPoint globalPos(x, y); 
    346       
    347  
    348345       
    349346    if (buttonMask != _previousButtonMask) 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgShadow/ParallelSplitShadowMap.cpp

    r12319 r12598  
    591591    cbbv.setTraversalMask(getShadowedScene()->getCastsShadowTraversalMask()); 
    592592    _shadowedScene->osg::Group::traverse(cbbv); 
    593     osg::BoundingBox bb = cbbv.getBoundingBox(); 
     593 
    594594    ////////////////////////////////////////////////////////////////////////// 
    595595    const osg::Light* selectLight = 0; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgTerrain/GeometryTechnique.cpp

    r12292 r12598  
    775775    float sampleRatio = terrain ? terrain->getSampleRatio() : 1.0f; 
    776776 
    777     double i_sampleFactor = 1.0; 
    778     double j_sampleFactor = 1.0; 
    779  
    780777    // OSG_NOTICE<<"Sample ratio="<<sampleRatio<<std::endl; 
    781778 
    … …  
    790787        numColumns = std::max((unsigned int) (float(originalNumColumns)*sqrtf(sampleRatio)), minimumNumColumns); 
    791788        numRows = std::max((unsigned int) (float(originalNumRows)*sqrtf(sampleRatio)),minimumNumRows); 
    792  
    793         i_sampleFactor = double(originalNumColumns-1)/double(numColumns-1); 
    794         j_sampleFactor = double(originalNumRows-1)/double(numRows-1); 
    795789    } 
    796790     

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgText/FadeText.cpp

    r11477 r12598  
    7272        osg::Vec3d edge01 = _vertices[1] - _vertices[0]; 
    7373        osg::Vec3d edge12 = _vertices[2] - _vertices[1]; 
    74         osg::Vec3d edge23 = _vertices[3] - _vertices[2]; 
    75         osg::Vec3d edge30 = _vertices[0] - _vertices[3]; 
    7674 
    7775        osg::Vec3d normalFrontFace = edge01 ^ edge12; 
    … …  
    9088        OSG_NOTICE<<" edge01 = "<<edge01<<std::endl; 
    9189        OSG_NOTICE<<" edge12 = "<<edge12<<std::endl; 
    92         OSG_NOTICE<<" edge23 = "<<edge23<<std::endl; 
    9390        OSG_NOTICE<<" _vertices[0]= "<<_vertices[0]<<std::endl; 
    9491        OSG_NOTICE<<" _vertices[1]= "<<_vertices[1]<<std::endl; 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgText/Text.cpp

    r12068 r12598  
    754754    // instead of recomputing it each time. 
    755755    is_valid_size = computeAverageGlyphWidthAndHeight(avg_width, avg_height); 
     756 
     757    if (!is_valid_size) return; 
    756758     
    757759    // now apply matrix to the glyphs. 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgUtil/DelaunayTriangulator.cpp

    r11473 r12598  
    567567        case osg::PrimitiveSet::TRIANGLE_FAN: 
    568568            { 
    569                 osg::Vec3 ptest=(*constraintverts)[prset->index(0)]; 
    570569                if (prset->index(0)>=npts) 
    571570                { 
    … …  
    977976                            bool edgused=false;// first check for exact edge indices are used. 
    978977                            Triangle_list::iterator titr; 
    979                             const osg::Vec3 curp=(*vercon)[prset->index(i)]; 
    980978                            int it=0; 
    981979                            for (titr=triangles.begin(); titr!=triangles.end() && !edgused; ++titr) 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgUtil/RenderStage.cpp

    r12552 r12598  
    629629            bool colorAttached = false; 
    630630            bool depthAttached = false; 
    631             bool stencilAttached = false; 
    632631            for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); 
    633632                itr != bufferAttachments.end(); 
    … …  
    648647                    { 
    649648                        traits->stencil = 8; 
    650                         stencilAttached = true; 
    651649                        break; 
    652650                    } 
    … …  
    656654                        depthAttached = true; 
    657655                        traits->stencil = 8; 
    658                         stencilAttached = true; 
    659656                    } 
    660657                    case(osg::Camera::COLOR_BUFFER): 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgViewer/View.cpp

    r12504 r12598  
    735735    float screenRadius = heightVector.length() * 0.5f; 
    736736 
    737     osg::Vec3 cursor = bottom; 
    738737    int i,j; 
    739738 
    … …  
    11151114    osg::Vec4Array* colors = new osg::Vec4Array; 
    11161115 
    1117     osg::Vec3 bottom = origin; 
    1118     osg::Vec3 dx = xAxis*(width/((float)(noSteps-2))); 
    1119     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1))); 
    1120  
    11211116    osg::Vec3 top = origin + yAxis*height; 
    11221117 
    … …  
    11281123    for(int i=0;i<noSteps;++i) 
    11291124    { 
    1130         osg::Vec3 cursor = bottom+dy*(float)i; 
    11311125        for(int j=0;j<noSteps;++j) 
    11321126        { 

  • OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgVolume/FixedFunctionTechnique.cpp

    r12292 r12598  
    122122    
    123123    osg::Image* image_3d = 0; 
    124     osg::TransferFunction1D* tf = 0; 
    125124    osgVolume::Locator* masterLocator = _volumeTile->getLocator(); 
    126125    osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT;  
    … …  
    137136    { 
    138137        alphaFuncValue = cpv._isoProperty->getValue(); 
    139     } 
    140  
    141     if (cpv._tfProperty.valid()) 
    142     { 
    143         tf = dynamic_cast<osg::TransferFunction1D*>(cpv._tfProperty->getTransferFunction()); 
    144138    } 
    145139