fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' into durk-atc

Browse source
This commit is contained in:
Durk Talsma 2011-04-17 10:21:09 +02:00
commit ee9a5cf73d
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/GUI/MapWidget.cxx
View file

@ -527,7 +527,6 @@ void MapWidget::draw(int dx, int dy)
if (_root->getBoolValue("centre-on-aircraft")) {
_projectionCenter = _aircraft;
_root->setBoolValue("centre-on-aircraft", false);
}
double julianDate = globals->get_time_params()->getJD();

BIN
src/Main/.renderer.cxx.swp Normal file
View file

Binary file not shown.

4
src/Main/renderer.cxx
View file

@ -613,11 +613,11 @@ FGRenderer::update( bool refresh_camera_settings ) {
if ( fgGetBool("/sim/rendering/textures") ) {
SGVec4f clearColor(l->adj_fog_color());
camera->setClearColor(toOsg(clearColor));
camera->setClearColor(osg::Vec4(0.0, 0.0, 0.0, 1.0));
}
} else {
SGVec4f clearColor(l->sky_color());
camera->setClearColor(toOsg(clearColor));
camera->setClearColor(osg::Vec4(0.0, 0.0, 0.0, 1.0));
}
// update fog params if visibility has changed

8
src/Scenery/tilemgr.cxx
View file

@ -88,6 +88,8 @@ FGTileMgr::~FGTileMgr() {
group->removeChildren(0, group->getNumChildren());
delete _propListener;
_propListener = NULL;
// clear OSG cache
osgDB::Registry::instance()->clearObjectCache();
}
@ -122,6 +124,12 @@ void FGTileMgr::reinit()
group->removeChildren(0, group->getNumChildren());
tile_cache.init();
// clear OSG cache, except on initial start-up
if (state != Start)
{
osgDB::Registry::instance()->clearObjectCache();
}
state = Inited;
previous_bucket.make_bad();