fly/flightgear
1
0
Fork 0
Code Activity

WS30: Add better controls for LOD

Browse source 
Use SGSceneFeatures to set VPB properties
This commit is contained in:
Stuart Buchanan 2021-02-02 15:17:44 +00:00
parent f700d46452
commit 54acb84f6f
3 changed files with 68 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/Scenery/scenery.cxx
View file

@ -270,6 +270,66 @@ public:
}
};
class FGScenery::ElevationMeshListener : public SGPropertyChangeListener
{
protected:
const char* root_node_path = "/scenery/elevation-mesh";
const char* lod_node_path = "/sim/rendering/static-lod";
public:
ElevationMeshListener()
{
SGPropertyNode_ptr elevationMeshNode = fgGetNode(root_node_path, true);
setupPropertyListener(elevationMeshNode, "constraint-gap-m");
setupPropertyListener(elevationMeshNode, "lod-range-factor");
setupPropertyListener(elevationMeshNode, "lod-max-range");
setupPropertyListener(elevationMeshNode, "sample-ratio");
setupPropertyListener(elevationMeshNode, "vertical-scale");
// We also need to set the maximum range based on the LOD ranges
SGPropertyNode_ptr lodNode = fgGetNode(lod_node_path, true);
setupPropertyListener(lodNode, "detailed");
setupPropertyListener(lodNode, "rough-delta");
setupPropertyListener(lodNode, "bare-delta");
}
~ElevationMeshListener()
{
SGPropertyNode_ptr node = fgGetNode(root_node_path);
for (int i = 0; i < node->nChildren(); ++i) {
node->getChild(i)->removeChangeListener(this);
}
}
void setupPropertyListener(SGPropertyNode_ptr elevationMeshNode, const char *node)
{
elevationMeshNode->getChild(node, 0, true)->addChangeListener(this, true);
}
virtual void valueChanged(SGPropertyNode * node)
{
float f = node->getFloatValue();
std::string name(node->getNameString());
if (name == "constraint-gap-m") {
SGSceneFeatures::instance()->setVPBConstraintGap(f);
} else if (name == "lod-range-factor") {
SGSceneFeatures::instance()->setVPBRangeFactor(f);
} else if (name == "sample-ratio") {
SGSceneFeatures::instance()->setVPBSampleRatio(f);
} else if (name == "vertical-scale") {
SGSceneFeatures::instance()->setVPBVerticalScale(f);
} else if ((name == "detailed") || (name == "rough-delta") || (name == "bare-delta")) {
double range = fgGetNode("/sim/rendering/static-lod/detailed", true)->getDoubleValue() +
fgGetNode("/sim/rendering/static-lod/rough-delta", true)->getDoubleValue() +
fgGetNode("/sim/rendering/static-lod/bare-delta", true)->getDoubleValue();
SGSceneFeatures::instance()->setVPBMaxRange(range);
} else {
SG_LOG(SG_TERRAIN, SG_ALERT, "Unexpected property in listener " << node->getPath());
}
}
};
class FGScenery::ScenerySwitchListener : public SGPropertyChangeListener
{
public:
@ -291,7 +351,6 @@ public:
auto vpb_active = fgGetNode("/scenery/use-vpb");
vpb_active->addChangeListener(this);
SGSceneFeatures::instance()->setVPBActive(vpb_active->getBoolValue());
// SGSceneFeatures::instance()->setVPBActive(true);
}
~ScenerySwitchListener()
@ -338,7 +397,7 @@ private:
// Scenery Management system
FGScenery::FGScenery() :
_listener(nullptr), _textureCacheListener(nullptr)
_listener(nullptr), _textureCacheListener(nullptr), _elevationMeshListener(nullptr)
{
// keep reference to pager singleton, so it cannot be destroyed while FGScenery lives
_pager = FGScenery::getPagerSingleton();
@ -420,6 +479,8 @@ void FGScenery::init() {
_listener = new ScenerySwitchListener(this);
_textureCacheListener = new TextureCacheListener();
_elevationMeshListener = new ElevationMeshListener();
// Toggle the setup flag.
_inited = true;
}

5
src/Scenery/scenery.hxx
View file

@ -67,6 +67,11 @@ class FGScenery : public SGSubsystem
class TextureCacheListener;
friend class TextureCacheListener;
TextureCacheListener* _textureCacheListener;
class ElevationMeshListener;
friend class ElevationMeshListener;
ElevationMeshListener* _elevationMeshListener;
public:
FGScenery();
~FGScenery();

6
src/Scenery/tilemgr.cxx
View file

@ -206,17 +206,11 @@ void FGTileMgr::reinit()
double rough = fgGetDouble("/sim/rendering/static-lod/rough-delta", SG_OBJECT_RANGE_ROUGH) + detailed;
double bare = fgGetDouble("/sim/rendering/static-lod/bare", SG_OBJECT_RANGE_BARE) + rough;
double tile_min_expiry = fgGetDouble("/sim/rendering/plod-minimum-expiry-time-secs", SG_TILE_MIN_EXPIRY);
double sample_ratio = fgGetDouble("/scenery/elevation-mesh/sample-ratio", 1.0);
double vertical_scale = fgGetDouble("/scenery/elevation-mesh/vertical-scale", 1.0);
double vertical_constraint_gap = fgGetDouble("/scenery/elevation-mesh/constraint-gap-m", 1.0);
_options->setPluginStringData("SimGear::LOD_RANGE_BARE", std::to_string(bare));
_options->setPluginStringData("SimGear::LOD_RANGE_ROUGH", std::to_string(rough));
_options->setPluginStringData("SimGear::LOD_RANGE_DETAILED", std::to_string(detailed));
_options->setPluginStringData("SimGear::PAGED_LOD_EXPIRY", std::to_string(tile_min_expiry));
_options->setPluginStringData("SimGear::ELEV_MESH_SAMPLE_RATIO", std::to_string(sample_ratio));
_options->setPluginStringData("SimGear::ELEV_MESH_VERTICAL_SCALE", std::to_string(vertical_scale));
_options->setPluginStringData("SimGear::ELEV_MESH_CONSTRAINT_GAP", std::to_string(vertical_constraint_gap));
string_list scenerySuffixes;
for (auto node : fgGetNode("/sim/rendering/", true)->getChildren("scenery-path-suffix")) {