"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Viewer/splash.cxx" between
flightgear-2020.1.1.tar.bz2 and flightgear-2020.1.2.tar.bz2

About: FlightGear is a multi-platform, cooperative flight simulator development project.

splash.cxx  (flightgear-2020.1.1.tar.bz2):splash.cxx  (flightgear-2020.1.2.tar.bz2)
skipping to change at line 209 skipping to change at line 209
if (!strcmp(FG_BUILD_TYPE, "Nightly")) { if (!strcmp(FG_BUILD_TYPE, "Nightly")) {
std::string unstableWarningText = globals->get_locale()->getLocalizedStr ing("unstable-warning", "sys", "unstable!"); std::string unstableWarningText = globals->get_locale()->getLocalizedStr ing("unstable-warning", "sys", "unstable!");
addText(geode, osg::Vec2(0.5, 0.5), 0.03, addText(geode, osg::Vec2(0.5, 0.5), 0.03,
unstableWarningText, unstableWarningText,
osgText::Text::CENTER_CENTER, osgText::Text::CENTER_CENTER,
nullptr, -1.0, osg::Vec4(1.0, 0.0, 0.0, 1.0)); nullptr, -1.0, osg::Vec4(1.0, 0.0, 0.0, 1.0));
} }
#if defined(ENABLE_COMPOSITOR) #if defined(ENABLE_COMPOSITOR)
auto compositorText = globals->get_locale()->getLocalizedString("compositor- enabled", "sys", "Compositor"); auto compositorText = globals->get_locale()->getLocalizedString("compositor- enabled", "sys", "Compositor");
addText(geode, osg::Vec2(0.5f, 0.55f), 0.03, addText(geode, osg::Vec2(0.5f, 0.5f), 0.03,
compositorText, compositorText,
osgText::Text::CENTER_CENTER, osgText::Text::CENTER_CENTER,
nullptr, -1.0, osg::Vec4(1.0, 0.0, 0.0, 1.0)); nullptr, -1.0, osg::Vec4(1.0, 0.0, 0.0, 1.0));
std::string compositorWarningText = "The compositor is still in development,
please expect some visual bugs";
addText(geode, osg::Vec2(0.5, 0.55), 0.03,
compositorWarningText,
osgText::Text::CENTER_CENTER,
nullptr, -1.0, osg::Vec4(1.0, 0.0, 0.0, 1.0));
#endif #endif
/////////// ///////////
geometry = new osg::Geometry; geometry = new osg::Geometry;
geometry->setSupportsDisplayList(false); geometry->setSupportsDisplayList(false);
_splashSpinnerVertexArray = new osg::Vec3Array; _splashSpinnerVertexArray = new osg::Vec3Array;
for (int i=0; i < 8; ++i) { for (int i=0; i < 8; ++i) {
_splashSpinnerVertexArray->push_back(osg::Vec3(0.0f, 0.0f, -0.1f)); _splashSpinnerVertexArray->push_back(osg::Vec3(0.0f, 0.0f, -0.1f));
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)