Just a bit of renaming.

diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx
index 124d8b1f2172aa4387e54890cddbe3e2519da3a1..c06e51411ea89d923e90229c80b10ff8b6d7155c 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.cxx
+++ b/simgear/scene/tgdb/apt_signs.cxx
@@ -28,8 +28,8 @@
 #include "apt_signs.hxx"
 
 
-ssgBranch *gen_taxi_sign( SGMaterialLib *matlib,
-                          const string path, const string content )
+ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
+                           const string path, const string content )
 {
     // for demo purposes we assume each element (letter) is 1x1 meter.
     // Sign is placed 0.25 meters above the ground
@@ -109,8 +109,8 @@ ssgBranch *gen_taxi_sign( SGMaterialLib *matlib,
 }
 
 
-ssgBranch *gen_runway_sign( SGMaterialLib *matlib,
-                            const string path, const string name )
+ssgBranch *sgMakeRunwaySign( SGMaterialLib *matlib,
+                             const string path, const string name )
 {
     // for demo purposes we assume each element (letter) is 1x1 meter.
     // Sign is placed 0.25 meters above the ground

diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index edd96dfb13df86ceac3f69a6dc1a8fd2008e131b..370cf623688057e971616245f5d24613be14daa8 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#ifndef _APT_SIGNS_HXX
-#define _APT_SIGNS_HXX
+#ifndef _SG_APT_SIGNS_HXX
+#define _SG_APT_SIGNS_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -42,13 +42,13 @@ SG_USING_STD(string);
 
 
 // Generate a taxi sign
-ssgBranch *gen_taxi_sign( SGMaterialLib *matlib,
-                          const string path, const string content );
+ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
+                           const string path, const string content );
 
 
 // Generate a runway sign
-ssgBranch *gen_runway_sign( SGMaterialLib *matlib,
-                            const string path, const string name );
+ssgBranch *sgMakeRunwaySign( SGMaterialLib *matlib,
+                             const string path, const string name );
 
 
-#endif // _APT_SIGNS_HXX
+#endif // _SG_APT_SIGNS_HXX

diff --git a/simgear/scene/tgdb/pt_lights.cxx b/simgear/scene/tgdb/pt_lights.cxx
index 393606a7173d6c8d7962213e727138744bdc638e..539c99e0df37dc87738037257ad8d56c72b79944 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.cxx
+++ b/simgear/scene/tgdb/pt_lights.cxx
@@ -47,8 +47,8 @@ static int StrobePostDraw( ssgEntity *e ) {
 
 
 // Generate a directional light
-ssgLeaf *gen_directional_light( sgVec3 pt, sgVec3 dir, sgVec3 up, 
-                                const SGMaterial *mat ) {
+ssgLeaf *sgMakeDirectionalLight( sgVec3 pt, sgVec3 dir, sgVec3 up, 
+                                 const SGMaterial *mat ) {
 
     // calculate a vector perpendicular to dir and up
     sgVec3 perp;
@@ -575,13 +575,13 @@ static ssgLeaf *gen_normal_line( SGMaterialLib *matlib,
 #endif
 
 
-ssgBranch *gen_directional_lights( const point_list &nodes,
-                                   const point_list &normals,
-                                   const int_list &pnt_i,
-                                   const int_list &nml_i,
-                                   SGMaterialLib *matlib,
-                                   const string &material,
-                                   sgVec3 up )
+ssgBranch *sgMakeDirectionalLights( const point_list &nodes,
+                                    const point_list &normals,
+                                    const int_list &pnt_i,
+                                    const int_list &nml_i,
+                                    SGMaterialLib *matlib,
+                                    const string &material,
+                                    sgVec3 up )
 {
     sgVec3 nup;
     sgNormalizeVec3( nup, up );

diff --git a/simgear/scene/tgdb/pt_lights.hxx b/simgear/scene/tgdb/pt_lights.hxx
index 2a2e4c01ce58f81c2fd8e24c37a8d4aa78668d5d..4531784be762074c5929741696908a4e39981e5b 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.hxx
+++ b/simgear/scene/tgdb/pt_lights.hxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#ifndef _PT_LIGHTS_HXX
-#define _PT_LIGHTS_HXX
+#ifndef _SG_PT_LIGHTS_HXX
+#define _SG_PT_LIGHTS_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -51,16 +51,16 @@ typedef int_list::const_iterator int_point_list_iterator;
 
 // Define the various supported light types
 typedef enum {
-    FG_RWYLIGHT_TAXI = 0,
-    FG_RWYLIGHT_VASI,
-    FG_RWYLIGHT_EDGE,
-    FG_RWYLIGHT_TOUCHDOWN,
-    FG_RWYLIGHT_THRESHOLD,
-    FG_RWYLIGHT_WHITE,
-    FG_RWYLIGHT_RED,
-    FG_RWYLIGHT_GREEN,
-    FG_RWYLIGHT_YELLOW
-} fgRunwayLightType;
+    SG_RWYLIGHT_TAXI = 0,
+    SG_RWYLIGHT_VASI,
+    SG_RWYLIGHT_EDGE,
+    SG_RWYLIGHT_TOUCHDOWN,
+    SG_RWYLIGHT_THRESHOLD,
+    SG_RWYLIGHT_WHITE,
+    SG_RWYLIGHT_RED,
+    SG_RWYLIGHT_GREEN,
+    SG_RWYLIGHT_YELLOW
+} sgPointLightType;
 
 
 // Generate a directional light.  This routines creates a
@@ -92,16 +92,16 @@ typedef enum {
 // Yes this get's to be long and convoluted.  If you can suggest a
 // simpler way, please do! :-)
 
-ssgLeaf *gen_directional_light( sgVec3 pt, sgVec3 dir, sgVec3 up );
+ssgLeaf *sgMakeDirectionalLight( sgVec3 pt, sgVec3 dir, sgVec3 up );
 
 
-ssgBranch *gen_directional_lights( const point_list &nodes,
-                                   const point_list &normals,
-                                   const int_list &pnt_i,
-                                   const int_list &nml_i,
-                                   SGMaterialLib *matlib,
-                                   const string &material,
-                                   sgVec3 up );
+ssgBranch *sgMakeDirectionalLights( const point_list &nodes,
+                                    const point_list &normals,
+                                    const int_list &pnt_i,
+                                    const int_list &nml_i,
+                                    SGMaterialLib *matlib,
+                                    const string &material,
+                                    sgVec3 up );
 
 
-#endif // _PT_LIGHTS_HXX
+#endif // _SG_PT_LIGHTS_HXX