C++ ifying ...

[flightgear.git] / Time / light.cxx

diff --git a/Time/light.cxx b/Time/light.cxx
index fffe715d2a36267a2fccd2827c568cf2f6ff7b70..226d4d44291f6714ab9fd69e2bc6325df16fc2dc 100644 (file)
--- a/Time/light.cxx
+++ b/Time/light.cxx
@@ -35,12 +35,12 @@
 
 #include <string.h>
 
-#include <Aircraft/aircraft.h>
+#include <Aircraft/aircraft.hxx>
 #include <Debug/fg_debug.h>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
 #include <Main/views.hxx>
-#include <Math/fg_geodesy.h>
+#include <Math/fg_geodesy.hxx>
 #include <Math/interpolater.hxx>
 #include <Math/mat3.h>
 #include <Math/polar3d.hxx>
@@ -60,31 +60,25 @@ fgLIGHT::fgLIGHT( void ) {
 
 // initialize lighting tables
 void fgLIGHT::Init( void ) {
-    char path[256];
+    string path, ambient, diffuse, sky;
 
     fgPrintf( FG_EVENT, FG_INFO, 
             "Initializing Lighting interpolation tables.\n" );
 
     // build the path name to the ambient lookup table
-    current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
-    strcat(path, "Ambient");
+    path = current_options.get_fg_root();
+    ambient = path + "/Lighting/ambient";
+    diffuse = path + "/Lighting/diffuse";
+    sky     = path + "/Lighting/sky";
+
     // initialize ambient table
-    ambient_tbl = new fgINTERPTABLE(path);
+    ambient_tbl = new fgINTERPTABLE((char *)ambient.c_str());
 
-    // build the path name to the diffuse lookup table
-    current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
-    strcat(path, "Diffuse");
     // initialize diffuse table
-    diffuse_tbl = new fgINTERPTABLE(path);
+    diffuse_tbl = new fgINTERPTABLE((char *)diffuse.c_str());
     
-    // build the path name to the sky lookup table
-    current_options.get_fg_root(path);
-    strcat(path, "/Scenery/");
-    strcat(path, "Sky");
     // initialize sky table
-    sky_tbl = new fgINTERPTABLE(path);
+    sky_tbl = new fgINTERPTABLE((char *)sky.c_str());
 }
 
 
@@ -217,16 +211,48 @@ fgLIGHT::~fgLIGHT( void ) {
 }
 
 
-// wrapper function for updating light parameters via the event scheduler
-void fgLightUpdate ( void ) {
-    fgLIGHT *l;
-    l = &cur_light_params;
-   
-    l->Update();
-}
-
-
 // $Log$
+// Revision 1.18  1998/10/17 01:34:30  curt
+// C++ ifying ...
+//
+// Revision 1.17  1998/08/29 13:11:33  curt
+// Bernie Bright writes:
+//   I've created some new classes to enable pointers-to-functions and
+//   pointers-to-class-methods to be treated like objects.  These objects
+//   can be registered with fgEVENT_MGR.
+//
+//   File "Include/fg_callback.hxx" contains the callback class defns.
+//
+//   Modified fgEVENT and fgEVENT_MGR to use the callback classes.  Also
+//   some minor tweaks to STL usage.
+//
+//   Added file "Include/fg_stl_config.h" to deal with STL portability
+//   issues.  I've added an initial config for egcs (and probably gcc-2.8.x).
+//   I don't have access to Visual C++ so I've left that for someone else.
+//   This file is influenced by the stl_config.h file delivered with egcs.
+//
+//   Added "Include/auto_ptr.hxx" which contains an implementation of the
+//   STL auto_ptr class which is not provided in all STL implementations
+//   and is needed to use the callback classes.
+//
+//   Deleted fgLightUpdate() which was just a wrapper to call
+//   fgLIGHT::Update().
+//
+//   Modified fg_init.cxx to register two method callbacks in place of the
+//   old wrapper functions.
+//
+// Revision 1.16  1998/08/27 17:02:11  curt
+// Contributions from Bernie Bright <bbright@c031.aone.net.au>
+// - use strings for fg_root and airport_id and added methods to return
+//   them as strings,
+// - inlined all access methods,
+// - made the parsing functions private methods,
+// - deleted some unused functions.
+// - propogated some of these changes out a bit further.
+//
+// Revision 1.15  1998/08/25 20:53:33  curt
+// Shuffled $FG_ROOT file layout.
+//
 // Revision 1.14  1998/08/06 12:47:22  curt
 // Adjusted dusk/dawn lighting ...
 //