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

From David Callu, warning fixes and removal of spaces at end of lines.

Browse Source
This commit is contained in:
Robert Osfield
2013-06-28 12:00:43 +00:00
parent d82768417d
commit 097aedf23c
100 changed files with 496 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgShadow/ConvexPolyhedron.cpp
View File

@@ -1162,7 +1162,9 @@ bool ConvexPolyhedron::checkCoherency
dumpGeometry( );
#endif
#else
OSG_UNUSED(checkForNonConvexPolys);
OSG_UNUSED(errorPrefix);
#endif // CONVEX_POLYHEDRON_CHECK_COHERENCY
return result && convex;
}

9
src/osgShadow/DebugShadowMap.cpp
View File

@@ -154,6 +154,9 @@ bool DebugShadowMap::ViewData::DebugBoundingBox
<< std::endl;
bb_prev = bb;
#else
OSG_UNUSED(bb);
OSG_UNUSED(name);
#endif
return result;
}
@@ -192,6 +195,9 @@ bool DebugShadowMap::ViewData::DebugPolytope
}
p_prev = p;
#else
OSG_UNUSED(p);
OSG_UNUSED(name);
#endif
return result;
}
@@ -215,6 +221,9 @@ bool DebugShadowMap::ViewData::DebugMatrix
<<"[ " << m(3,0) << " " << m(3,1) << " " << m(3,2) << " " << m(3,3) << " ] " << std::endl;
m_prev = m;
#else
OSG_UNUSED(m);
OSG_UNUSED(name);
#endif
return result;
}

2
src/osgShadow/MinimalShadowMap.cpp
View File

@@ -336,7 +336,7 @@ void MinimalShadowMap::ViewData::init( ThisClass *st, osgUtil::CullVisitor *cv )
}
void MinimalShadowMap::ViewData::cutScenePolytope
( const osg::Matrix & transform,
( const osg::Matrix & /*transform*/,
const osg::Matrix & inverse,
const osg::BoundingBox & bb )
{

10
src/osgShadow/ViewDependentShadowMap.cpp
View File

@@ -704,7 +704,7 @@ void ViewDependentShadowMap::cleanSceneGraph()
OSG_INFO<<"ViewDependentShadowMap::cleanSceneGraph()"<<std::endl;
}
ViewDependentShadowMap::ViewDependentData* ViewDependentShadowMap::createViewDependentData(osgUtil::CullVisitor* cv)
ViewDependentShadowMap::ViewDependentData* ViewDependentShadowMap::createViewDependentData(osgUtil::CullVisitor* /*cv*/)
{
return new ViewDependentData(this);
}
@@ -804,7 +804,7 @@ void ViewDependentShadowMap::cull(osgUtil::CullVisitor& cv)
if (minZNear>maxZFar) minZNear = maxZFar*settings->getMinimumShadowMapNearFarRatio();
//OSG_NOTICE<<"maxZFar "<<maxZFar<<std::endl;
Frustum frustum(&cv, minZNear, maxZFar);
// return compute near far mode back to it's original settings
@@ -1963,7 +1963,7 @@ struct RenderLeafBounds
double min_z, max_z;
};
bool ViewDependentShadowMap::adjustPerspectiveShadowMapCameraSettings(osgUtil::RenderStage* renderStage, Frustum& frustum, LightData& positionedLight, osg::Camera* camera)
bool ViewDependentShadowMap::adjustPerspectiveShadowMapCameraSettings(osgUtil::RenderStage* renderStage, Frustum& frustum, LightData& /*positionedLight*/, osg::Camera* camera)
{
const ShadowSettings* settings = getShadowedScene()->getShadowSettings();
@@ -2347,7 +2347,7 @@ osg::StateSet* ViewDependentShadowMap::selectStateSetForRenderingShadow(ViewDepe
osg::ref_ptr<osg::StateSet> stateset = vdd.getStateSet();
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_accessUnfiromsAndProgramMutex);
vdd.getStateSet()->clear();
vdd.getStateSet()->setTextureAttributeAndModes(0, _fallbackBaseTexture.get(), osg::StateAttribute::ON);
@@ -2416,7 +2416,7 @@ osg::StateSet* ViewDependentShadowMap::selectStateSetForRenderingShadow(ViewDepe
return vdd.getStateSet();
}
void ViewDependentShadowMap::resizeGLObjectBuffers(unsigned int maxSize)
void ViewDependentShadowMap::resizeGLObjectBuffers(unsigned int /*maxSize*/)
{
// the way that ViewDependentData is mapped shouldn't
}