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

WS30: Disable texture cache for material atlas

Browse Source 
The texture cache interacts badly with the code creating the WS30
texture atlas, resulting in a bad atlas.  This change adds a new
SGReaderWriterOptions::LoadOriginHint::ORIGIN_MATERIAL_ATLAS
which causes the material cache not to cache the texture.
This commit is contained in:
Stuart Buchanan
2022-01-03 17:17:17 +00:00
parent 301da53ba4
commit 65542e7521
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/matlib.cxx
+5 -2
View File
@@ -327,7 +327,7 @@ SGMaterial *SGMaterialCache::find(int lc) const
} }
// Generate a texture atlas for this location // Generate a texture atlas for this location
SGMaterialCache::Atlas SGMaterialLib::getMaterialTextureAtlas(SGVec2f center, const simgear::SGReaderWriterOptions* options) SGMaterialCache::Atlas SGMaterialLib::getMaterialTextureAtlas(SGVec2f center, const simgear::SGReaderWriterOptions* const_options)
{ {
SGMaterialCache::Atlas atlas; SGMaterialCache::Atlas atlas;
@@ -349,10 +349,13 @@ SGMaterialCache::Atlas SGMaterialLib::getMaterialTextureAtlas(SGVec2f center, co
if (atlas_iter != _atlasCache.end()) return atlas_iter->second; if (atlas_iter != _atlasCache.end()) return atlas_iter->second;
// Cache lookup failure - generate a new atlas, but only if we have a chance of reading any textures // Cache lookup failure - generate a new atlas, but only if we have a chance of reading any textures
if (options == 0) { if (const_options == 0) {
return atlas; return atlas;
} }
osg::ref_ptr<SGReaderWriterOptions> options = SGReaderWriterOptions::copyOrCreate(const_options);
options->setLoadOriginHint(SGReaderWriterOptions::LoadOriginHint::ORIGIN_MATERIAL_ATLAS);
atlas.image = new osg::Texture2DArray(); atlas.image = new osg::Texture2DArray();
SG_LOG(SG_TERRAIN, SG_DEBUG, "Generating atlas of size " << landclasslib.size()); SG_LOG(SG_TERRAIN, SG_DEBUG, "Generating atlas of size " << landclasslib.size());
simgear/scene/model/ModelRegistry.cxx
+1 -1
View File
@@ -299,7 +299,7 @@ ModelRegistry::readImage(const string& fileName,
ec.addFromMap(sgoptC->getModelData()->getErrorContext()); ec.addFromMap(sgoptC->getModelData()->getErrorContext());
} }
if (cache_active && (!sgoptC || sgoptC->getLoadOriginHint() != SGReaderWriterOptions::LoadOriginHint::ORIGIN_SPLASH_SCREEN)) { if (cache_active && (!sgoptC || (sgoptC->getLoadOriginHint() != SGReaderWriterOptions::LoadOriginHint::ORIGIN_SPLASH_SCREEN && sgoptC->getLoadOriginHint() != SGReaderWriterOptions::LoadOriginHint::ORIGIN_MATERIAL_ATLAS))) {
if (fileExtension != "dds" && fileExtension != "gz") { if (fileExtension != "dds" && fileExtension != "gz") {
std::string root = getPathRoot(absFileName); std::string root = getPathRoot(absFileName);
simgear/scene/util/SGReaderWriterOptions.hxx
+1
View File
@@ -47,6 +47,7 @@ public:
ORIGIN_EFFECTS_NORMALIZED, ORIGIN_EFFECTS_NORMALIZED,
ORIGIN_SPLASH_SCREEN, ORIGIN_SPLASH_SCREEN,
ORIGIN_CANVAS, ORIGIN_CANVAS,
ORIGIN_MATERIAL_ATLAS
}; };
//SGReaderWriterOptions* cloneOptions(const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) const { return static_cast<SGReaderWriterOptions*>(clone(copyop)); } //SGReaderWriterOptions* cloneOptions(const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) const { return static_cast<SGReaderWriterOptions*>(clone(copyop)); }