From b8faa9b6f7d9ffae109054fefbec999e56ec7107 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 11 Dec 2002 16:24:42 +0000
Subject: [PATCH] Added the afteresher.geo demo to osgtest.bat and
 debugtests.bat.

Converted the osgtxp demo to use straight string comparison instead of case sensitive string
comparion to help cross platform portability.
---
 Make/debugtests.bat         |   4 ++
 Make/osgtests.bat           |   3 ++
 src/Demos/osgtxp/osgtxp.cpp | 103 +++++++++++++++++++-----------------
 3 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/Make/debugtests.bat b/Make/debugtests.bat
index a4ecfbe3b..45740f9c3 100755
--- a/Make/debugtests.bat
+++ b/Make/debugtests.bat
@@ -38,6 +38,10 @@ echo sgv Town.osg
 sgv Town.osg
 more memleaks.log
 
+echo sgv afterescher.geo
+sgv afterescher.geo
+more memleaks.log
+
 echo osgshape
 osgshape
 more memleaks.log
diff --git a/Make/osgtests.bat b/Make/osgtests.bat
index 7bfb5868f..19ccd4f53 100755
--- a/Make/osgtests.bat
+++ b/Make/osgtests.bat
@@ -25,6 +25,9 @@ sgv cube_mapped_torus.osg
 echo sgv Town.osg
 sgv Town.osg
 
+echo sgv afterescher.geo
+sgv afterescher.geo
+
 echo osgshape
 osgshape
 
diff --git a/src/Demos/osgtxp/osgtxp.cpp b/src/Demos/osgtxp/osgtxp.cpp
index 40132b209..64d5370b7 100644
--- a/src/Demos/osgtxp/osgtxp.cpp
+++ b/src/Demos/osgtxp/osgtxp.cpp
@@ -90,50 +90,57 @@ int main( int argc, char **argv )
     {
         if ((*itr)[0]!='-')
         {
-	    fileName = (*itr);
-        } else {
-	    // Look for switches we want
-	    if (!strcasecmp((*itr).c_str(),"-loadall")) {
-			loadAll = true;
-			continue;
-	    }
-	    if (!strcasecmp((*itr).c_str(),"-thread")) {
-				threadIt = true;
-				continue;
-	    }
-	}
+            fileName = (*itr);
+
+        }
+        else
+        {
+            // Look for switches we want
+            if (*itr=="-loadall")
+            {
+                loadAll = true;
+                continue;
+            }
+            if (*itr=="-thread")
+            {
+                threadIt = true;
+                continue;
+            }
+        }
     }
     if (fileName.empty()) {
-	fprintf(stderr,"No TerraPage file specified on command line.\n");
-	return 1;
+    fprintf(stderr,"No TerraPage file specified on command line.\n");
+    return 1;
     }
     // Open the TXP database
     TrPageArchive *txpArchive = new TrPageArchive();
-    if (!txpArchive->OpenFile(fileName.c_str())) {
-	fprintf(stderr,"Couldn't load TerraPage archive %s.\n",fileName.c_str());
-	return 1;
+    if (!txpArchive->OpenFile(fileName.c_str()))
+    {
+        fprintf(stderr,"Couldn't load TerraPage archive %s.\n",fileName.c_str());
+        return 1;
     }
+    
     // Note: Should be checking the return values
     txpArchive->LoadMaterials();
-//	txpArchive->LoadModels();
+//    txpArchive->LoadModels();
 
-	// Might need a page manager if we're paging
-	OSGPageManager *pageManager = new OSGPageManager(txpArchive);
-	osg::Group *rootNode=NULL;
-	if (loadAll) {
-		// Load the whole scenegraph
-		rootNode = txpArchive->LoadAllTiles();
-		if (!rootNode) {
-			fprintf(stderr,"Couldn't load whole TerraPage archive %s.\n",fileName.c_str());
-			return 1;
-		}
-		// add a viewport to the viewer and attach the scene graph.
-		viewer->addViewport( rootNode );
-	} else {
-		viewer->Init(pageManager,(threadIt ? txp::OSGPageManager::ThreadFree : txp::OSGPageManager::ThreadNone));
-		rootNode = new osg::Group();
-		viewer->addViewport(rootNode);
-	}
+    // Might need a page manager if we're paging
+    OSGPageManager *pageManager = new OSGPageManager(txpArchive);
+    osg::Group *rootNode=NULL;
+    if (loadAll) {
+        // Load the whole scenegraph
+        rootNode = txpArchive->LoadAllTiles();
+        if (!rootNode) {
+            fprintf(stderr,"Couldn't load whole TerraPage archive %s.\n",fileName.c_str());
+            return 1;
+        }
+        // add a viewport to the viewer and attach the scene graph.
+        viewer->addViewport( rootNode );
+    } else {
+        viewer->Init(pageManager,(threadIt ? txp::OSGPageManager::ThreadFree : txp::OSGPageManager::ThreadNone));
+        rootNode = new osg::Group();
+        viewer->addViewport(rootNode);
+    }
     
     // run optimization over the scene graph
 //   osgUtil::Optimizer optimzer;
@@ -145,15 +152,15 @@ int main( int argc, char **argv )
     viewer->registerCameraManipulator(new osgGA::FlightManipulator);
     viewer->registerCameraManipulator(new osgGA::DriveManipulator);
 
-	// Recenter the camera to the middle of the database
-	osg::Vec3 center;
-	txpArchive->GetCenter(center);  center[2] += 200;
-	osgUtil::SceneView *sceneView = viewer->getViewportSceneView(0);
-	osg::Camera *camera = sceneView->getCamera();
-	osg::Vec3 eyePt = center;
-	eyePt[0] -= 1000;
-	osg::Vec3 upVec( 0, 0, 1 );
-	camera->setLookAt(eyePt,center,upVec);
+    // Recenter the camera to the middle of the database
+    osg::Vec3 center;
+    txpArchive->GetCenter(center);  center[2] += 200;
+    osgUtil::SceneView *sceneView = viewer->getViewportSceneView(0);
+    osg::Camera *camera = sceneView->getCamera();
+    osg::Vec3 eyePt = center;
+    eyePt[0] -= 1000;
+    osg::Vec3 upVec( 0, 0, 1 );
+    camera->setLookAt(eyePt,center,upVec);
 
     // open the viewer window.
     viewer->open();
@@ -162,11 +169,11 @@ int main( int argc, char **argv )
     viewer->run();
 
 
-	// Close things down  
+    // Close things down  
         // (note from Robert Osfield, umm.... we should be using ref_ptr<> for handling memory here, this isn't robust..)
-	delete pageManager;
-	delete txpArchive;
-	delete viewer;
+    delete pageManager;
+    delete txpArchive;
+    delete viewer;
 
     return 0;
 }