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

WS30: Photoscenery code cleanup, reduce log spam

Browse Source
This commit is contained in:
Stuart Buchanan
2021-11-07 09:16:45 +00:00
parent 7a7b26e75d
commit 9528bd0749
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/tgdb/VPBTechnique.cxx
+10 -8
View File
@@ -73,7 +73,6 @@ VPBTechnique::VPBTechnique(const SGReaderWriterOptions* options, const string& f
setFilterMatrixAs(GAUSSIAN); setFilterMatrixAs(GAUSSIAN);
setOptions(options); setOptions(options);
_randomObjectsConstraintGroup = new osg::Group(); _randomObjectsConstraintGroup = new osg::Group();
SG_LOG(SG_TERRAIN, SG_ALERT, "VPBTechnique for " << _fileName);
} }
VPBTechnique::VPBTechnique(const VPBTechnique& gt,const osg::CopyOp& copyop): VPBTechnique::VPBTechnique(const VPBTechnique& gt,const osg::CopyOp& copyop):
@@ -1292,11 +1291,12 @@ void VPBTechnique::applyColorLayers(BufferData& buffer, Locator* masterLocator)
} }
if (photoScenery) { if (photoScenery) {
// Photoscenery is enabled, so we need to find and assign the orthophoto texture
// Firstly, we need to work out the texture file we want to load. Fortunately this follows the same // Firstly, we need to work out the texture file we want to load. Fortunately this follows the same
// naming convention as the VPB scenery itself. // naming convention as the VPB scenery itself.
auto tileID = _terrainTile->getTileID(); auto tileID = _terrainTile->getTileID();
SG_LOG(SG_TERRAIN, SG_ALERT, "Using Photoscenery for " << tileID.level << " X" << tileID.x << " Y" << tileID.y); SG_LOG(SG_TERRAIN, SG_DEBUG, "Using Photoscenery for " << tileID.level << " X" << tileID.x << " Y" << tileID.y);
const osg::Vec3d world = buffer._transform->getMatrix().getTrans(); const osg::Vec3d world = buffer._transform->getMatrix().getTrans();
const SGGeod loc = SGGeod::fromCart(toSG(world)); const SGGeod loc = SGGeod::fromCart(toSG(world));
@@ -1307,17 +1307,21 @@ void VPBTechnique::applyColorLayers(BufferData& buffer, Locator* masterLocator)
SGPath orthotexture = SGPath(base); SGPath orthotexture = SGPath(base);
orthotexture.append("Orthophotos"); orthotexture.append("Orthophotos");
orthotexture.append(bucket.gen_vpb_subtile(tileID.level, tileID.x, tileID.y) + ".dds"); orthotexture.append(bucket.gen_vpb_subtile(tileID.level, tileID.x, tileID.y) + ".dds");
SG_LOG(SG_TERRAIN, SG_ALERT, "Using " << orthotexture); SG_LOG(SG_TERRAIN, SG_DEBUG, "Using phototexture " << orthotexture);
if (orthotexture.exists()) { if (orthotexture.exists()) {
osg::Texture2D* texture = SGLoadTexture2D(SGPath(orthotexture), _options, false, false); // Set up the texture with wrapping of UV to reduce black edges at tile boundaries.
osg::Texture2D* texture = SGLoadTexture2D(SGPath(orthotexture), _options, true, true);
osg::StateSet* stateset = buffer._landGeode->getOrCreateStateSet(); osg::StateSet* stateset = buffer._landGeode->getOrCreateStateSet();
stateset->setTextureAttributeAndModes(0, texture); stateset->setTextureAttributeAndModes(0, texture);
} else { } else {
SG_LOG(SG_TERRAIN, SG_ALERT, "Unable to find " << orthotexture); SG_LOG(SG_TERRAIN, SG_DEBUG, "Unable to find " << orthotexture);
photoScenery = false;
} }
}
} else { if (!photoScenery) {
// Either photoscenery is turned off, or we failed to find a suitable texture.
SGMaterialLibPtr matlib = _options->getMaterialLib(); SGMaterialLibPtr matlib = _options->getMaterialLib();
if (!matlib) return; if (!matlib) return;
@@ -2123,8 +2127,6 @@ void VPBTechnique::applyCoastline(BufferData& buffer, Locator* masterLocator)
if (v->size() == 0) return; if (v->size() == 0) return;
//SG_LOG(SG_TERRAIN, SG_ALERT, "Generating coastline of " << v->size() << " vertices.");
c->push_back(osg::Vec4(1.0,1.0,1.0,1.0)); c->push_back(osg::Vec4(1.0,1.0,1.0,1.0));
osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry; osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry;