fly/flightgear
1
0
Fork 0
Code Activity

fixes #2123 Relocation splash distorted.

Browse source 
Mark images loaded from splash with origin of splash to prevent use of DDS texture cache and therefore fix distortion by preventing rescale to power of two
This commit is contained in:
Richard Harrison 2020-03-13 18:28:34 +01:00
parent 9389c6564f
commit b049865cb2
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Viewer/splash.cxx
View file

@ -45,6 +45,7 @@
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_random.h> #include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
@ -56,6 +57,7 @@
#include <sstream> #include <sstream>
static const char* LICENSE_URL_TEXT = "Licensed under the GNU GPL. See http://www.flightgear.org for more information"; static const char* LICENSE_URL_TEXT = "Licensed under the GNU GPL. See http://www.flightgear.org for more information";
class SplashScreenUpdateCallback : public osg::NodeCallback { class SplashScreenUpdateCallback : public osg::NodeCallback {
@ -81,13 +83,21 @@ SplashScreen::~SplashScreen()
void SplashScreen::createNodes() void SplashScreen::createNodes()
{ {
std::string splashImage = selectSplashImage();
#if OSG_VERSION_LESS_THAN(3,4,0) #if OSG_VERSION_LESS_THAN(3,4,0)
_splashImage = osgDB::readImageFile(selectSplashImage()); _splashImage = osgDB::readImageFile(splashImage);
#else #else
_splashImage = osgDB::readRefImageFile(selectSplashImage()); auto staticOptions = simgear::SGReaderWriterOptions::copyOrCreate(osgDB::Registry::instance()->getOptions());
staticOptions->setLoadOriginHint(simgear::SGReaderWriterOptions::LoadOriginHint::ORIGIN_SPLASH_SCREEN);
_splashImage = osgDB::readRefImageFile(splashImage, staticOptions);
// _splashImage = osgDB::readRefImageFile(selectSplashImage());
#endif #endif
int width = _splashImage->s(); if (!_splashImage){
SG_LOG(SG_VIEW, SG_INFO, "Splash Image " << splashImage << " failed to load");
return;
}
int width = _splashImage->s();
int height = _splashImage->t(); int height = _splashImage->t();
_splashImageAspectRatio = static_cast<double>(width) / height; _splashImageAspectRatio = static_cast<double>(width) / height;
@ -287,9 +297,12 @@ void SplashScreen::setupLogoImage()
#if OSG_VERSION_LESS_THAN(3,4,0) #if OSG_VERSION_LESS_THAN(3,4,0)
_logoImage = osgDB::readImageFile(logoPath.utf8Str()); _logoImage = osgDB::readImageFile(logoPath.utf8Str());
#else #else
_logoImage = osgDB::readRefImageFile(logoPath.utf8Str()); auto staticOptions = simgear::SGReaderWriterOptions::copyOrCreate(osgDB::Registry::instance()->getOptions());
staticOptions->setLoadOriginHint(simgear::SGReaderWriterOptions::LoadOriginHint::ORIGIN_SPLASH_SCREEN);
_logoImage = osgDB::readRefImageFile(logoPath.utf8Str(), staticOptions);
#endif #endif
if (!_logoImage) { if (!_logoImage) {
SG_LOG(SG_VIEW, SG_INFO, "Splash logo image " << logoPath << " failed to load");
return; return;
} }