Moved all tests

ChangeLog

@@ -5,6 +5,11 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140110 ]
+	* Moved remaining Unit Tests (Network & TombRaider)
+	* memory_test Unit Test no longer produces warnings
+	* Building a memory test build no longer produces warnings
+
 	[ 20140109 ]
 	* Added greatest Test Framework, rewrote Sound Test
 	* Renamed all memeory references to memory

Makefile

@@ -296,12 +296,14 @@ TombRaider.reg_test:
 	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR4) > /tmp/log.tr4
 	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR5) > /tmp/log.tr5
 
+TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES -DDEBUG_MEMORY
 
 TombRaider.test:
 	@-mkdir -p $(BUILD_TEST_DIR)
+	$(CC) -Wall -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
 	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/mtk_tga.o $(BUILD_TEST_DIR)/memory_test.o" \
-	CFLAGS="$(BASE_CFLAGS) -g -D__TOMBRAIDER_TEST__ -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES -DDEBUG_MEMORY" \
+	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/mtk_tga.o $(BUILD_TEST_DIR)/memory_test.o" \
+	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
 	LD_FLAGS="-lz -lstdc++"
 
 #################################################################
@@ -321,7 +323,7 @@ Hel.test: Quaternion.test Matrix.test Math.test
 Matrix.test:
 	@-echo "Building Matrix unit test"
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) -Wall -g -DMATRIX_UNIT_TEST -lm -lstdc++ -Iinclude \
+	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
 	src/hel/Matrix.cpp src/hel/Quaternion.cpp src/hel/Vector3d.cpp \
 	test/hel/Matrix.cpp -o $(BUILD_TEST_DIR)/Matrix.test
 	@-echo "================================================="
@@ -331,7 +333,7 @@ Matrix.test:
 Quaternion.test:
 	@-echo "Building Quaternion unit test"
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) -Wall -g -DUNIT_TEST_QUATERNION -lm -lstdc++ -Iinclude \
+	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
 	src/hel/Quaternion.cpp test/hel/Quaternion.cpp -o $(BUILD_TEST_DIR)/Quaternion.test
 	@-echo "================================================="
 	@-echo "Running Quaternion unit test"
@@ -340,7 +342,7 @@ Quaternion.test:
 Math.test:
 	@-echo "Building Math unit test"
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) -Wall -g -DMATH_UNIT_TEST -lm -lstdc++ -Iinclude \
+	$(CC) -Wall -g -lm -lstdc++ -Iinclude \
 	src/hel/math.cpp src/hel/Vector3d.cpp test/hel/math.cpp -o $(BUILD_TEST_DIR)/Math.test
 	@-echo "================================================="
 	@-echo "Running hel unit test"
@@ -358,8 +360,8 @@ Memory.test:
 
 Network.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(TEST_FLAGS) -DUNIT_TEST_NETWORK \
-	src/Network.cpp -o $(BUILD_TEST_DIR)/Network.test
+	$(CC) $(TEST_FLAGS) \
+	src/Network.cpp test/Network.cpp -o $(BUILD_TEST_DIR)/Network.test
 
 #################################################################
 

include/memory_test.h

@@ -45,67 +45,56 @@ void operator delete [](void *p);
 #define delete DEBUG_DELETE
 
 
-	void delete_check(const char *file, int line, int print);
-
-	void display_memory_usage();
-
-	long memory_used();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Returns amount of total memory used
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2002.03.27:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	void dump_memory_report();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Dumps raw Tree holding memory accounting
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2002.03.27:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
+void delete_check(const char *file, int line, int print);
+
+void display_memory_usage();
+
+long memory_used();
+/*------------------------------------------------------
+ * Pre  :
+ * Post : Returns amount of total memory used
+ *
+ *-- History ------------------------------------------
+ *
+ * 2002.03.27:
+ * Mongoose - Created
+ ------------------------------------------------------*/
+
+void dump_memory_report();
+/*------------------------------------------------------
+ * Pre  :
+ * Post : Dumps raw Tree holding memory accounting
+ *
+ *-- History ------------------------------------------
+ *
+ * 2002.03.27:
+ * Mongoose - Created
+ ------------------------------------------------------*/
 
 #ifdef DEBUG_MEMORY
 
-    #define DWORD unsigned long
-    #define ZERO_ALLOC_SLOTS 3
-
-    typedef enum { RB_BLACK = 0, RB_RED = 1 } rbtree_color_t;
-
-    typedef struct rbtree_s {
-        void *data;
-        DWORD key;
-        rbtree_color_t color;
-        struct rbtree_s *left;
-        struct rbtree_s *right;
-        struct rbtree_s *parent;
-    } rbtree_t;
-
-    typedef struct meminfo_filename_s {
-        char *filename;
-        char filename_len;
-        DWORD size;
-        unsigned int alloc_zero;
-        unsigned short int alloc_zero_at_line[ZERO_ALLOC_SLOTS];
-        struct meminfo_filename_s *next;
-    } meminfo_filename_t;
-
-    extern rbtree_t *MEMORY_INFO;
-    extern meminfo_filename_t *MEMORY_FILENAME;
-    extern long MEMORY_USED;
-    extern long MEMORYA_USED;
-    extern long MEMORYC_USED;
-    extern long MAX_MEMORY_USED;
-    extern long MAX_MEMORYA_USED;
-    extern long MAX_MEMORYC_USED;
-
-    void tree_valid_report(rbtree_t *root);
+#define DWORD unsigned long
+#define ZERO_ALLOC_SLOTS 3
+
+typedef enum { RB_BLACK = 0, RB_RED = 1 } rbtree_color_t;
+
+typedef struct rbtree_s {
+    void *data;
+    DWORD key;
+    rbtree_color_t color;
+    struct rbtree_s *left;
+    struct rbtree_s *right;
+    struct rbtree_s *parent;
+} rbtree_t;
+
+typedef struct meminfo_filename_s {
+    char *filename;
+    char filename_len;
+    DWORD size;
+    unsigned int alloc_zero;
+    unsigned short int alloc_zero_at_line[ZERO_ALLOC_SLOTS];
+    struct meminfo_filename_s *next;
+} meminfo_filename_t;
 
 #endif
 

src/Network.cpp

@@ -701,91 +701,3 @@ void Network::runClient()
 // Private Mutators
 ////////////////////////////////////////////////////////////
 
-
-
-////////////////////////////////////////////////////////////
-// Unit Test code
-////////////////////////////////////////////////////////////
-
-#ifdef UNIT_TEST_NETWORK
-void from_network_layer(network_packet_t *p, unsigned int *last_id)
-{
-	static unsigned int i = 0;
-
-
-	if (!p)
-	{
-		return;
-	}
-
-	*last_id = i++;
-
-	sleep(1);
-
-	p->send = 1;
-	p->pos[0] = i*3;
-	p->pos[1] = i*3+1;
-	p->pos[2] = i*3+2;
-
-	printf("<S>ending { %f %f %f }\n", p->pos[0], p->pos[1], p->pos[2]);
-}
-
-
-void to_network_layer(network_packet_t p)
-{
-	printf("<R>ecieved { %f %f %f }\n", p.pos[0], p.pos[1], p.pos[2]);
-
-	gPiggyBack.data.pos[0] = gPiggyBack.seq*4;
-	gPiggyBack.data.pos[1] = gPiggyBack.seq*4+1;
-	gPiggyBack.data.pos[2] = gPiggyBack.seq*4+2;
-	gPiggyBack.data.send = 1;
-	gPiggyBack.data.yaw = 90.0f;
-}
-
-
-int main(int argc, char *argv[])
-{
-	printf("\n\n[Network class test]\n");
-	Network &test = *Network::Instance();
-
-
-	if (argc > 3)
-	{
-		if (argv[1][1] == 'v')
-		{
-			test.setDebug(true);
-		}
-
-		switch (argv[1][0])
-		{
-		case 'c':
-			test.setRemoteHost(argv[2]);
-			test.setPort(atoi(argv[3]));
-			test.runClient();
-			break;
-		case 's':
-			test.setBindHost(argv[2]);
-			test.setPort(atoi(argv[3]));
-			test.runServer();
-			break;
-		default:
-			printf("Error in command line, run %s for help\n", argv[0]);
-		}
-	}
-	else if (argc > 2)
-	{
-		test.setPort(atoi(argv[2]));
-		test.runServer();
-	}
-	else
-	{
-		printf("Server: %s s [bind_host_name] port\n", argv[0]);
-		printf("Client: %s c remote_host_name remote_host_port\n", argv[0]);
-		printf("Append 'v' behind c/s option for verbose. eg cv\n");
-	}
-
-	killNetworkSingleton();
-
-	return 0;
-}
-#endif

src/TombRaider.cpp

@@ -6274,565 +6274,3 @@ void TombRaider::printDebug(const char *methodName, const char *s, ...)
 // Private Mutators
 ////////////////////////////////////////////////////////////
 
-
-
-////////////////////////////////////////////////////////////
-// Unit Test code
-////////////////////////////////////////////////////////////
-#ifdef __TOMBRAIDER_TEST__
-
-void dump_textures(TombRaider *tr, char *mapname)
-{
-#ifdef __TEST_TR5_DUMP_TGA
-	int i;
-	unsigned char *image;
-	unsigned char *bumpmap;
-	char buffer[128];
-	FILE *f;
-
-
-	if (!tr || !mapname)
-		return;
-
-	// Dump textures
-	printf("\n\t[Texture dumping for '%s']\n", mapname);
-
-	for (i = 0; i < tr->NumTextures(); i++)
-   {
-		tr->Texture(i, &image, &bumpmap);
-
-		if (image)
-		{
-			snprintf(buffer, 128, "%s-%03i-texture.tga", mapname, i);
-
-			f = fopen(buffer, "wb");
-
-			if (f)
-			{
-				if (!mtk_image__tga_save(f, image, 256, 256, 4))
-					printf("\tWrote texture %s\n", buffer);
-
-				fclose(f);
-			}
-
-			snprintf(buffer, 128, "%s.lst", mapname);
-
-			f = fopen(buffer, "a");
-
-			if (f)
-			{
-				fprintf(f, "%s-%03i-texture.tga;\n", mapname, i);
-				fclose(f);
-			}
-
-			delete [] image;
-		}
-
-		if (bumpmap)
-		{
-			snprintf(buffer, 64, "%s-%03i-bumpmap.tga", mapname, i);
-
-			f = fopen(buffer, "wb");
-
-			if (f)
-			{
-				if (!mtk_image__tga_save(f, bumpmap, 256, 256, 4))
-					printf("\tWrote texture %s\n", buffer);
-
-				fclose(f);
-			}
-
-			delete [] bumpmap;
-		}
-	}
-
-	for (i = 0; i < tr->NumSpecialTextures(); i++)
-   {
-		image = tr->SpecialTexTile(i);
-
-		snprintf(buffer, 128, "%s-%03i-special.tga", mapname, i);
-
-		f = fopen(buffer, "wb");
-
-		if (f)
-		{
-			if (!mtk_image__tga_save(f, image, 256, 256, 4))
-				printf("\tWrote texture %s\n", buffer);
-
-			fclose(f);
-		}
-		else
-		{
-			printf("\tFailed to write texture %s\n", buffer);
-		}
-
-		delete [] image;
-	}
-#else
-	printf("Texture dumping not in this build\n");
-#endif
-}
-
-
-void dump_mesh(TombRaider *tr, char *mapname, int index)
-{
-	tr2_object_texture_t *object_texture = NULL;
-	tr2_mesh_t *meshes = NULL;
-	unsigned int v, check;
-   int i, triangles, rectangles, t_index;
-	char buffer[128];
-	float rgba[4];
-	float s, t;
-	char id[8];
-	FILE *f;
-
-
-	if (!mapname || !tr)
-	{
-		return;
-	}
-
-	snprintf(buffer, 128, "%s-%03i.mesh", mapname, index);
-
-	object_texture = tr->ObjectTextures();
-	meshes = tr->Mesh();
-
-
-	f = fopen(buffer, "wb");
-
-	if (!f)
-	{
-		perror("Failed to write mesh :");
-		return;
-	}
-
-	// Setup header id and check points
-	strncpy(id, "TRMESH", 7);
-	id[7] = 0;
-	check = 0xcdcdcdcd;
-
-
-	fwrite(id, 8, 1, f);
-	fwrite(&meshes[index].num_vertices, 2, 1, f);
-	fwrite(&meshes[index].num_textured_triangles, 2, 1, f);
-	fwrite(&meshes[index].num_textured_rectangles, 2, 1, f);
-	fwrite(&meshes[index].num_coloured_triangles, 2, 1, f);
-	fwrite(&meshes[index].num_coloured_rectangles, 2, 1, f);
-	fwrite(&meshes[index].collision_size, 4, 1, f);
-
-
-   // Textured triangles ////////////////////////
-	fwrite(&check, 4, 1, f);
-	triangles = meshes[index].num_textured_triangles;
-
-	for (i = 0; triangles > 0 && i < triangles; i++)
-   {
-		t_index = meshes[index].textured_triangles[i].texture;
-
-		// Store texture info
-		fwrite(&object_texture[t_index].tile, 2, 1, f);
-		fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
-
-		// Store vertices
-		v = meshes[index].textured_triangles[i].vertices[0];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].textured_triangles[i].vertices[1];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].textured_triangles[i].vertices[2];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		// Store texels
-		s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
-								  object_texture[t_index].vertices[0].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
-								  object_texture[t_index].vertices[0].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-
-		s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
-								  object_texture[t_index].vertices[1].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
-								  object_texture[t_index].vertices[1].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-		s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
-								  object_texture[t_index].vertices[2].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
-								  object_texture[t_index].vertices[2].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-	}
-
-	fwrite(&check, 4, 1, f);
-
-
-   // Textured rectangles ////////////////////////
-	fwrite(&check, 4, 1, f);
-	rectangles = meshes[index].num_textured_rectangles;
-
-	for (i = 0; rectangles > 0 && i < rectangles; i++)
-   {
-		t_index = meshes[index].textured_rectangles[i].texture;
-
-		// Store texture info
-		fwrite(&object_texture[t_index].tile, 2, 1, f);
-		fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
-
-		// Store vertices
-		v = meshes[index].textured_rectangles[i].vertices[0];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].textured_rectangles[i].vertices[1];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].textured_rectangles[i].vertices[2];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].textured_rectangles[i].vertices[3];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		// Store texels
-		s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
-								  object_texture[t_index].vertices[0].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
-								  object_texture[t_index].vertices[0].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-
-		s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
-								  object_texture[t_index].vertices[1].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
-								  object_texture[t_index].vertices[1].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-		s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
-								  object_texture[t_index].vertices[2].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
-								  object_texture[t_index].vertices[2].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-		s = tr->adjustTexel(object_texture[t_index].vertices[3].xpixel,
-								  object_texture[t_index].vertices[3].xcoordinate);
-		t = tr->adjustTexel(object_texture[t_index].vertices[3].ypixel,
-								  object_texture[t_index].vertices[3].ycoordinate);
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-	}
-
-	fwrite(&check, 4, 1, f);
-
-   // Coloured triangles ////////////////////////
-	fwrite(&check, 4, 1, f);
-	triangles = meshes[index].num_coloured_triangles;
-
-	for (i = 0; triangles > 0 && i < triangles; i++)
-   {
-		// Store vertices
-		v = meshes[index].coloured_triangles[i].vertices[0];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].coloured_triangles[i].vertices[1];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].coloured_triangles[i].vertices[2];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		// Store color
-		switch (tr->Engine())
-		{
-		case TR_VERSION_1:
-			tr->getColor(meshes[index].coloured_triangles[i].texture
-								 & 0xff, rgba);
-			break;
-		default:
-			tr->getColor((meshes[index].coloured_triangles[i].texture>>8)
-								 & 0xff, rgba);
-		}
-
-		s = rgba[0];
-		t = rgba[1];
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-		s = rgba[2];
-		t = rgba[3];
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-	}
-
-	fwrite(&check, 4, 1, f);
-
-   // Coloured rectangles ////////////////////////
-	fwrite(&check, 4, 1, f);
-	rectangles = meshes[index].num_coloured_rectangles;
-
-	for (i = 0; rectangles > 0 && i < rectangles; i++)
-   {
-		// Store vertices
-		v = meshes[index].coloured_rectangles[i].vertices[0];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].coloured_rectangles[i].vertices[1];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].coloured_rectangles[i].vertices[2];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		v = meshes[index].coloured_rectangles[i].vertices[3];
-		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-		// Store color
-		switch (tr->Engine())
-		{
-		case TR_VERSION_1:
-			tr->getColor(meshes[index].coloured_rectangles[i].texture
-								 & 0xff, rgba);
-			break;
-		default:
-			tr->getColor((meshes[index].coloured_rectangles[i].texture>>8)
-								 & 0xff, rgba);
-		}
-
-		s = rgba[0];
-		t = rgba[1];
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-
-		s = rgba[2];
-		t = rgba[3];
-		fwrite(&s, 4, 1, f);
-		fwrite(&t, 4, 1, f);
-	}
-
-	fwrite(&check, 4, 1, f);
-	fclose(f);
-
-	printf(".");
-	fflush(stdout);
-}
-
-
-void dump_lara_stuff(char *mapname, TombRaider &tr)
-{
-	unsigned int i, j, k, n;
-	tr2_moveable_t *moveable = tr.Moveable();
-	unsigned int numMoveables = tr.NumMoveables();
-	char filename[64];
-	unsigned char *riff;
-	unsigned int riffSz, total = 0;
-	FILE *f;
-
-
-	snprintf(filename, 63, "%s-lara.nfo", mapname);
-	f = fopen(filename, "w");
-
-	if (!f)
-	{
-		perror("Failed to write lara.nfo: ");
-		return;
-	}
-
-	for (i = 0; i < numMoveables; ++i)
-	{
-		j = n = 0;
-
-		if (moveable[i].object_id == 0)
-		{
-			j = moveable[i].starting_mesh;
-			n = moveable[i].num_meshes + j;
-
-			fprintf(f, "Lara (%i)\n", i);
-		}
-		else if (moveable[i].object_id == 30)
-		{
-			j = moveable[i].starting_mesh;
-			n = moveable[i].num_meshes + j;
-
-			fprintf(f, "Lara ponytail\n");
-		}
-		else if (tr.Engine() == TR_VERSION_4)
-		{
-			switch (moveable[i].object_id)
-			{
-			case 8: // Joints, ( interconnecting skin/ploys )
-			case 9:
-				fprintf(f, "TR4 lara joints (%i)\n", i);
-				j = moveable[i].starting_mesh;
-				n = moveable[i].num_meshes + j;
-			}
-		}
-
-		for (k = j; j < n; ++j)
-		{
-			fprintf(f, "\tMesh[%i] = %i\n", (j - k), j);
-		}
-	}
-
-	fclose(f);
-
-	printf("\nDumping %i audio samples: ", tr.getSoundSamplesCount());
-
-	for (i = 0, j = 0; i < tr.getSoundSamplesCount(); ++i)
-	{
-		tr.getSoundSample(i, &riffSz, &riff);
-
-		total += riffSz;
-
-		snprintf(filename, 63, "%s-%03i.wav", mapname, j++);
-		f = fopen(filename, "wb");
-
-		if (!f)
-		{
-			perror("Failed to write riff.wav: ");
-			continue;
-		}
-
-		fwrite(riff, 1, riffSz, f);
-		fclose(f);
-
-		delete [] riff;
-
-		printf(".");
-		fflush(stdout);
-	}
-
-	printf("\n");
-
-	if (total)
-	{
-		printf("Dumped %ibytes (%.2f MB) of audio samples\n",
-				 total, (float)total/1024000.0);
-	}
-}
-
-
-void percent_callback(int p)
-{
-	printf("Level %i%% loaded\n", p);
-}
-
-
-int test_main(int argc, char *argv[])
-{
-  TombRaider tr;
-  char mapname[128];
-  int len, i, j;
-
-
-  printf("[TombRaider class test]\n");
-
-  tr.setDebug(true);
-
-  if (argc > 2)
-  {
-	  // Strip for mapname //////////////////////////////
-	  len = strlen(argv[2]);
-
-	  for (i = len, j = 0; i > 0; i--, j++)
-		  if (argv[2][i] == '/' || argv[2][i] == '\\')
-			  break;
-
-	  j--;
-
-	  memset(mapname, 0, 128);
-
-	  for (i = 0; i < len - j && i < 30; i++)
-		  mapname[i] = argv[2][i + len - j];
-
-	  ////////////////////////////////////////////////////
-
-
-    if (strncmp(argv[1], "load", 4) == 0)
-    {
-      if (!tr.Load(argv[2], percent_callback))
-		{
-        printf("\nmain: Load reports success.\n");
-		}
-    }
-    else if (strncmp(argv[1], "dump", 4) == 0)
-    {
-      if (!tr.Load(argv[2], percent_callback))
-		{
-        printf("\nmain: Load reports success.\n");
-
-		  dump_textures(&tr, mapname);
-
-		  printf("Mesh dumping: ");
-		  for (i = 0; i < tr.getMeshCount(); i++)
-		  {
-			  dump_mesh(&tr, mapname, i);
-		  }
-
-		  if (argc > 3)
-		  {
-			  printf("\nLoading external sound SFX.\n");
-			  tr.loadSFX(argv[3]);
-		  }
-
-		  dump_lara_stuff(mapname, tr);
-
-		  printf("\n");
-		}
-		else
-		{
-			printf("\nmain: Load failed.\n");
-		}
-    }
-    else
-      printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
-  }
-  else
-  {
-    printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
-  }
-
-  return 0;
-}
-
-
-int main(int argc, char *argv[])
-{
-	test_main(argc, argv);
-
-#ifdef DEBUG_MEMORY
-  dump_memory_report();
-#endif
-
-  return 0;
-}
-#endif

src/memory_test.cpp

@@ -29,7 +29,7 @@
 #define USE_ITERATIVE_TREE_INSERT
 
 
-bool tree_check(rbtree_t *tree, char *file, int line)
+bool tree_check(rbtree_t *tree, const char *file, int line)
 {
 	bool ret = true;
 
@@ -456,7 +456,7 @@ int tree_print(rbtree_t *tree, void (*print_func)(void *))
 
 	if (!tree->parent)
 	{
-		printf("\n%i nodes, %u bytes each : %i bytes\n",
+		printf("\n%i nodes, %lu bytes each : %lu bytes\n",
 				 i, sizeof(rbtree_t), i * sizeof(rbtree_t));
 	}
 
@@ -904,7 +904,7 @@ void dump_memory_report()
 	printf("============================================================\n");
 	printf("Memory tracking table:\n");
 	i = tree_print(MEMORY_INFO, (void (*)(void *))&__print_meminfo);
-	printf("%i records, %u bytes each : %i bytes\n",
+	printf("%i records, %lu bytes each : %lu bytes\n",
 			 i, sizeof(meminfo_t), i * sizeof(meminfo_t));
 	display_memory_usage();
 	printf("============================================================\n\n");

test/GLString.cpp

@@ -128,20 +128,19 @@ void init_gl(unsigned int width, unsigned int height,
 		{
 			if (j < 4)
 			{
-				id[j++] = gTexture.loadTGA(argv[i]);
+				id[j] = gTexture.loadTGA(argv[i]);
 			}
 		}
 	}
 	else
 	{
-		id[0] = gTexture.loadTGA("data/font-0.tga");
-		id[1] = gTexture.loadTGA("data/font-0.tga");
-		id[2] = gTexture.loadTGA("data/font-0.tga");
-		id[3] = gTexture.loadTGA("data/font-0.tga");
+		// id[0] = gTexture.loadTGA("data/font-0.tga");
+		// id[1] = gTexture.loadTGA("data/font-1.tga");
+		// id[2] = gTexture.loadTGA("data/font-2.tga");
+		// id[3] = gTexture.loadTGA("data/font-3.tga");
+        id[0] = id[1] = id[2] = id[3] = gTexture.loadTGA("data/font-0.tga");
 	}
 
-	printf("%i %i %i %i\n", id[0], id[1], id[2], id[3]);
-
 	TEXT->Init(4, 4, id);
 	i = TEXT->glPrintf((width/2)-12*5, height/2, 0,
 							 "[font %i] GLString Test", id[0]);
@@ -150,9 +149,8 @@ void init_gl(unsigned int width, unsigned int height,
 		printf("TEXT->glPrintf> ERROR code %i ( 0 means no error )\n", i);
 	}
 
-	i = TEXT->glPrintf((width/2)-10*7, height/2+32, 1,
+	i = TEXT->glPrintf((width/2)-12*5, height/2+32, 1,
 							 "[font %i] GLString Test", id[1]);
-
 	if (i)
 	{
 		printf("TEXT->glPrintf> ERROR code %i ( 0 means no error )\n", i);
@@ -162,15 +160,14 @@ void init_gl(unsigned int width, unsigned int height,
 	TEXT->Scale(s);
 
 	i = TEXT->glPrintf((width/2)-10*7, height/2+64, 1,
-							 "[font %i] Scaled by %.3f", id[1], s);
-
+							 "[font %i] Scaled by %.1f", id[2], s);
 	if (i)
 	{
 		printf("TEXT->glPrintf> ERROR code %i ( 0 means no error )\n", i);
 	}
-	i = TEXT->glPrintf((width/2)-10*7, height/2-32, 0,
-							 "[font %i] Scaled by %.3f", id[0], s);
 
+	i = TEXT->glPrintf((width/2)-10*7, height/2-32, 0,
+							 "[font %i] Scaled by %.1f", id[3], s);
 	if (i)
 	{
 		printf("TEXT->glPrintf> ERROR code %i ( 0 means no error )\n", i);
@@ -184,9 +181,11 @@ int main_gl(int argc, char *argv[])
   unsigned int mkeys, mod, key;
   int flags;
   unsigned int width = 640;
-  unsigned int height = 460;
+  unsigned int height = 480;
   bool fullscreen = false;
+#ifndef __APPLE__
   char *driver = NULL;
+#endif
 
 
   // Setup clean up on exit

test/Network.cpp

@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
+/*================================================================
+ *
+ * Project : UnRaider
+ * Author  : Terry 'Mongoose' Hendrix II
+ * Website : http://www.westga.edu/~stu7440/
+ * Email   : stu7440@westga.edu
+ * Object  : Network
+ * License : No use w/o permission (C) 2002 Mongoose
+ * Comments:
+ *
+ *
+ *           This file was generated using Mongoose's C++
+ *           template generator script.  <stu7440@westga.edu>
+ *
+ *-- History -------------------------------------------------
+ *
+ * 2002.06.21:
+ * Mongoose - Created
+ =================================================================*/
+
+#include <Network.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+extern network_frame_t gPiggyBack;
+
+void from_network_layer(network_packet_t *p, unsigned int *last_id)
+{
+	static unsigned int i = 0;
+
+
+	if (!p)
+	{
+		return;
+	}
+
+	*last_id = i++;
+
+	sleep(1);
+
+	p->send = 1;
+	p->pos[0] = i*3;
+	p->pos[1] = i*3+1;
+	p->pos[2] = i*3+2;
+
+	printf("<S>ending { %f %f %f }\n", p->pos[0], p->pos[1], p->pos[2]);
+}
+
+
+void to_network_layer(network_packet_t p)
+{
+	printf("<R>ecieved { %f %f %f }\n", p.pos[0], p.pos[1], p.pos[2]);
+
+	gPiggyBack.data.pos[0] = gPiggyBack.seq*4;
+	gPiggyBack.data.pos[1] = gPiggyBack.seq*4+1;
+	gPiggyBack.data.pos[2] = gPiggyBack.seq*4+2;
+	gPiggyBack.data.send = 1;
+	gPiggyBack.data.yaw = 90.0f;
+}
+
+
+int main(int argc, char *argv[])
+{
+	printf("\n\n[Network class test]\n");
+	Network &test = *Network::Instance();
+
+
+	if (argc > 3)
+	{
+		if (argv[1][1] == 'v')
+		{
+			test.setDebug(true);
+		}
+
+		switch (argv[1][0])
+		{
+		case 'c':
+			test.setRemoteHost(argv[2]);
+			test.setPort(atoi(argv[3]));
+			test.runClient();
+			break;
+		case 's':
+			test.setBindHost(argv[2]);
+			test.setPort(atoi(argv[3]));
+			test.runServer();
+			break;
+		default:
+			printf("Error in command line, run %s for help\n", argv[0]);
+		}
+	}
+	else if (argc > 2)
+	{
+		test.setPort(atoi(argv[2]));
+		test.runServer();
+	}
+	else
+	{
+		printf("Server: %s s [bind_host_name] port\n", argv[0]);
+		printf("Client: %s c remote_host_name remote_host_port\n", argv[0]);
+		printf("Append 'v' behind c/s option for verbose. eg cv\n");
+	}
+
+	killNetworkSingleton();
+
+	return 0;
+}
+

test/TombRaider.cpp

@@ -0,0 +1,618 @@
+/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
+/*================================================================
+ *
+ * Project : OpenRaider
+ * Author  : Mongoose
+ * Website : http://www.westga.edu/~stu7440/
+ * Email   : stu7440@westga.edu
+ * Object  : OpenRaider
+ * License : No use w/o permission (C) 2001 Mongoose
+ * Comments: Loads TR 1, 2, 3, and 4 maps, meshes, and textures
+ *
+ *           This file was generated using Mongoose's C++
+ *           template generator script.  <stu7440@westga.edu>
+ *
+ *-- History ------------------------------------------------
+ *
+ * 2003.05.13:
+ * Mongoose - New API, maintance cost was becoming so high
+ *            it was needed to sort out methods in groups
+ *            like my newer source code -- of course some
+ *            methods were altered or removed ( clean up )
+ *
+ * 2001.06.19:
+ * Mongoose - New texture API for the new TR4/TR5 bump map
+ *            support, also purged textile exposure
+ *
+ * 2001.05.21:
+ * Mongoose - Added to project OpenRaider, more documentation
+ *            than Freyja version I wrote ( 3d modeler )
+ *
+ *
+ * 2000-05-13:
+ * Mongoose - Added gcc and VC++ pragmas for packing
+ *
+ *            id style typedefs for structs
+ *
+ *            Heavy clean up and ported to C++
+ *
+ *            I saved yuri's notes as best I could and
+ *            reformatted and corected as needed
+ *
+ * Mongoose - Created, based on:
+ *                tr_view's tr2io.c by Yuri Zhivago, PhD,
+ *                TR Rosetta Stone ( TombRaider pak format specs )
+ ================================================================*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include <TombRaider.h>
+
+#ifdef __TEST_TR5_DUMP_TGA
+#include <mtk_tga.h>
+#endif
+
+#ifdef DEBUG_MEMORY
+#include <memory_test.h>
+#endif
+
+
+void dump_textures(TombRaider *tr, char *mapname)
+{
+#ifdef __TEST_TR5_DUMP_TGA
+	int i;
+	unsigned char *image;
+	unsigned char *bumpmap;
+	char buffer[128];
+	FILE *f;
+
+
+	if (!tr || !mapname)
+		return;
+
+	// Dump textures
+	printf("\n\t[Texture dumping for '%s']\n", mapname);
+
+	for (i = 0; i < tr->NumTextures(); i++)
+   {
+		tr->Texture(i, &image, &bumpmap);
+
+		if (image)
+		{
+			snprintf(buffer, 128, "%s-%03i-texture.tga", mapname, i);
+
+			f = fopen(buffer, "wb");
+
+			if (f)
+			{
+				if (!mtk_image__tga_save(f, image, 256, 256, 4))
+					printf("\tWrote texture %s\n", buffer);
+
+				fclose(f);
+			}
+
+			snprintf(buffer, 128, "%s.lst", mapname);
+
+			f = fopen(buffer, "a");
+
+			if (f)
+			{
+				fprintf(f, "%s-%03i-texture.tga;\n", mapname, i);
+				fclose(f);
+			}
+
+			delete [] image;
+		}
+
+		if (bumpmap)
+		{
+			snprintf(buffer, 64, "%s-%03i-bumpmap.tga", mapname, i);
+
+			f = fopen(buffer, "wb");
+
+			if (f)
+			{
+				if (!mtk_image__tga_save(f, bumpmap, 256, 256, 4))
+					printf("\tWrote texture %s\n", buffer);
+
+				fclose(f);
+			}
+
+			delete [] bumpmap;
+		}
+	}
+
+	for (i = 0; i < tr->NumSpecialTextures(); i++)
+   {
+		image = tr->SpecialTexTile(i);
+
+		snprintf(buffer, 128, "%s-%03i-special.tga", mapname, i);
+
+		f = fopen(buffer, "wb");
+
+		if (f)
+		{
+			if (!mtk_image__tga_save(f, image, 256, 256, 4))
+				printf("\tWrote texture %s\n", buffer);
+
+			fclose(f);
+		}
+		else
+		{
+			printf("\tFailed to write texture %s\n", buffer);
+		}
+
+		delete [] image;
+	}
+#else
+	printf("Texture dumping not in this build\n");
+#endif
+}
+
+
+void dump_mesh(TombRaider *tr, char *mapname, int index)
+{
+	tr2_object_texture_t *object_texture = NULL;
+	tr2_mesh_t *meshes = NULL;
+	unsigned int v, check;
+   int i, triangles, rectangles, t_index;
+	char buffer[128];
+	float rgba[4];
+	float s, t;
+	char id[8];
+	FILE *f;
+
+
+	if (!mapname || !tr)
+	{
+		return;
+	}
+
+	snprintf(buffer, 128, "%s-%03i.mesh", mapname, index);
+
+	object_texture = tr->ObjectTextures();
+	meshes = tr->Mesh();
+
+
+	f = fopen(buffer, "wb");
+
+	if (!f)
+	{
+		perror("Failed to write mesh :");
+		return;
+	}
+
+	// Setup header id and check points
+	strncpy(id, "TRMESH", 7);
+	id[7] = 0;
+	check = 0xcdcdcdcd;
+
+
+	fwrite(id, 8, 1, f);
+	fwrite(&meshes[index].num_vertices, 2, 1, f);
+	fwrite(&meshes[index].num_textured_triangles, 2, 1, f);
+	fwrite(&meshes[index].num_textured_rectangles, 2, 1, f);
+	fwrite(&meshes[index].num_coloured_triangles, 2, 1, f);
+	fwrite(&meshes[index].num_coloured_rectangles, 2, 1, f);
+	fwrite(&meshes[index].collision_size, 4, 1, f);
+
+
+   // Textured triangles ////////////////////////
+	fwrite(&check, 4, 1, f);
+	triangles = meshes[index].num_textured_triangles;
+
+	for (i = 0; triangles > 0 && i < triangles; i++)
+   {
+		t_index = meshes[index].textured_triangles[i].texture;
+
+		// Store texture info
+		fwrite(&object_texture[t_index].tile, 2, 1, f);
+		fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
+
+		// Store vertices
+		v = meshes[index].textured_triangles[i].vertices[0];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].textured_triangles[i].vertices[1];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].textured_triangles[i].vertices[2];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		// Store texels
+		s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
+								  object_texture[t_index].vertices[0].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
+								  object_texture[t_index].vertices[0].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+
+		s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
+								  object_texture[t_index].vertices[1].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
+								  object_texture[t_index].vertices[1].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+		s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
+								  object_texture[t_index].vertices[2].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
+								  object_texture[t_index].vertices[2].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+	}
+
+	fwrite(&check, 4, 1, f);
+
+
+   // Textured rectangles ////////////////////////
+	fwrite(&check, 4, 1, f);
+	rectangles = meshes[index].num_textured_rectangles;
+
+	for (i = 0; rectangles > 0 && i < rectangles; i++)
+   {
+		t_index = meshes[index].textured_rectangles[i].texture;
+
+		// Store texture info
+		fwrite(&object_texture[t_index].tile, 2, 1, f);
+		fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
+
+		// Store vertices
+		v = meshes[index].textured_rectangles[i].vertices[0];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].textured_rectangles[i].vertices[1];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].textured_rectangles[i].vertices[2];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].textured_rectangles[i].vertices[3];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		// Store texels
+		s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
+								  object_texture[t_index].vertices[0].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
+								  object_texture[t_index].vertices[0].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+
+		s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
+								  object_texture[t_index].vertices[1].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
+								  object_texture[t_index].vertices[1].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+		s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
+								  object_texture[t_index].vertices[2].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
+								  object_texture[t_index].vertices[2].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+		s = tr->adjustTexel(object_texture[t_index].vertices[3].xpixel,
+								  object_texture[t_index].vertices[3].xcoordinate);
+		t = tr->adjustTexel(object_texture[t_index].vertices[3].ypixel,
+								  object_texture[t_index].vertices[3].ycoordinate);
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+	}
+
+	fwrite(&check, 4, 1, f);
+
+   // Coloured triangles ////////////////////////
+	fwrite(&check, 4, 1, f);
+	triangles = meshes[index].num_coloured_triangles;
+
+	for (i = 0; triangles > 0 && i < triangles; i++)
+   {
+		// Store vertices
+		v = meshes[index].coloured_triangles[i].vertices[0];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].coloured_triangles[i].vertices[1];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].coloured_triangles[i].vertices[2];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		// Store color
+		switch (tr->Engine())
+		{
+		case TR_VERSION_1:
+			tr->getColor(meshes[index].coloured_triangles[i].texture
+								 & 0xff, rgba);
+			break;
+		default:
+			tr->getColor((meshes[index].coloured_triangles[i].texture>>8)
+								 & 0xff, rgba);
+		}
+
+		s = rgba[0];
+		t = rgba[1];
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+		s = rgba[2];
+		t = rgba[3];
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+	}
+
+	fwrite(&check, 4, 1, f);
+
+   // Coloured rectangles ////////////////////////
+	fwrite(&check, 4, 1, f);
+	rectangles = meshes[index].num_coloured_rectangles;
+
+	for (i = 0; rectangles > 0 && i < rectangles; i++)
+   {
+		// Store vertices
+		v = meshes[index].coloured_rectangles[i].vertices[0];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].coloured_rectangles[i].vertices[1];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].coloured_rectangles[i].vertices[2];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		v = meshes[index].coloured_rectangles[i].vertices[3];
+		fwrite(&meshes[index].vertices[v].x, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].y, 2, 1, f);
+		fwrite(&meshes[index].vertices[v].z, 2, 1, f);
+
+		// Store color
+		switch (tr->Engine())
+		{
+		case TR_VERSION_1:
+			tr->getColor(meshes[index].coloured_rectangles[i].texture
+								 & 0xff, rgba);
+			break;
+		default:
+			tr->getColor((meshes[index].coloured_rectangles[i].texture>>8)
+								 & 0xff, rgba);
+		}
+
+		s = rgba[0];
+		t = rgba[1];
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+
+		s = rgba[2];
+		t = rgba[3];
+		fwrite(&s, 4, 1, f);
+		fwrite(&t, 4, 1, f);
+	}
+
+	fwrite(&check, 4, 1, f);
+	fclose(f);
+
+	printf(".");
+	fflush(stdout);
+}
+
+
+void dump_lara_stuff(char *mapname, TombRaider &tr)
+{
+	unsigned int i, j, k, n;
+	tr2_moveable_t *moveable = tr.Moveable();
+	unsigned int numMoveables = tr.NumMoveables();
+	char filename[64];
+	unsigned char *riff;
+	unsigned int riffSz, total = 0;
+	FILE *f;
+
+
+	snprintf(filename, 63, "%s-lara.nfo", mapname);
+	f = fopen(filename, "w");
+
+	if (!f)
+	{
+		perror("Failed to write lara.nfo: ");
+		return;
+	}
+
+	for (i = 0; i < numMoveables; ++i)
+	{
+		j = n = 0;
+
+		if (moveable[i].object_id == 0)
+		{
+			j = moveable[i].starting_mesh;
+			n = moveable[i].num_meshes + j;
+
+			fprintf(f, "Lara (%i)\n", i);
+		}
+		else if (moveable[i].object_id == 30)
+		{
+			j = moveable[i].starting_mesh;
+			n = moveable[i].num_meshes + j;
+
+			fprintf(f, "Lara ponytail\n");
+		}
+		else if (tr.Engine() == TR_VERSION_4)
+		{
+			switch (moveable[i].object_id)
+			{
+			case 8: // Joints, ( interconnecting skin/ploys )
+			case 9:
+				fprintf(f, "TR4 lara joints (%i)\n", i);
+				j = moveable[i].starting_mesh;
+				n = moveable[i].num_meshes + j;
+			}
+		}
+
+		for (k = j; j < n; ++j)
+		{
+			fprintf(f, "\tMesh[%i] = %i\n", (j - k), j);
+		}
+	}
+
+	fclose(f);
+
+	printf("\nDumping %i audio samples: ", tr.getSoundSamplesCount());
+
+	for (i = 0, j = 0; i < tr.getSoundSamplesCount(); ++i)
+	{
+		tr.getSoundSample(i, &riffSz, &riff);
+
+		total += riffSz;
+
+		snprintf(filename, 63, "%s-%03i.wav", mapname, j++);
+		f = fopen(filename, "wb");
+
+		if (!f)
+		{
+			perror("Failed to write riff.wav: ");
+			continue;
+		}
+
+		fwrite(riff, 1, riffSz, f);
+		fclose(f);
+
+		delete [] riff;
+
+		printf(".");
+		fflush(stdout);
+	}
+
+	printf("\n");
+
+	if (total)
+	{
+		printf("Dumped %ibytes (%.2f MB) of audio samples\n",
+				 total, (float)total/1024000.0);
+	}
+}
+
+
+void percent_callback(int p)
+{
+	printf("Level %i%% loaded\n", p);
+}
+
+
+int test_main(int argc, char *argv[])
+{
+  TombRaider tr;
+  char mapname[128];
+  int len, i, j;
+
+
+  printf("[TombRaider class test]\n");
+
+  tr.setDebug(true);
+
+  if (argc > 2)
+  {
+	  // Strip for mapname //////////////////////////////
+	  len = strlen(argv[2]);
+
+	  for (i = len, j = 0; i > 0; i--, j++)
+		  if (argv[2][i] == '/' || argv[2][i] == '\\')
+			  break;
+
+	  j--;
+
+	  memset(mapname, 0, 128);
+
+	  for (i = 0; i < len - j && i < 30; i++)
+		  mapname[i] = argv[2][i + len - j];
+
+	  ////////////////////////////////////////////////////
+
+
+    if (strncmp(argv[1], "load", 4) == 0)
+    {
+      if (!tr.Load(argv[2], percent_callback))
+		{
+        printf("\nmain: Load reports success.\n");
+		}
+    }
+    else if (strncmp(argv[1], "dump", 4) == 0)
+    {
+      if (!tr.Load(argv[2], percent_callback))
+		{
+        printf("\nmain: Load reports success.\n");
+
+		  dump_textures(&tr, mapname);
+
+		  printf("Mesh dumping: ");
+		  for (i = 0; i < tr.getMeshCount(); i++)
+		  {
+			  dump_mesh(&tr, mapname, i);
+		  }
+
+		  if (argc > 3)
+		  {
+			  printf("\nLoading external sound SFX.\n");
+			  tr.loadSFX(argv[3]);
+		  }
+
+		  dump_lara_stuff(mapname, tr);
+
+		  printf("\n");
+		}
+		else
+		{
+			printf("\nmain: Load failed.\n");
+		}
+    }
+    else
+      printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
+  }
+  else
+  {
+    printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
+  }
+
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	test_main(argc, argv);
+
+#ifdef DEBUG_MEMORY
+  dump_memory_report();
+#endif
+
+  return 0;
+}
+

test/memory_test.cpp

@@ -25,6 +25,17 @@
 
 #include <memory_test.h>
 
+extern rbtree_t *MEMORY_INFO;
+extern meminfo_filename_t *MEMORY_FILENAME;
+extern long MEMORY_USED;
+extern long MEMORYA_USED;
+extern long MEMORYC_USED;
+extern long MAX_MEMORY_USED;
+extern long MAX_MEMORYA_USED;
+extern long MAX_MEMORYC_USED;
+
+void tree_valid_report(rbtree_t *root);
+
 #define PRINT_TEST_BREAK_LINE	printf("\n############################################################\n\n");
 
 int memory_test_unit_test(int argc, char *argv[])
@@ -36,116 +47,116 @@ int memory_test_unit_test(int argc, char *argv[])
 	printf("Memory test\n");
 	PRINT_TEST_BREAK_LINE
 
-	printf(">\ti = new int;  %s:%i\n", __FILE__, __LINE__);
 	i = new int;
+	printf(">\ti = new int; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	delete i;
+	printf(">\tdelete i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
 	PRINT_TEST_BREAK_LINE
 
-	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	i = new int[3];
+	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	delete [] i;
+	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
 	PRINT_TEST_BREAK_LINE
 
-	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	i = new int[3];
-	printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
+	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	j = new int;
-	printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
+	printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	k = new int[3];
+	printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
-	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	delete [] i;
-	printf(">\tdelete j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
+	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	delete j;
-	printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
+	printf(">\tdelete j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	delete [] k;
+	printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
 	PRINT_TEST_BREAK_LINE
 
-	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	i = new int[3];
-	printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
+	printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	j = new int;
-	printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
+	printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	k = new int[3];
+	printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
-	printf(">\tdelete j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	delete j;
+	printf(">\tdelete j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
-	printf(">\tj = new int[3]; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	j = new int[3];
+	printf(">\tj = new int[3]; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
-	printf(">\tl = new int[3]; (%p)  %s:%i\n", l, __FILE__, __LINE__);
 	l = new int[3];
+	printf(">\tl = new int[3]; (%p)  %s:%i\n", l, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
-	printf(">\tm = new int[3]; (%p)  %s:%i\n", m, __FILE__, __LINE__);
 	m = new int[3];
+	printf(">\tm = new int[3]; (%p)  %s:%i\n", m, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tn = new int[3]; (%p)  %s:%i\n", n, __FILE__, __LINE__);
 	n = new int[3];
+	printf(">\tn = new int[3]; (%p)  %s:%i\n", n, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\to = new int[3]; (%p)  %s:%i\n", o, __FILE__, __LINE__);
 	o = new int[3];
+	printf(">\to = new int[3]; (%p)  %s:%i\n", o, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
 	delete [] k;
+	printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	delete [] j;
+	printf(">\tdelete [] j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] l; (%p)  %s:%i\n", l, __FILE__, __LINE__);
 	delete [] l;
+	printf(">\tdelete [] l; (%p)  %s:%i\n", l, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] m; (%p)  %s:%i\n", m, __FILE__, __LINE__);
 	delete [] m;
+	printf(">\tdelete [] m; (%p)  %s:%i\n", m, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] n; (%p)  %s:%i\n", n, __FILE__, __LINE__);
 	delete [] n;
+	printf(">\tdelete [] n; (%p)  %s:%i\n", n, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] o; (%p)  %s:%i\n", o, __FILE__, __LINE__);
 	delete [] o;
+	printf(">\tdelete [] o; (%p)  %s:%i\n", o, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);
 
-	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	delete [] i;
+	printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
 	dump_memory_report();
 	tree_valid_report(MEMORY_INFO);