fly/flightgear
1
0
Fork 0
Code Activity

Remove obsolete pre-OSG 3.4 code

Browse source
This commit is contained in:
James Turner 2022-03-11 13:18:12 +00:00
parent da946fb14c
commit a9e09a0ae4
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Viewer/splash.cxx
View file

@ -661,6 +661,10 @@ void SplashScreen::updateTipText()
_haveSetStartupTip = true; _haveSetStartupTip = true;
FGLocale* locale = globals->get_locale(); FGLocale* locale = globals->get_locale();
const int tipCount = locale->getLocalizedStringCount("tip", "tips"); const int tipCount = locale->getLocalizedStringCount("tip", "tips");
if (tipCount == 0) {
return;
}
int tipIndex = globals->get_props()->getIntValue("/sim/session",0) % tipCount; int tipIndex = globals->get_props()->getIntValue("/sim/session",0) % tipCount;
std::string tipText = locale->getLocalizedStringWithIndex("tip", "tips", tipIndex); std::string tipText = locale->getLocalizedStringWithIndex("tip", "tips", tipIndex);
@ -668,24 +672,6 @@ void SplashScreen::updateTipText()
} }
} }
// remove once we require OSG 3.4
void SplashScreen::manuallyResizeFBO(int width, int height)
{
_splashFBOTexture->setTextureSize(width, height);
_splashFBOTexture->dirtyTextureObject();
osg::ref_ptr<osg::Camera> newCam = createFBOCamera();
// swap everything around
for (unsigned int i=0; i < _splashFBOCamera->getNumChildren(); ++i) {
newCam->addChild(_splashFBOCamera->getChild(i));
}
addChild(newCam);
removeChild(_splashFBOCamera);
_splashFBOCamera = newCam;
}
void SplashScreen::resize( int width, int height ) void SplashScreen::resize( int width, int height )
{ {
if (getNumChildren() == 0) { if (getNumChildren() == 0) {