Compile fixes for that pitful excuse for a C++ compiler that is VS6.0

This commit is contained in:
Robert Osfield
2004-05-05 14:54:16 +00:00
parent 8bdb68ef97
commit b88b9b83ea
2 changed files with 10 additions and 6 deletions

View File

@@ -2689,7 +2689,7 @@ osg::Node* DataSet::CompositeDestination::createPagedLODScene()
osg::PagedLOD* pagedLOD = new osg::PagedLOD;
float farDistance = 1e8;
float farDistance = _dataSet->getMaximumVisibleDistanceOfTopLevel();
if (tileNodes.size()==1)
{
pagedLOD->addChild(tileNodes.front());
@@ -2785,6 +2785,8 @@ DataSet::DataSet()
{
init();
_maximumVisiableDistanceOfTopLevel = 1e10;
_radiusToMaxVisibleDistanceRatio = 7.0f;
_verticalScale = 1.0f;
@@ -3206,16 +3208,17 @@ void DataSet::updateSourcesForDestinationGraphNeeds()
_destinationGraph->addRequiredResolutions(_sourceGraph.get());
for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
for(CompositeSource::source_iterator sitr(_sourceGraph.get());sitr.valid();++sitr)
{
Source* source = itr->get();
Source* source = sitr->get();
std::cout<<"Source File "<<source->getFileName()<<std::endl;
const Source::ResolutionList& resolutions = source->getRequiredResolutions();
std::cout<<" resolutions.size() "<<resolutions.size()<<std::endl;
std::cout<<" { "<<std::endl;
for(Source::ResolutionList::const_iterator itr=resolutions.begin();
Source::ResolutionList::const_iterator itr;
for(itr=resolutions.begin();
itr!=resolutions.end();
++itr)
{
@@ -3227,7 +3230,7 @@ void DataSet::updateSourcesForDestinationGraphNeeds()
std::cout<<" consolodated resolutions.size() "<<resolutions.size()<<std::endl;
std::cout<<" consolodated { "<<std::endl;
for(Source::ResolutionList::const_iterator itr=resolutions.begin();
for(itr=resolutions.begin();
itr!=resolutions.end();
++itr)
{

View File

@@ -13,6 +13,7 @@
#include <osgTerrain/HeightFieldNode>
using namespace osg;
using namespace osgTerrain;
HeightFieldNode::HeightFieldNode()
@@ -56,7 +57,7 @@ void HeightFieldNode::traverse(osg::NodeVisitor& nv)
}
// otherwise fallback to the Group::traverse()
osg::Group::traverse(nv);
Group::traverse(nv);
}
void HeightFieldNode::setHeightField(osg::HeightField* heightField)