Merge branch 'next' into comm-subsystem

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 0fa2e7f94c16489c3fe62130a0529b6af4b4fc34..79fe251de240787e5136a17c3124fb240ec2069b 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -132,7 +132,6 @@ static void fgMainLoop( void ) {
         = fgGetNode("/sim/timing-statistics/min-time-ms", true);
 
     frame_signal->fireValueChanged();
-    SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
     
     SG_LOG( SG_GENERAL, SG_DEBUG, "Running Main Loop");
     SG_LOG( SG_GENERAL, SG_DEBUG, "======= ==== ====");
@@ -556,11 +555,6 @@ static void fgIdleFunction ( void ) {
     }
 }
 
-static void fgWinResizeFunction(int width, int height)
-{
-    globals->get_renderer()->resize(width, height);
-}
-
 static void upper_case_property(const char *name)
 {
     using namespace simgear;
@@ -651,9 +645,7 @@ int fgMainInit( int argc, char **argv ) {
     fgOSInit(&argc, argv);
     _bootstrap_OSInit++;
 
-    fgRegisterWindowResizeHandler( &fgWinResizeFunction );
     fgRegisterIdleHandler( &fgIdleFunction );
-    fgRegisterDrawHandler( &FGRenderer::update );
 
     // Initialize sockets (WinSock needs this)
     simgear::Socket::initSockets();