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

DDS-TC add option to exclude all Canvas orignated images.

Browse Source
This commit is contained in:
Richard Harrison 2020-11-17 19:06:24 +01:00
parent be6d28557a
commit 02b20462e1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,6 +397,10 @@ ModelRegistry::readImage(const string& fileName,
isEffect = true; isEffect = true;
// can_compress = false; // can_compress = false;
} }
else if (sgoptC && !transparent && sgoptC->getLoadOriginHint() == SGReaderWriterOptions::LoadOriginHint::ORIGIN_CANVAS) {
SG_LOG(SG_IO, SG_INFO, "From Canvas " + absFileName + " will generate mipmap only");
can_compress = false;
}
if (can_compress) if (can_compress)
{ {
std::string pot_message; std::string pot_message;

1
simgear/scene/util/SGReaderWriterOptions.hxx
View File

@ -46,6 +46,7 @@ public:
ORIGIN_EFFECTS, ORIGIN_EFFECTS,
ORIGIN_EFFECTS_NORMALIZED, ORIGIN_EFFECTS_NORMALIZED,
ORIGIN_SPLASH_SCREEN, ORIGIN_SPLASH_SCREEN,
ORIGIN_CANVAS,
}; };
//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)); }