Did some renaming of new simgear code.

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 09fab77b734bb91132e79282a19d74aaf160eddf..fa3f41d50c3481cc567e5c7b8099e08c2135ebae 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -723,10 +723,10 @@ bool fgBinObjLoad( const string& path, const bool is_base,
             sgVec3 up;
             sgSetVec3( up, center->x(), center->y(), center->z() );
             // returns a transform -> lod -> leaf structure
-            ssgBranch *branch = gen_directional_lights( nodes, normals,
-                                                        pts_v[i], pts_n[i],
-                                                        matlib, pt_materials[i],
-                                                        up );
+            ssgBranch *branch = sgMakeDirectionalLights( nodes, normals,
+                                                         pts_v[i], pts_n[i],
+                                                         matlib,
+                                                         pt_materials[i], up );
             // branches don't honor callbacks as far as I know so I'm
             // commenting this out to avoid a plib runtime warning.
             branch->setTravCallback( SSG_CALLBACK_PRETRAV,

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index 5a16444f48ed2b493b52ffacf95345495aca97ff..72f53dc04264f32de7686850fe8f6000b3257f08 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -719,8 +719,8 @@ FGTileEntry::load( const SGPath& base, bool is_base )
                 obj_trans->setTransform( &obj_pos );
 
                 ssgBranch *custom_obj
-                    = gen_taxi_sign( globals->get_matlib(),
-                                     custom_path.str(), name );
+                    = sgMakeTaxiSign( globals->get_matlib(),
+                                      custom_path.str(), name );
 
                 // wire the pieces together
                 if ( custom_obj != NULL ) {
@@ -748,8 +748,8 @@ FGTileEntry::load( const SGPath& base, bool is_base )
                 obj_trans->setTransform( &obj_pos );
 
                 ssgBranch *custom_obj
-                    = gen_runway_sign( globals->get_matlib(),
-                                       custom_path.str(), name );
+                    = sgMakeRunwaySign( globals->get_matlib(),
+                                        custom_path.str(), name );
 
                 // wire the pieces together
                 if ( custom_obj != NULL ) {