Index: /OpenSceneGraph/trunk/applications/present3D/present3D.cpp =================================================================== --- /OpenSceneGraph/trunk/applications/present3D/present3D.cpp (revision 12362) +++ /OpenSceneGraph/trunk/applications/present3D/present3D.cpp (revision 12597) @@ -637,9 +637,6 @@ float height = osg::DisplaySettings::instance()->getScreenHeight(); float distance = osg::DisplaySettings::instance()->getScreenDistance(); - bool sizesSpecified = false; while (arguments.read("-s", width, height, distance)) { - sizesSpecified = true; - osg::DisplaySettings::instance()->setScreenDistance(distance); osg::DisplaySettings::instance()->setScreenHeight(height); Index: /OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp (revision 12597) @@ -122,5 +122,4 @@ osg::Image* image_3d = 0; - osg::TransferFunction1D* tf = 0; osgVolume::Locator* masterLocator = _volumeTile->getLocator(); osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT; @@ -137,9 +136,4 @@ { alphaFuncValue = cpv._isoProperty->getValue(); - } - - if (cpv._tfProperty.valid()) - { - tf = dynamic_cast(cpv._tfProperty->getTransferFunction()); } Index: /OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp (revision 12552) +++ /OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp (revision 12597) @@ -629,5 +629,4 @@ bool colorAttached = false; bool depthAttached = false; - bool stencilAttached = false; for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); itr != bufferAttachments.end(); @@ -648,5 +647,4 @@ { traits->stencil = 8; - stencilAttached = true; break; } @@ -656,5 +654,4 @@ depthAttached = true; traits->stencil = 8; - stencilAttached = true; } case(osg::Camera::COLOR_BUFFER): Index: /OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp (revision 11473) +++ /OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp (revision 12597) @@ -567,5 +567,4 @@ case osg::PrimitiveSet::TRIANGLE_FAN: { - osg::Vec3 ptest=(*constraintverts)[prset->index(0)]; if (prset->index(0)>=npts) { @@ -977,5 +976,4 @@ bool edgused=false;// first check for exact edge indices are used. Triangle_list::iterator titr; - const osg::Vec3 curp=(*vercon)[prset->index(i)]; int it=0; for (titr=triangles.begin(); titr!=triangles.end() && !edgused; ++titr) Index: /OpenSceneGraph/trunk/src/osg/ShapeDrawable.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osg/ShapeDrawable.cpp (revision 11472) +++ /OpenSceneGraph/trunk/src/osg/ShapeDrawable.cpp (revision 12597) @@ -1407,6 +1407,4 @@ float zBase=(top?(sinf(lBase)*radius):-radius); float vBase=(top?(vDelta*(numRows/2)):0.0f); - float nzBase=(top?(sinf(lBase)):-1.0f); - float nRatioBase=(top?(cosf(lBase)):0.0f); unsigned int rowbegin = top?numRows/2:0; @@ -1420,6 +1418,4 @@ float zTop = sinf(lTop)*radius; float vTop = vBase+vDelta; - float nzTop= sinf(lTop); - float nRatioTop= cosf(lTop); _functor.begin(GL_QUAD_STRIP); @@ -1450,7 +1446,4 @@ zBase=zTop; vBase=vTop; - nzBase=nzTop; - nRatioBase=nRatioTop; - } Index: /OpenSceneGraph/trunk/src/osgPlugins/jp2/ReaderWriterJP2.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/jp2/ReaderWriterJP2.cpp (revision 12217) +++ /OpenSceneGraph/trunk/src/osgPlugins/jp2/ReaderWriterJP2.cpp (revision 12597) @@ -39,5 +39,4 @@ jas_seqent_t *d[4]; jas_seqent_t v; - int linelen; int width, height; @@ -65,5 +64,4 @@ d[cmptno] = jas_matrix_getref(data[cmptno], 0, 0); } - linelen = 0; for (x = 0; x < width; ++x) { for (cmptno = 0; cmptno < numcmpts; ++cmptno) { Index: /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp (revision 12297) +++ /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp (revision 12597) @@ -424,7 +424,4 @@ // The continuation record complicates things a bit. - // Get current read position in stream. - std::istream::pos_type pos = fin.tellg(); - // get opcode and size flt::DataInputStream dataStream(fin.rdbuf()); Index: /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp (revision 12090) +++ /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp (revision 12597) @@ -367,5 +367,5 @@ in.forward(7); osg::Vec4 primaryPackedColor = in.readColor32(); - osg::Vec4 secondaryPackedColor = in.readColor32(); + /*osg::Vec4 secondaryPackedColor =*/ in.readColor32(); // version >= VERSION_15_1 /*int textureMappingIndex =*/ in.readInt16(-1); @@ -940,5 +940,5 @@ in.forward(7); osg::Vec4 primaryPackedColor = in.readColor32(); - osg::Vec4 secondaryPackedColor = in.readColor32(); + /*osg::Vec4 secondaryPackedColor =*/ in.readColor32(); // version >= VERSION_15_1 /*int textureMappingIndex =*/ in.readInt16(-1); Index: /OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp (revision 12577) +++ /OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertToInventor.cpp (revision 12597) @@ -1654,4 +1654,8 @@ coords, normals, ivMaterial, texCoords, ivState->ivTexture, shape, indexedRoot, nonIndexedRoot); + if (!ok) + { + OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."<ivTexture, shape, indexedRoot, nonIndexedRoot); + if (!ok) + { + OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."<ivTexture, shape, indexedRoot, nonIndexedRoot); + if (!ok) + { + OSG_WARN<<"Inventor plugin, ConvertToInventor processPrimitiveSet() failed."< image = new osg::Image; if (!image) return ReadResult::INSUFFICIENT_MEMORY_TO_LOAD; Index: /OpenSceneGraph/trunk/src/osgPlugins/cfg/ConfigParser.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/cfg/ConfigParser.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgPlugins/cfg/ConfigParser.cpp (revision 12597) @@ -226,4 +226,5 @@ #include #include +#include #include @@ -2246,4 +2247,9 @@ int pd[2]; int result = pipe( pd ); + if (result<0) + { + fprintf( stderr, "CameraConfig::parseFile() - pipe() failed, errno= \"%d\".\n", errno); + return false; + } flexer = new yyFlexLexer; @@ -2253,5 +2259,10 @@ close( pd[0] ); close( 1 ); - result = dup( pd[1] ); + int result = dup( pd[1] ); + if (result<0) + { + fprintf( stderr, "CameraConfig::parseFile() - dup() failed, errno= \"%d\".\n", errno); + return false; + } @@ -2271,5 +2282,10 @@ close( pd[1]); close( 0 ); - result = dup( pd[0] ); + int result = dup( pd[0] ); + if (result<0) + { + fprintf( stderr, "CameraConfig::parseFile() - dup() failed, errno= \"%d\".\n", errno); + return false; + } cfg = this; Index: /OpenSceneGraph/trunk/src/osgPlugins/dds/ReaderWriterDDS.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/dds/ReaderWriterDDS.cpp (revision 12541) +++ /OpenSceneGraph/trunk/src/osgPlugins/dds/ReaderWriterDDS.cpp (revision 12597) @@ -312,5 +312,4 @@ } - bool is3dImage = false; int depth = 1; @@ -318,5 +317,4 @@ if( ddsd.dwDepth > 0 && (ddsd.dwFlags & DDSD_DEPTH)) { - is3dImage = true; depth = ddsd.dwDepth; } @@ -719,5 +717,4 @@ unsigned int pixelSize = osg::Image::computePixelSizeInBits(pixelFormat, dataType); unsigned int imageSize = img->getImageSizeInBytes(); - bool is3dImage = false; ddsd.dwWidth = img->s(); @@ -727,5 +724,4 @@ if(r > 1) /* check for 3d image */ { - is3dImage = true; ddsd.dwDepth = r; SD_flags |= DDSD_DEPTH; Index: /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp (revision 9801) +++ /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp (revision 12597) @@ -99,5 +99,5 @@ fseek(file, 1, SEEK_CUR); - char cmd[2000]; + //char cmd[2000]; i = 0; char c = 0, oldc; @@ -107,5 +107,5 @@ if (c == 0xa && oldc == 0xa) break; - cmd[i++] = c; + //cmd[i++] = c; } Index: /OpenSceneGraph/trunk/src/osgPlugins/ive/ShapeAttributeList.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/ive/ShapeAttributeList.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgPlugins/ive/ShapeAttributeList.cpp (revision 12597) @@ -29,5 +29,4 @@ // Write elements of the list - osgSim::ShapeAttributeList::const_iterator it = begin(); for (const_iterator it = begin(); it != end(); it++) { Index: /OpenSceneGraph/trunk/src/osgPlugins/vtf/ReaderWriterVTF.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/vtf/ReaderWriterVTF.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgPlugins/vtf/ReaderWriterVTF.cpp (revision 12597) @@ -358,5 +358,4 @@ unsigned int lrSize; unsigned char * imageData; - unsigned int base; unsigned int size; int mip; @@ -499,5 +498,5 @@ // Compute the base position of the high-res image data - base = vtf_header.header_size + lrSize; + // unsigned int base = vtf_header.header_size + lrSize; // Now, get the internal format, pixel format, and data type from the Index: /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_material.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_material.cpp (revision 12538) +++ /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_material.cpp (revision 12597) @@ -101,5 +101,5 @@ int baseMat=0; - bool spaceInTable=false; + //bool spaceInTable=false; //int offset=baseMat; @@ -113,5 +113,5 @@ if (bm.shadeModel==999) { // this is an 'empty' entry. Means we won't find it, either. - spaceInTable=true; + //spaceInTable=true; break; } Index: /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_rarchive.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_rarchive.cpp (revision 9124) +++ /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_rarchive.cpp (revision 12597) @@ -259,11 +259,7 @@ { // bool firstBlock = true; - bool headerHasTexTable = false; //if the master has textures, we want to use them instead of the tables in the //block archives - int numTex = 0; - texTable.GetNumTextures(numTex); - if(numTex) - headerHasTexTable = true; + // int numTiles = 0; //tileTable. Index: /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_geom.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_geom.cpp (revision 12536) +++ /OpenSceneGraph/trunk/src/osgPlugins/txp/trpage_geom.cpp (revision 12597) @@ -612,8 +612,4 @@ buf.Add(td.doubleData[j]); buf.End(); - - float u; - for (j=0;j<(unsigned int)num*2;j++) - u = (float)td.doubleData[j]; } } Index: /OpenSceneGraph/trunk/src/osgPlugins/ac/Geode.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/ac/Geode.cpp (revision 6860) +++ /OpenSceneGraph/trunk/src/osgPlugins/ac/Geode.cpp (revision 12597) @@ -930,5 +930,4 @@ GLenum mode=primitiveset->getMode(); - unsigned int primLength; unsigned int surfaceFlags = 0x00; @@ -936,19 +935,14 @@ { case(osg::PrimitiveSet::POINTS): - primLength = 1; surfaceFlags = 0x02; break; case(osg::PrimitiveSet::LINES): - primLength = 2; surfaceFlags = 0x02; break; case(osg::PrimitiveSet::TRIANGLES): - primLength = 3; break; case(osg::PrimitiveSet::QUADS): - primLength = 4; break; default: - primLength = 0; break; // compute later when =0. } @@ -1028,23 +1022,4 @@ break; // unknown shape } - /* const osg::DrawArrayLengths* drawArrayLengths = static_cast(primitiveset); - unsigned int vindex = drawArrayLengths->getFirst(); - for(osg::DrawArrayLengths::const_iterator primItr = drawArrayLengths->begin(); primItr !=drawArrayLengths->end(); ++primItr) - { - unsigned int localPrimLength; - if (primLength == 0) localPrimLength = *primItr; - else localPrimLength = primLength; - - for(GLsizei primCount = 0; primCount < *primItr; ++primCount) - { - if ((primCount%localPrimLength)==0) - { - OutputSurfHead(iCurrentMaterial,surfaceFlags,localPrimLength, fout); - } - OutputVertex(vindex, pVertexIndices, pTexCoords, pTexIndices, fout); - ++vindex; - } - - }*/ break; } @@ -1075,22 +1050,4 @@ break; // unknown shape } -/* if (primLength == 0) - primLength = primitiveset->getNumIndices(); - - const osg::DrawElementsUByte* drawElements = static_cast(primitiveset); - - unsigned int primCount = 0; - for(osg::DrawElementsUByte::const_iterator primItr=drawElements->begin(); primItr!=drawElements->end(); ++primCount,++primItr) - { - - if ((primCount%primLength) == 0) - { - OutputSurfHead(iCurrentMaterial,surfaceFlags,primLength, fout); - } - - unsigned int vindex=*primItr; - OutputVertex(vindex, pVertexIndices, pTexCoords, pTexIndices, fout); - } - */ break; Index: /OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp (revision 12597) @@ -2119,6 +2119,4 @@ osgDB::FilePathList previousPaths = osgDB::getDataFilePathList(); - bool readSlide = false; - for(osgDB::XmlNode::Children::iterator itr = root->children.begin(); itr != root->children.end(); @@ -2243,5 +2241,4 @@ else if (readOnlyHoldingPage && cur->name == "holding_slide") { - readSlide = true; constructor.addSlide(); parseSlide (constructor, cur); @@ -2249,5 +2246,4 @@ else if (!readOnlyHoldingPage && cur->name == "slide") { - readSlide = true; constructor.addSlide(); @@ -2267,5 +2263,4 @@ else if (!readOnlyHoldingPage && cur->name == "modify_slide") { - readSlide = true; int slideNum; if (getProperty(cur, "slide", slideNum)) @@ -2281,15 +2276,12 @@ else if (!readOnlyHoldingPage && cur->name == "page") { - readSlide = true; parsePage (constructor, cur); } else if (!readOnlyHoldingPage && cur->name == "pdf_document") { - readSlide = true; parsePdfDocument(constructor, cur); } else if (!readOnlyHoldingPage && cur->name == "template_slide") { - readSlide = true; std::string name; if (getProperty(cur, "name", name)) Index: /OpenSceneGraph/trunk/src/osgPlugins/zip/ZipArchive.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/zip/ZipArchive.cpp (revision 12498) +++ /OpenSceneGraph/trunk/src/osgPlugins/zip/ZipArchive.cpp (revision 12597) @@ -89,5 +89,4 @@ { ZipEntryMap::const_iterator iter = mZipIndex.begin(); - ZipEntryMap::const_iterator iterEnd = mZipIndex.end(); for(;iter != mZipIndex.end(); ++iter) Index: /OpenSceneGraph/trunk/src/osgPlugins/zip/unzip.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgPlugins/zip/unzip.cpp (revision 12577) +++ /OpenSceneGraph/trunk/src/osgPlugins/zip/unzip.cpp (revision 12597) @@ -4043,6 +4043,4 @@ #endif - - unsigned long a = ufi.external_fa; // zip has an 'attribute' 32bit value. Its lower half is windows stuff @@ -4053,13 +4051,9 @@ //bool readable= (a&0x01000000)!=0; // unused //bool executable=(a&0x00400000)!=0; // unused - bool hidden=false, system=false, archive=true; // but in normal hostmodes these are overridden by the lower half... int host = ufi.version>>8; if (host==0 || host==7 || host==11 || host==14) { readonly= (a&0x00000001)!=0; - hidden= (a&0x00000002)!=0; - system= (a&0x00000004)!=0; isdir= (a&0x00000010)!=0; - archive= (a&0x00000020)!=0; } // readonly; hidden; system; isdir; archive; @@ -4070,8 +4064,16 @@ if (readonly) ze->attr &= ~S_IWUSR; #else + bool hidden=false, system=false, archive=true; + if (host==0 || host==7 || host==11 || host==14) + { + hidden= (a&0x00000002)!=0; + system= (a&0x00000004)!=0; + archive= (a&0x00000020)!=0; + } + if (isdir) ze->attr |= FILE_ATTRIBUTE_DIRECTORY; + if (readonly) ze->attr|=FILE_ATTRIBUTE_READONLY; if (archive) ze->attr|=FILE_ATTRIBUTE_ARCHIVE; if (hidden) ze->attr|=FILE_ATTRIBUTE_HIDDEN; - if (readonly) ze->attr|=FILE_ATTRIBUTE_READONLY; if (system) ze->attr|=FILE_ATTRIBUTE_SYSTEM; #endif Index: /OpenSceneGraph/trunk/src/osgQt/QGraphicsViewAdapter.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgQt/QGraphicsViewAdapter.cpp (revision 12292) +++ /OpenSceneGraph/trunk/src/osgQt/QGraphicsViewAdapter.cpp (revision 12597) @@ -342,8 +342,5 @@ (rightButtonPressed ? Qt::RightButton : Qt::NoButton); - const QRect viewportGeometry = _graphicsView->viewport()->geometry(); const QPoint globalPos(x, y); - - if (buttonMask != _previousButtonMask) Index: /OpenSceneGraph/trunk/src/osgText/FadeText.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgText/FadeText.cpp (revision 11477) +++ /OpenSceneGraph/trunk/src/osgText/FadeText.cpp (revision 12597) @@ -72,6 +72,4 @@ osg::Vec3d edge01 = _vertices[1] - _vertices[0]; osg::Vec3d edge12 = _vertices[2] - _vertices[1]; - osg::Vec3d edge23 = _vertices[3] - _vertices[2]; - osg::Vec3d edge30 = _vertices[0] - _vertices[3]; osg::Vec3d normalFrontFace = edge01 ^ edge12; @@ -90,5 +88,4 @@ OSG_NOTICE<<" edge01 = "<addCommandLineOption( "--disable-output-poster", "Don't output the final poster file." ); - usage->addCommandLineOption( "--enable-output-tiles", "Output all tile files." ); - usage->addCommandLineOption( "--disable-output-tiles", "Don't output all tile files (Default)." ); + //usage->addCommandLineOption( "--enable-output-tiles", "Output all tile files." ); + //usage->addCommandLineOption( "--disable-output-tiles", "Don't output all tile files (Default)." ); usage->addCommandLineOption( "--use-fb", "Use Frame Buffer for rendering tiles (Default, recommended)."); usage->addCommandLineOption( "--use-fbo", "Use Frame Buffer Object for rendering tiles."); @@ -251,5 +251,6 @@ // Poster arguments bool activeMode = true; - bool outputPoster = true, outputTiles = false; + bool outputPoster = true; + //bool outputTiles = false; int tileWidth = 640, tileHeight = 480; int posterWidth = 640*2, posterHeight = 480*2; @@ -266,6 +267,6 @@ while ( arguments.read("--enable-output-poster") ) { outputPoster = true; } while ( arguments.read("--disable-output-poster") ) { outputPoster = false; } - while ( arguments.read("--enable-output-tiles") ) { outputTiles = true; } - while ( arguments.read("--disable-output-tiles") ) { outputTiles = false; } + //while ( arguments.read("--enable-output-tiles") ) { outputTiles = true; } + //while ( arguments.read("--disable-output-tiles") ) { outputTiles = false; } while ( arguments.read("--use-fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; } while ( arguments.read("--use-pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; } Index: /OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp (revision 12529) +++ /OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp (revision 12597) @@ -123,6 +123,4 @@ osg::Vec2 dy_texcoord(0.0f,1.0f/(float)(noSteps-1)); - osg::Vec3 cursor = bottom; - osg::Vec2 texcoord = bottom_texcoord; int i,j; for(i=0;iaddCommandLineOption("--t_maxTextureSize ","Set the texture maximum resolution in the t (y) dimension."); arguments.getApplicationUsage()->addCommandLineOption("--r_maxTextureSize ","Set the texture maximum resolution in the r (z) dimension."); - arguments.getApplicationUsage()->addCommandLineOption("--compressed","Enable the usage of compressed textures."); - arguments.getApplicationUsage()->addCommandLineOption("--compressed-arb","Enable the usage of OpenGL ARB compressed textures."); - arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt1","Enable the usage of S3TC DXT1 compressed textures."); - arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt3","Enable the usage of S3TC DXT3 compressed textures."); - arguments.getApplicationUsage()->addCommandLineOption("--compressed-dxt5","Enable the usage of S3TC DXT5 compressed textures."); arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-luminance","For each pixel multiply the alpha value by the luminance."); arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance","For each pixel set the alpha value to the luminance."); @@ -675,12 +670,4 @@ while(arguments.read("--t_maxTextureSize",t_maximumTextureSize)) {} while(arguments.read("--r_maxTextureSize",r_maximumTextureSize)) {} - - osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT; - while(arguments.read("--compressed") || arguments.read("--compressed-arb")) { internalFormatMode = osg::Texture::USE_ARB_COMPRESSION; } - - while(arguments.read("--compressed-dxt1")) { internalFormatMode = osg::Texture::USE_S3TC_DXT1_COMPRESSION; } - while(arguments.read("--compressed-dxt3")) { internalFormatMode = osg::Texture::USE_S3TC_DXT3_COMPRESSION; } - while(arguments.read("--compressed-dxt5")) { internalFormatMode = osg::Texture::USE_S3TC_DXT5_COMPRESSION; } - // set up colour space operation. Index: /OpenSceneGraph/trunk/examples/osgtext3D/TextNode.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgtext3D/TextNode.cpp (revision 12292) +++ /OpenSceneGraph/trunk/examples/osgtext3D/TextNode.cpp (revision 12597) @@ -78,5 +78,4 @@ float characterWidthScale = 1.0f; - float characterHeightScale = 1.0f; bool textIs3D = (style && style->getThicknessRatio()!=0.0); @@ -84,5 +83,4 @@ { characterWidthScale = 1.0f/static_cast(resolution.first); - characterHeightScale = 1.0f/static_cast(resolution.second); } Index: /OpenSceneGraph/trunk/examples/osgthreadedterrain/osgthreadedterrain.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgthreadedterrain/osgthreadedterrain.cpp (revision 12292) +++ /OpenSceneGraph/trunk/examples/osgthreadedterrain/osgthreadedterrain.cpp (revision 12597) @@ -667,5 +667,4 @@ osg::Texture::FilterMode filter = osg::Texture::LINEAR; - bool readParameter = false; float minValue, maxValue; float scale = 1.0f; @@ -675,5 +674,4 @@ while(possetCoordinateSystemType(osgTerrain::Locator::GEOCENTRIC); locator->setTransformAsExtents(x,y,x+w,y+h); - readParameter = true; } @@ -700,5 +696,4 @@ { // define the extents. - readParameter = true; } @@ -712,6 +707,4 @@ else if (arguments.read(pos, "--hf",filename)) { - readParameter = true; - osg::notify(osg::NOTICE)<<"--hf "< tf = new osg::TransferFunction1D; Index: /OpenSceneGraph/trunk/examples/osgwidgetcanvas/osgwidgetcanvas.cpp =================================================================== --- /OpenSceneGraph/trunk/examples/osgwidgetcanvas/osgwidgetcanvas.cpp (revision 12292) +++ /OpenSceneGraph/trunk/examples/osgwidgetcanvas/osgwidgetcanvas.cpp (revision 12597) @@ -24,7 +24,6 @@ } -bool windowMouseOver(osgWidget::Event& event) { - osgWidget::XYCoord xy = event.getWindow()->localXY(event.x, event.y); - +bool windowMouseOver(osgWidget::Event& /*event*/) { + //osgWidget::XYCoord xy = event.getWindow()->localXY(event.x, event.y); // osgWidget::warn() << "WINDOW " << xy.x() << " - " << xy.y() << std::endl; @@ -32,7 +31,6 @@ } -bool widgetMouseOver(osgWidget::Event& event) { - osgWidget::XYCoord xy = event.getWidget()->localXY(event.x, event.y); - +bool widgetMouseOver(osgWidget::Event& /*event*/) { + // osgWidget::XYCoord xy = event.getWidget()->localXY(event.x, event.y); // osgWidget::warn() << "WIDGET mouseOver " << xy.x() << " - " << xy.y() << std::endl;