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

diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index ee66504fadb98f8695aeff4722b10d6ab765be8a..3c9f762e89905bf264cad879d495a695126b7d6f 100644 (file)
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -140,8 +140,15 @@ enter this in the official comments in case I forget again. :-)
 
 */
 
+#include <simgear/compiler.h>
+
+// #include STL_IOSTREAM
+
 #include "texcoord.hxx"
 
+// SG_USING_STD(cout);
+// SG_USING_STD(endl);
+
 
 #define FG_STANDARD_TEXTURE_DIMENSION 1000.0 // meters
 #define MAX_TEX_COORD 8.0
@@ -149,9 +156,10 @@ enter this in the official comments in case I forget again. :-)
 
 
 // return the basic unshifted/unmoded texture coordinate for a lat/lon
-inline Point3D basic_tex_coord( const Point3D& p, 
-                               double degree_width, double degree_height,
-                               double scale )
+static inline Point3D basic_tex_coord( const Point3D& p, 
+                                       double degree_width,
+                                       double degree_height,
+                                       double scale )
 {
     return Point3D( p.x() * ( degree_width * scale / 
                              FG_STANDARD_TEXTURE_DIMENSION ),
@@ -163,7 +171,7 @@ inline Point3D basic_tex_coord( const Point3D& p,
 
 // traverse the specified fan/strip/list of vertices and attempt to
 // calculate "none stretching" texture coordinates
-point_list calc_tex_coords( const SGBucket& b, const point_list& geod_nodes,
+point_list sgCalcTexCoords( const SGBucket& b, const point_list& geod_nodes,
                            const int_list& fan, double scale )
 {
     // cout << "calculating texture coordinates for a specific fan of size = "

diff --git a/simgear/misc/texcoord.hxx b/simgear/misc/texcoord.hxx
index a5c13f707d33e35fe88ffa1a51a742859ca8539f..7c8ec0e5901d9b5c8ee8e1264c19bb5a4e48b521 100644 (file)
--- a/simgear/misc/texcoord.hxx
+++ b/simgear/misc/texcoord.hxx
@@ -47,7 +47,7 @@
  * @param scale (default = 1.0) scaling factor
  * @return list of texture coordinates
  */
-point_list calc_tex_coords( const SGBucket& b, const point_list& geod_nodes,
+point_list sgCalcTexCoords( const SGBucket& b, const point_list& geod_nodes,
                            const int_list& fan, double scale = 1.0 );
 
 

diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index e26459c8450a2712df70232f896d9ff4ac15e5bf..02873d8ca7e19c3c558a713782926979727fd8c2 100644 (file)
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -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