FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compile warnings.

Browse Source
This commit is contained in:
Robert Osfield 2005-10-24 13:46:31 +00:00
parent 5374ddaccb
commit fe1536ebd6
9 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/osgdepthpartition/DepthPartitionNode.cpp
View File

@ -10,7 +10,8 @@ CURRENT_CLASS::CURRENT_CLASS()
}
CURRENT_CLASS::CURRENT_CLASS(const CURRENT_CLASS& dpn, const osg::CopyOp& copyop)
: _active(dpn._active),
: osg::Group(dpn,copyop),
_active(dpn._active),
_renderOrder(dpn._renderOrder),
_clearColorBuffer(dpn._clearColorBuffer)
{

2
examples/osgdepthpartition/DistanceAccumulator.cpp
View File

@ -53,7 +53,7 @@ void CURRENT_CLASS::pushLocalFrustum()
_bbCorners.push_back(corner);
}
void CURRENT_CLASS::apply(osg::CameraNode &camera)
void CURRENT_CLASS::apply(osg::CameraNode& /*camera*/)
{
// We don't support scenes with CameraNodes in them
return;

2
examples/osgpbuffer/osgpbuffer.cpp
View File

@ -443,7 +443,7 @@ int main( int argc, char **argv )
}
}
printf( "PBuffer window: 0x%x\n", pbuffer->getWindow() );
// printf( "PBuffer window: 0x%x\n", pbuffer->getWindow() );
viewer.getCamera(0)->setClearColor( 0.1f,0.9f,0.3f,1.0f );

21
examples/osgpoints/osgpoints.cpp
View File

@ -213,6 +213,15 @@ int main( int argc, char **argv )
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
"}\n";
osg::Program* program = new osg::Program;
stateset->setAttribute(program);
osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
program->addShader(vertex_shader);
#if 0
//////////////////////////////////////////////////////////////////
// fragment shader
//
@ -222,15 +231,9 @@ int main( int argc, char **argv )
" gl_FragColor = gl_Color; \n"
"}\n";
osg::Program* program = new osg::Program;
stateset->setAttribute(program);
osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
program->addShader(vertex_shader);
//osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
//program->addShader(fragment_shader);
osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
program->addShader(fragment_shader);
#endif
}

2
examples/osgshaderterrain/osgshaderterrain.cpp
View File

@ -462,7 +462,7 @@ osg::Node* ForestTechniqueManager::createShaderGraph(Cell* cell,osg::StateSet* s
else return geode;
}
osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates)
osg::Node* ForestTechniqueManager::createScene(unsigned int /*numTreesToCreates*/)
{
osg::Group* scene = new osg::Group;

8
examples/osgvolume/osgvolume.cpp
View File

@ -724,11 +724,11 @@ class FollowMouseCallback : public osgGA::GUIEventHandler, public osg::StateSet:
};
osg::Node* createShaderModel(osg::ref_ptr<osg::Image>& image_3d, osg::ref_ptr<osg::Image>& normalmap_3d,
osg::Node* createShaderModel(osg::ref_ptr<osg::Image>& image_3d, osg::ref_ptr<osg::Image>& /*normalmap_3d*/,
osg::Texture::InternalFormatMode internalFormatMode,
float xSize, float ySize, float zSize,
float xMultiplier, float yMultiplier, float zMultiplier,
unsigned int numSlices=500, float sliceEnd=1.0f, float alphaFuncValue=0.02f)
float /*xSize*/, float /*ySize*/, float /*zSize*/,
float /*xMultiplier*/, float /*yMultiplier*/, float /*zMultiplier*/,
unsigned int /*numSlices*/=500, float /*sliceEnd*/=1.0f, float alphaFuncValue=0.02f)
{
osg::Geode* geode = new osg::Geode;
osg::StateSet* stateset = geode->getOrCreateStateSet();

3
src/osgDB/FileUtils.cpp
View File

@ -801,9 +801,8 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
}
}
#else
void osgDB::appendPlatformSpecificResourceFilePaths(FilePathList& filepath)
void osgDB::appendPlatformSpecificResourceFilePaths(FilePathList& /*filepath*/)
{
}
#endif

4
src/osgParticle/ConnectedParticleSystem.cpp
View File

@ -117,8 +117,8 @@ void ConnectedParticleSystem::drawImplementation(osg::State& state) const
osg::Vec4 pixelSizeVector = osg::CullingSet::computePixelSizeVector(*state.getCurrentViewport(),state.getProjectionMatrix(),state.getModelViewMatrix());
float unitPixelSize = fabs(1.0/(particle->getPosition()*pixelSizeVector));
float pixelSizeOfFirstParticle = unitPixelSize * particle->getCurrentSize();
float desiredGapBetweenDrawnParticles = 50.0f/unitPixelSize;
float desiredGapBetweenDrawnParticles2 = desiredGapBetweenDrawnParticles*desiredGapBetweenDrawnParticles;
//float desiredGapBetweenDrawnParticles = 50.0f/unitPixelSize;
//float desiredGapBetweenDrawnParticles2 = desiredGapBetweenDrawnParticles*desiredGapBetweenDrawnParticles;
unsigned int maxNumParticlesToSkip = 200;
float maxPixelError2 = osg::square(1.0f/unitPixelSize);

2
src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
View File

@ -208,7 +208,7 @@ void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
* application must deal with any cleanup that should happen even
* for error exit.
*/
void term_source (j_decompress_ptr cinfo)
void term_source (j_decompress_ptr /*cinfo*/)
{
/* no work necessary here */
}