From 9099d6bed52a9315659e89451b90af0d19aab676 Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Wed, 27 Jun 2007 19:12:09 +0000
Subject: [PATCH] updated vehicle demo to load heightfield data from file

---
 Demos/VehicleDemo/VehicleDemo.cpp | 42 +++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/Demos/VehicleDemo/VehicleDemo.cpp b/Demos/VehicleDemo/VehicleDemo.cpp
index 662995157..bc69ad78f 100644
--- a/Demos/VehicleDemo/VehicleDemo.cpp
+++ b/Demos/VehicleDemo/VehicleDemo.cpp
@@ -130,7 +130,10 @@ void VehicleDemo::setupPhysics()
 	m_dynamicsWorld->setDebugDrawer(&debugDrawer);
 
 	//m_dynamicsWorld->setGravity(btVector3(0,0,0));
+btTransform tr;
+tr.setIdentity();
 
+//either use heightfield or triangle mesh
 //#define  USE_TRIMESH_GROUND 1
 #ifdef USE_TRIMESH_GROUND
 	int i;
@@ -199,28 +202,53 @@ const float TRIANGLE_SIZE=20.f;
 	bool useQuantizedAabbCompression = true;
 	groundShape = new btBvhTriangleMeshShape(indexVertexArrays,useQuantizedAabbCompression);
 	
+	tr.setOrigin(btVector3(0,-4.5f,0));
+
 #else
 	//testing btHeightfieldTerrainShape
 	int width=128;
 	int length=128;
 	unsigned char* heightfieldData = new unsigned char[width*length];
+	{
+		for (int i=0;i<width*length;i++)
+		{
+			heightfieldData[i]=0;
+		}
+	}
 
-//	mRawData = new unsigned char [mSize*mSize];	//allocate memory for data
-//	loadFile(filename,mSize*mSize,mRawData);
+	char*	filename="heightfield128x128.raw";
+	FILE* heightfieldFile = fopen(filename,"r");
+	if (!heightfieldFile)
+	{
+		filename="../../heightfield128x128.raw";
+		heightfieldFile = fopen(filename,"r");
+	}
+	if (heightfieldFile)
+	{
+		int numBytes =fread(heightfieldData,1,width*length,heightfieldFile);
+		//btAssert(numBytes);
+		if (!numBytes)
+		{
+			printf("couldn't read heightfield at %s\n",filename);
+		}
+		fclose (heightfieldFile);
+	}
+	
 
-	btScalar maxHeight = 1.f;
+	btScalar maxHeight = 20000.f;
 	
 	groundShape = new btHeightfieldTerrainShape(width,length,heightfieldData,maxHeight,upIndex);
-	btVector3 localScaling(10,10,10);
+	btVector3 localScaling(20,20,20);
 	localScaling[upIndex]=1.f;
 	groundShape->setLocalScaling(localScaling);
 
+	tr.setOrigin(btVector3(0,-64.5f,0));
+
 #endif //
 
-	btTransform tr;
-	tr.setIdentity();
 
-	tr.setOrigin(btVector3(0,-4.5f,0));
+
+