General cleanups to cut cross-dependencies and speed up compilation.

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

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 0294de24d792f1af40dac5a8a302bc5b38b2665b..0f78f66ac149ffb9c9c5cfbfa10ed0350c2fbf74 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -30,43 +30,45 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <stdio.h>
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>
 
-#include "scenery.hxx"
-
+#include <Main/fg_props.hxx>
 
-// Temporary hack until we get a better texture management system running
-GLint area_texture;
+#include "scenery.hxx"
 
 
 // Shared structure to hold current scenery parameters
-struct fgSCENERY scenery;
+FGScenery scenery;
 
 
-// Initialize the Scenery Management system
-int fgSceneryInit( void ) {
-    FG_LOG( FG_TERRAIN, FG_INFO, "Initializing scenery subsystem" );
-
-    scenery.cur_elev = -9999;
+// Scenery Management system
+FGScenery::FGScenery() {
+    SG_LOG( SG_TERRAIN, SG_INFO, "Initializing scenery subsystem" );
 
-    return 1;
+    center = Point3D(0.0);
+    cur_elev = -9999;
 }
 
-
-// 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;
+// Initialize the Scenery Management system
+FGScenery::~FGScenery() {
 }
 
+void FGScenery::init() {
+}
 
-// Render out the current scene
-void fgSceneryRender( void ) {
+void FGScenery::update(int dt) {
 }
 
+void FGScenery::bind() {
+    fgTie("/environment/ground-elevation-m", this,
+         &FGScenery::get_cur_elev, &FGScenery::set_cur_elev);
+}
 
+void FGScenery::unbind() {
+    fgUntie("/environment/ground-elevation-m");
+}