From aaa717400231861362236b86ed3cab541869fd36 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 24 Aug 1998 20:11:39 +0000
Subject: [PATCH] Tweaks ...

---
 Scenery/material.cxx |  8 +++++++-
 Scenery/tile.cxx     | 11 ++++++++---
 Scenery/tilemgr.cxx  |  7 ++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Scenery/material.cxx b/Scenery/material.cxx
index 013c1853e..839eacf49 100644
--- a/Scenery/material.cxx
+++ b/Scenery/material.cxx
@@ -169,7 +169,10 @@ int fgMATERIAL_MGR::load_lib ( void ) {
 	    // set the texture parameters for this texture
 	    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
 	    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
-	    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+	    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 
+			      GL_LINEAR );
+	    // xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+	    //                   GL_NEAREST_MIPMAP_NEAREST );
 	    xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
 			      /* GL_LINEAR */ 
 			      /* GL_NEAREST_MIPMAP_LINEAR */
@@ -300,6 +303,9 @@ fgMATERIAL_MGR::~fgMATERIAL_MGR ( void ) {
 
 
 // $Log$
+// Revision 1.13  1998/08/24 20:11:39  curt
+// Tweaks ...
+//
 // Revision 1.12  1998/08/12 21:41:27  curt
 // Need to negate the test for textures so that textures aren't loaded when
 // they are disabled rather than visa versa ... :-)
diff --git a/Scenery/tile.cxx b/Scenery/tile.cxx
index 5f0a97c1c..b19b7fbba 100644
--- a/Scenery/tile.cxx
+++ b/Scenery/tile.cxx
@@ -288,14 +288,16 @@ int fgFRAGMENT::intersect( fgPoint3d *end0, fgPoint3d *end1, int side_flag,
 
 	// check to see if intersection point is in the bounding
 	// cube of the face
+#ifdef XTRA_DEBUG_STUFF
 	xmin = fg_min3 (p1[0], p2[0], p3[0]);
 	xmax = fg_max3 (p1[0], p2[0], p3[0]);
 	ymin = fg_min3 (p1[1], p2[1], p3[1]);
 	ymax = fg_max3 (p1[1], p2[1], p3[1]);
 	zmin = fg_min3 (p1[2], p2[2], p3[2]);
 	zmax = fg_max3 (p1[2], p2[2], p3[2]);
-	// printf("bounding cube = %.2f,%.2f,%.2f  %.2f,%.2f,%.2f\n",
-	//        xmin, ymin, zmin, xmax, ymax, zmax);
+	printf("bounding cube = %.2f,%.2f,%.2f  %.2f,%.2f,%.2f\n",
+	       xmin, ymin, zmin, xmax, ymax, zmax);
+#endif
 	// punt if outside bouding cube
 	if ( x < (xmin = fg_min3 (p1[0], p2[0], p3[0])) ) {
 	    continue;
@@ -448,7 +450,10 @@ fgTILE::~fgTILE ( void ) {
 
 
 // $Log$
-// Revision 1.8  1998/08/22 14:49:58  curt
+// Revision 1.9  1998/08/24 20:11:39  curt
+// Tweaks ...
+//
+// Revision 1.8  1998/08/22  14:49:58  curt
 // Attempting to iron out seg faults and crashes.
 // Did some shuffling to fix a initialization order problem between view
 // position, scenery elevation.
diff --git a/Scenery/tilemgr.cxx b/Scenery/tilemgr.cxx
index fa70e32c0..067411e46 100644
--- a/Scenery/tilemgr.cxx
+++ b/Scenery/tilemgr.cxx
@@ -671,13 +671,18 @@ void fgTileMgrRender( void ) {
 
     xglPopMatrix();
 
+    v->tris_rendered = total_faces;
+
     fgPrintf( FG_TERRAIN, FG_DEBUG, "Rendered %d polygons this frame.\n", 
 	      total_faces);
 }
 
 
 // $Log$
-// Revision 1.30  1998/08/22 14:49:59  curt
+// Revision 1.31  1998/08/24 20:11:40  curt
+// Tweaks ...
+//
+// Revision 1.30  1998/08/22  14:49:59  curt
 // Attempting to iron out seg faults and crashes.
 // Did some shuffling to fix a initialization order problem between view
 // position, scenery elevation.
-- 
2.39.2