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

WS30: Remove VPB Max range and LoD scaling

Browse Source 
Better to scale from the camera than mess with the LoD itself.
This commit is contained in:
Stuart Buchanan 2021-10-12 21:40:09 +01:00
parent a760730285
commit 119f3d9814
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
simgear/scene/model/ModelRegistry.cxx
View File

@ -996,40 +996,6 @@ public:
} }
}; };
class AdjustLODVisitor : public osg::NodeVisitor
{
public:
float _rangeFactor;
float _maxRange;
AdjustLODVisitor(float rangeFactor, float maxRange): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
{
_rangeFactor = rangeFactor;
_maxRange = maxRange;
}
void apply(osg::PagedLOD& node)
{
if (node.getNumChildren() == 0) return;
if (node.getNumFileNames() == 2) {
// We use internal knowledge of VPB to modify the LOD ranges.
// The first child is the current node. The second is the sub-tile at higher resolution.
// See VirtualPlanetBuild src/vpb/Destination.cpp CompositeDestination::createPagedLODScene()
// lines 3330-3333
node.dirtyBound(); // At this point the bounds haven't been calculated, so we need to force this.
float maxRange = _maxRange + node.getBound().radius();
float cutoff = std::min(node.getBound().radius() * _rangeFactor, maxRange);
SG_LOG(SG_TERRAIN, SG_DEBUG, "VPB PagedLOD range " << cutoff << " " << maxRange);
node.setRange(0, cutoff, maxRange);
node.setRange(1, 0, cutoff);
} else {
SG_LOG(SG_TERRAIN, SG_ALERT, "Unexpected PagedLOD type in LOD range update");
}
traverse(node);
}
};
struct OSGOptimizePolicy : public OptimizeModelPolicy { struct OSGOptimizePolicy : public OptimizeModelPolicy {
@ -1054,12 +1020,6 @@ struct OSGOptimizePolicy : public OptimizeModelPolicy {
SGSceneFeatures* features = SGSceneFeatures::instance(); SGSceneFeatures* features = SGSceneFeatures::instance();
// Adjust the LOD ranges as required.
double rangeFactor = features->getVPBRangeFactor();
double maxRange = features->getVPBMaxRange();
AdjustLODVisitor alv = AdjustLODVisitor(rangeFactor, maxRange);
optimized->accept(alv);
osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(optimized.get()); osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(optimized.get());
osg::ref_ptr<osgTerrain::TerrainTile> terrainTile = findTopMostNodeOfType<osgTerrain::TerrainTile>(optimized.get()); osg::ref_ptr<osgTerrain::TerrainTile> terrainTile = findTopMostNodeOfType<osgTerrain::TerrainTile>(optimized.get());
@ -1067,7 +1027,7 @@ struct OSGOptimizePolicy : public OptimizeModelPolicy {
// Top level. This is likely to have the default GeometryTechnique already assigned which we need to replace with our own // Top level. This is likely to have the default GeometryTechnique already assigned which we need to replace with our own
terrain->setSampleRatio(features->getVPBSampleRatio()); terrain->setSampleRatio(features->getVPBSampleRatio());
terrain->setVerticalScale(features->getVPBVerticalScale()); terrain->setVerticalScale(features->getVPBVerticalScale());
terrain->setTerrainTechniquePrototype(new VPBTechnique(sgopt)); terrain->setTerrainTechniquePrototype(new VPBTechnique(sgopt));
if (terrainTile != NULL) { if (terrainTile != NULL) {
terrainTile->setTerrainTechnique(new VPBTechnique(sgopt)); terrainTile->setTerrainTechnique(new VPBTechnique(sgopt));
terrainTile->setDirty(true); terrainTile->setDirty(true);

6
simgear/scene/util/SGSceneFeatures.hxx
View File

@ -64,12 +64,6 @@ public:
bool getVPBActive() const { return _VPBActive; } bool getVPBActive() const { return _VPBActive; }
void setVPBActive(const bool val) { _VPBActive = val; } void setVPBActive(const bool val) { _VPBActive = val; }
float getVPBRangeFactor() const { return _VPBRangeFactor; }
void setVPBRangeFactor(const float val) { _VPBRangeFactor = val; }
float getVPBMaxRange() const { return _VPBMaxRange; }
void setVPBMaxRange(const float val) { _VPBMaxRange = val; }
float getVPBConstraintGap() const { return _VPBConstraintGap; } float getVPBConstraintGap() const { return _VPBConstraintGap; }
void setVPBConstraintGap(const float val) { _VPBConstraintGap = val; } void setVPBConstraintGap(const float val) { _VPBConstraintGap = val; }