Give calc_tex_coords() a more conformant name: sgCalcTexCoords()

[simgear.git] / simgear / scene / tgdb / obj.cxx

diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index 089c263fee8381ed535928dd0dca4db0094ea6ec..02873d8ca7e19c3c558a713782926979727fd8c2 100644 (file)
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -22,9 +22,9 @@
 // $Id$
 
 
-// #ifdef HAVE_CONFIG_H
-// #  include <config.h>
-// #endif
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/compiler.h>
 
@@ -130,7 +130,7 @@ bool sgGenTile( const string& path, SGBucket b,
         geod_nodes.push_back( geod[i] );
         rectangle.push_back( i );
     }
-    point_list texs = calc_tex_coords( b, geod_nodes, rectangle, 
+    point_list texs = sgCalcTexCoords( b, geod_nodes, rectangle, 
                                        1000.0 / tex_width );
 
     // Allocate ssg structure
@@ -192,7 +192,7 @@ bool sgGenTile( const string& path, SGBucket b,
 static int
 leaf_in_range_callback (ssgEntity * entity, int mask)
 {
-  sgLeafUserData * data = (sgLeafUserData *)entity->getUserData();
+  SGLeafUserData * data = (SGLeafUserData *)entity->getUserData();
 
   if (!data->is_filled_in) {
                                 // Iterate through all the triangles
@@ -222,7 +222,7 @@ leaf_in_range_callback (ssgEntity * entity, int mask)
 static int
 leaf_out_of_range_callback (ssgEntity * entity, int mask)
 {
-  sgLeafUserData * data = (sgLeafUserData *)entity->getUserData();
+  SGLeafUserData * data = (SGLeafUserData *)entity->getUserData();
   if (data->is_filled_in) {
     data->branch->removeAllKids();
     data->is_filled_in = false;
@@ -287,7 +287,7 @@ gen_random_surface_objects (ssgLeaf *leaf,
     lod->addKid(in_range);
     lod->addKid(out_of_range);
 
-    sgLeafUserData * data = new sgLeafUserData;
+    SGLeafUserData * data = new SGLeafUserData;
     data->is_filled_in = false;
     data->leaf = leaf;
     data->mat = mat;
@@ -303,7 +303,7 @@ gen_random_surface_objects (ssgLeaf *leaf,
     out_of_range->setTravCallback(SSG_CALLBACK_PRETRAV,
                                    leaf_out_of_range_callback);
     out_of_range
-      ->addKid(new sgDummyBSphereEntity(leaf->getBSphere()->getRadius()));
+      ->addKid(new SGDummyBSphereEntity(leaf->getBSphere()->getRadius()));
 }