#includes based off of srcdir rather than builddir.

[simgear.git] / simgear / misc / texcoord.cxx

diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index 789fd9d93742062b963face3036c91c80d7b467d..804a36b86c103b42fe9fddf6d563755cea0e96b7 100644 (file)
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -4,19 +4,20 @@
 //
 // Copyright (C) 1999  Curtis L. Olson  - curt@flightgear.org
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
@@ -113,17 +114,40 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
     // cout << "dx = " << dx << " dy = " << dy << endl;
 
     bool do_shift = false;
-    Point3D mod_shift;
+    // Point3D mod_shift;
     if ( (dx > HALF_MAX_TEX_COORD) || (dy > HALF_MAX_TEX_COORD) ) {
        // structure is too big, we'll just have to shift it so that
        // tmin = (0,0).  This messes up subsequent texture scaling,
        // but is the best we can do.
        // cout << "SHIFTING" << endl;
        do_shift = true;
-       tmin.setx( (double)( (int)tmin.x() + 1 ) );
-       tmin.sety( (double)( (int)tmin.y() + 1 ) );
+       if ( tmin.x() < 0 ) {
+           tmin.setx( (double)( (int)tmin.x() - 1 ) );
+       } else {
+           tmin.setx( (int)tmin.x() );
+       }
+       if ( tmin.y() < 0 ) {
+           tmin.sety( (double)( (int)tmin.y() - 1 ) );
+       } else {
+           tmin.sety( (int)tmin.y() );
+       }
        // cout << "found tmin = " << tmin << endl;
     } else {
+       if ( tmin.x() < 0 ) {
+           tmin.setx( ( (int)(tmin.x() / HALF_MAX_TEX_COORD) - 1 )
+                      * HALF_MAX_TEX_COORD );
+       } else {
+           tmin.setx( ( (int)(tmin.x() / HALF_MAX_TEX_COORD) )
+                      * HALF_MAX_TEX_COORD );
+       }
+       if ( tmin.y() < 0 ) {
+           tmin.sety( ( (int)(tmin.y() / HALF_MAX_TEX_COORD) - 1 )
+                      * HALF_MAX_TEX_COORD );
+       } else {
+           tmin.sety( ( (int)(tmin.y() / HALF_MAX_TEX_COORD) )
+                      * HALF_MAX_TEX_COORD );
+       }
+#if 0
        // structure is small enough ... we can mod it so we can
        // properly scale the texture coordinates later.
        // cout << "MODDING" << endl;
@@ -142,7 +166,7 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
        // At this point we know that the object is < 16 wide in
        // texture coordinate space.  If the modulo of the tmin is >
        // the mod of the tmax at this point, then we know that the
-       // starting tex coordinate for the tmin > 16 so we can shift
+       // starting tex coordinate for the tmax > 16 so we can shift
        // everything down by 16 and get it within the 0-32 range.
 
        if ( x1 > x2 ) {
@@ -156,7 +180,7 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
        } else {
            mod_shift.sety( 0.0 );
        }
-
+#endif
        // cout << "mod_shift = " << mod_shift << endl;
     }
 
@@ -169,8 +193,9 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
        t = basic_tex_coord( p, degree_width, degree_height, scale );
        // cout << "second t = " << t << endl;
 
-       if ( do_shift ) {
-           adjusted_t = t - tmin;
+       // if ( do_shift ) {
+       adjusted_t = t - tmin;
+#if 0
        } else {
            adjusted_t.setx( fmod(t.x() + mod_shift.x(), MAX_TEX_COORD) );
            while ( adjusted_t.x() < 0 ) { 
@@ -182,7 +207,7 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
            }
            // cout << "adjusted_t " << adjusted_t << endl;
        }
-
+#endif
        if ( adjusted_t.x() < FG_EPSILON ) {
            adjusted_t.setx( 0.0 );
        }