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

Fixed shadows warning

Browse Source
This commit is contained in:
Robert Osfield
2016-05-23 10:36:00 +01:00
parent c15dfa7ddd
commit 04214a4288
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgUtil/CullVisitor.cpp
View File

@@ -1108,9 +1108,9 @@ void CullVisitor::apply(Billboard& node)
<<" depth="<<depth<<", pos=("<<pos<<"),"<<std::endl
<<" *billboard_matrix="<<*billboard_matrix<<std::endl;
OSG_DEBUG << " NodePath:" << std::endl;
for (NodePath::const_iterator i = getNodePath().begin(); i != getNodePath().end(); ++i)
for (NodePath::const_iterator itr = getNodePath().begin(); itr != getNodePath().end(); ++itr)
{
OSG_DEBUG << " \"" << (*i)->getName() << "\"" << std::endl;
OSG_DEBUG << " \"" << (*itr)->getName() << "\"" << std::endl;
}
}
else

3
src/osgUtil/DelaunayTriangulator.cpp
View File

@@ -838,11 +838,10 @@ bool DelaunayTriangulator::triangulate()
// begin triangulation
GLuint pidx = 0;
osg::Vec3Array::const_iterator i;
OSG_INFO << "DelaunayTriangulator: triangulating vertex grid (" << (points->size()-3) <<" points)\n";
for (i=points->begin(); i!=points->end(); ++i, ++pidx)
for (osg::Vec3Array::const_iterator i=points->begin(); i!=points->end(); ++i, ++pidx)
{
// don't process supertriangle vertices

3
src/osgUtil/IncrementalCompileOperation.cpp
View File

@@ -677,9 +677,6 @@ void IncrementalCompileOperation::operator () (osg::GraphicsContext* context)
OSG_NOTIFY(level)<<" currentTime = "<<currentTime<<std::endl;
OSG_NOTIFY(level)<<" currentElapsedFrameTime = "<<currentElapsedFrameTime<<std::endl;
double _flushTimeRatio(0.5);
double _conservativeTimeRatio(0.5);
double availableTime = std::max((targetFrameTime - currentElapsedFrameTime)*_conservativeTimeRatio,
minimumTimeAvailableForGLCompileAndDeletePerFrame);