Tweaked texture coordinates, but we still have some problems. :-(

[flightgear.git] / Objects / obj.cxx

diff --git a/Objects/obj.cxx b/Objects/obj.cxx
index 2f997f9cefed24881f1db1bc9451c9fbdbabbc19..35973ac05973bc79f2a9c020615a51064eefe9e5 100644 (file)
--- a/Objects/obj.cxx
+++ b/Objects/obj.cxx
@@ -85,31 +85,41 @@ static void calc_normal(double p1[3], double p2[3],
 }
 
 
-#define FG_TEX_CONSTANT 128.0
+#define FG_TEX_CONSTANT 69.0
 
 
 // Calculate texture coordinates for a given point.
-Point3D calc_tex_coords(double *node, const Point3D& ref) {
+static Point3D calc_tex_coords(double *node, const Point3D& ref) {
     Point3D cp;
     Point3D pp;
+    // double tmplon, tmplat;
 
-    cp.setvals( node[0] + ref.x(),
-               node[1] + ref.y(),
-               node[2] + ref.z() );
+    // cout << "-> " << node[0] << " " << node[1] << " " << node[2] << endl;
+    // cout << "-> " << ref.x() << " " << ref.y() << " " << ref.z() << endl;
+
+    cp = Point3D( node[0] + ref.x(),
+                 node[1] + ref.y(),
+                 node[2] + ref.z() );
 
     pp = fgCartToPolar3d(cp);
 
-    pp.setx( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.x(), 25.0) );
-    pp.sety( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.y(), 25.0) );
+    // tmplon = pp.lon() * RAD_TO_DEG;
+    // tmplat = pp.lat() * RAD_TO_DEG;
+    // cout << tmplon << " " << tmplat << endl;
+
+    pp.setx( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.x(), 11.0) );
+    pp.sety( fmod(RAD_TO_DEG * FG_TEX_CONSTANT * pp.y(), 11.0) );
 
     if ( pp.x() < 0.0 ) {
-       pp.setx( pp.x() + 25.0 );
+       pp.setx( pp.x() + 11.0 );
     }
 
     if ( pp.y() < 0.0 ) {
-       pp.sety( pp.y() + 25.0 );
+       pp.sety( pp.y() + 11.0 );
     }
 
+    // cout << pp << endl;
+
     return(pp);
 }
 
@@ -171,15 +181,11 @@ int fgObjLoad( const string& path, fgTILE *t) {
        {
            // reference point (center offset)
            in.stream() >> t->center >> t->bounding_radius;
+           center = t->center;
        }
        else if ( token == "bs" )
        {
            // reference point (center offset)
-           /*
-           in.stream() >> fragment.center.x
-                       >> fragment.center.y
-                       >> fragment.center.z
-           */
            in.stream() >> fragment.center;
            in.stream() >> fragment.bounding_radius;
        }
@@ -547,6 +553,15 @@ int fgObjLoad( const string& path, fgTILE *t) {
 
 
 // $Log$
+// Revision 1.8  1998/10/20 18:33:55  curt
+// Tweaked texture coordinates, but we still have some problems. :-(
+//
+// Revision 1.7  1998/10/20 15:48:44  curt
+// Removed an extraneous output message.
+//
+// Revision 1.6  1998/10/18 01:17:21  curt
+// Point3D tweaks.
+//
 // Revision 1.5  1998/10/16 00:54:39  curt
 // Converted to Point3D class.
 //