Tweaks to fix problems with moon rendering introduced with ssg.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2ee9a89ba4ec99097d135da91cca28660f99505e..9eab93ed863b94f32bd53cc282cc0ec4906c5d6b 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -256,10 +256,6 @@ static void fgRenderFrame( void ) {
        // set the sun position
        xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
 
-       sgVec3 sunpos;
-       sgSetVec3( sunpos, l->sun_vec[0], l->sun_vec[1], l->sun_vec[2] );
-       ssgGetLight( 0 ) -> setPosition( sunpos );
-
        clear_mask = GL_DEPTH_BUFFER_BIT;
        if ( current_options.get_wireframe() ) {
            clear_mask |= GL_COLOR_BUFFER_BIT;
@@ -317,7 +313,9 @@ static void fgRenderFrame( void ) {
 
        // draw stars and planets
        fgStarsRender();
+       xglDisable( GL_COLOR_MATERIAL ); // just to make sure ...
        xglEnable( GL_CULL_FACE ); // for moon
+       xglLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
        //xglEnable(GL_DEPTH_TEST);
        SolarSystem::theSolarSystem->draw();
 
@@ -358,9 +356,9 @@ static void fgRenderFrame( void ) {
            // xglMaterialfv (GL_FRONT, GL_DIFFUSE, white);
        }
 
-       // global_tile_mgr.render();
-
-       // ssg test
+       sgVec3 sunpos;
+       sgSetVec3( sunpos, l->sun_vec[0], l->sun_vec[1], l->sun_vec[2] );
+       ssgGetLight( 0 ) -> setPosition( sunpos );
 
        // xglMatrixMode( GL_PROJECTION );
        // xglLoadIdentity();

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index d76d7af04fc4cb27cf77ee88d4c22f0161ce1762..31e2c46c7bd5c68cc701822754c7355e181fab23 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -94,6 +94,8 @@ int FGTileMgr::init( void ) {
        material_mgr.load_lib();
     }
 
+    global_tile_cache.init();
+
     state = Inited;
 
     return 1;