- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Scenery / scenery.cxx

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 163a4da58e1d249041d01bc2f0db78c77664b5d2..b5a4406f0abf62202f4ba5539a6f6bcc0dbef6bb 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -30,21 +30,14 @@
 #endif
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <GL/gl.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include <Debug/logstream.hxx>
-#include <Main/options.hxx>
+#include <simgear/debug/logstream.hxx>
 
-// #include "obj.hxx"
 #include "scenery.hxx"
-// #include "texload.h"
-
-
-// Temporary hack until we get a better texture management system running
-GLint area_texture;
 
 
 // Shared structure to hold current scenery parameters
@@ -53,30 +46,10 @@ struct fgSCENERY scenery;
 
 // Initialize the Scenery Management system
 int fgSceneryInit( void ) {
-    fgOPTIONS *o;
-    // char path[1024], fgpath[1024];
-    // GLubyte *texbuf;
-    // int width, height;
-
-    o = &current_options;
-
-    FG_LOG( FG_TERRAIN, FG_INFO, "Initializing scenery subsystem" );
+    SG_LOG( SG_TERRAIN, SG_INFO, "Initializing scenery subsystem" );
 
+    scenery.center = Point3D(0.0);
     scenery.cur_elev = -9999;
 
-    return(1);
-}
-
-
-// Tell the scenery manager where we are so it can load the proper data, and
-// build the proper structures.
-void fgSceneryUpdate(double lon, double lat, double elev) {
-    // does nothing;
-}
-
-
-// Render out the current scene
-void fgSceneryRender( void ) {
+    return 1;
 }
-
-