deleted file mode 100755

Binary files a/common/._LittleOBJLoader.c and /dev/null differ

deleted file mode 100755

Binary files a/common/._LoadTGA.c and /dev/null differ

deleted file mode 100755

Binary files a/common/._VectorUtils3.c and /dev/null differ

deleted file mode 100755

Binary files a/common/._VectorUtils3.h and /dev/null differ

@@ -15,6 +15,8 @@

 // 200405: Added a few typecasts that were missing.

 // 210219: Shader errors are now visible on new VS19.

 // 210324: Compiling without fragment shader is now allowed

+// 220113: Removed the last remains of VS support. Use a system that

+// can handle printf! From now on, I will use CodeBlocks on Windows.

 //#define GL3_PROTOTYPES

 #ifdef WIN32

@@ -84,29 +86,24 @@ void printProgramInfoLog(GLuint obj, const char *vfn, const char *ffn,

 	GLint infologLength = 0;

 	GLint charsWritten  = 0;

 	char *infoLog;

-	char msg[2048] = "\n";

 	glGetProgramiv(obj, GL_INFO_LOG_LENGTH,&infologLength);

 	if (infologLength > 2)

 	{

 		if (ffn == NULL)

-			sprintf(msg, "[From %s:]\n", vfn);

+			fprintf(stderr, "[From %s:]\n", vfn);

 		else

 		if (gfn == NULL)

-			sprintf(msg, "[From %s+%s:]\n", vfn, ffn);

+			fprintf(stderr, "[From %s+%s:]\n", vfn, ffn);

 		else

 		if (tcfn == NULL || tefn == NULL)

-			sprintf(msg, "[From %s+%s+%s:]\n", vfn, ffn, gfn);

+			fprintf(stderr, "[From %s+%s+%s:]\n", vfn, ffn, gfn);

 		else

-			sprintf(msg, "[From %s+%s+%s+%s+%s:]\n", vfn, ffn, gfn, tcfn, tefn);

-		if (strlen(msg) > 1)

-

-		fputs(msg, stderr);

+			fprintf(stderr, "[From %s+%s+%s+%s+%s:]\n", vfn, ffn, gfn, tcfn, tefn);

 		infoLog = (char *)malloc(infologLength);

 		glGetProgramInfoLog(obj, infologLength, &charsWritten, infoLog);

-		fputs(infoLog, stderr);

-		fputs("\n", stderr);

+		fprintf(stderr, "%s\n",infoLog);

 		free(infoLog);

 	}

 }

@@ -244,40 +241,6 @@ void printError(const char *functionName)

 }

-/*

-

-// Keymap mini manager

-// Important! Uses glutKeyboardFunc/glutKeyboardUpFunc so you can't use them

-// elsewhere or they will conflict.

-// (This functionality is built-in in MicroGlut, as "glutKeyIsDown" where this conflict should not exist.)

-

-char keymap[256];

-

-char keyIsDown(unsigned char c)

-{

-	return keymap[(unsigned int)c];

-}

-

-void keyUp(unsigned char key, int x, int y)

-{

-	keymap[(unsigned int)key] = 0;

-}

-

-void keyDown(unsigned char key, int x, int y)

-{

-	keymap[(unsigned int)key] = 1;

-}

-

-void initKeymapManager()

-{

-	int i;

-	for (i = 0; i < 256; i++) keymap[i] = 0;

-

-	glutKeyboardFunc(keyDown);

-	glutKeyboardUpFunc(keyUp);

-}

-*/

-

 // FBO

 //----------------------------------FBO functions-----------------------------------

deleted file mode 100755

@@ -1,1323 +0,0 @@

-// Little OBJ loader

-// Ingemar's little OBJ loader

-// Formerly named LoadOBJ or loadobj

-// by Ingemar Ragnemalm 2005, 2008, 2019, 2021

-

-// Original version 2005 was extremely simple and intended for use with old OpenGL immediate mode.

-// Additions and reorganization by Mikael Kalms 2008

-// 120913: Revised LoadModelPlus/DrawModel by Jens.

-// Partially corrected formatting. (It is a mess!)

-// 130227: Error reporting in DrawModel

-// 130422: Added ScaleModel

-// 150909: Frees up temporary "Mesh" memory i LoadModel. Thanks to Simon Keisala for finding this!

-// Added DisposeModel. Limited the number of error printouts, thanks to Rasmus Hytter for this suggestion!

-// 160302: Uses fopen_s on Windows, as suggested by Jesper Post. Should reduce warnings a bit.

-// 160510: Uses calloc instead of malloc (for safety) in many places where it could possibly cause problems.

-// 170406: Added "const" to string arguments to make C++ happier.

-// 190416: free mesh->coordStarts properly.

-// 191110: Finally! Multi-part OBJ files work! Renamed LoadModelPlus to LoadModel.

-// and added LoadModelSet! The old LoadModel was removed. Converted to use vec2/vec3

-// instead of arrays of float. It is now dependent on VectorUtils3. If you want to

-// make it independent of VectorUtils3, only a few structs and functions have to be replaced.

-// MTL support working! Parser totally rewritten. Officially renamed to Ingemars Little OBJ Loader,

-// LOL for short! And boy did I find a nice acronym!

-// 210125: Corrected types in LoadDataToModel. Corrected material disposal in the still badly tested DisposeModel.

-// 210218: Allows TAB between parts of string.

-// 210304: Corrected bad allocation size on row 538, found by Jens Lindgren, who also found glDeleteVertexArrays in DisposeModel.

-// 210422: Change by Felicia Castenbrandt, around row 415, copy path or source. This change is likely to be needed in some other places.

-// 210502: Dispose the material name list, omission found by Jens Lindgren.

-

-// Usage:

-// Load simple models with LoadModel. Multi-part models are loaded with LoadModelSet.

-// DrawModel will draw the model, or, for a multi-part model, one part.

-// If you need to modify a model on the CPU, you can do that and re-upload

-// with LoadDataToModel.

-// There is no longer any call that only loads the data, but you can

-// make your own by taking out the GPU upload from LoadModel.

-

-// This is free software. I appreciate credits in derivate products or

-// if it is used in public products.

-

-#include "LittleOBJLoader.h"

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <math.h>

-#include "VectorUtils3.h"

-

-#if defined(_WIN32)

-	#define sscanf sscanf_s

-#endif

-

-

-static char atLineEnd = 0;

-static char atFileEnd = 0;

-

-static char ParseString(char *line, int *pos, char *s)

-{

-	int i = 0;

-	char c;

-	c = line[(*pos)++];

-	while (c == 32 || c == 9) // Important change 210218

-		c = line[(*pos)++]; // Skip leading spaces

-	while (c != 0 && c != 32 && c != 9  && c != EOF && c != '/' && i < 254)

-	{

-		s[i++] = c;

-		c = line[(*pos)++];

-	}

-	atLineEnd = (c == 0);

-	s[i] = 0;

-	

-	return c;

-}

-

-static float ParseFloat(char *line, int *pos)

-{

-	float floatValue = 0.0;

-	char s[255];

-	ParseString(line, pos, s);

-	sscanf(s, "%f", &floatValue);

-	if (isnan(floatValue) || isinf(floatValue))

-		floatValue = 0.0;

-	return floatValue;

-}

-

-static int ParseInt(char *line, int *pos, char *endc)

-{

-	int intValue = 0;

-	char s[255];

-	char c = ParseString(line, pos, s);

-	if (endc != NULL) *endc = c;

-	if (strlen(s) == 0)

-		intValue = -1; // Nothing found!

-	else

-		sscanf(s, "%d", &intValue);

-	return intValue;

-}

-

-static vec3 ParseVec3(char *line, int *pos)

-{

-	vec3 v;

-	v.x = ParseFloat(line, pos);

-	v.y = ParseFloat(line, pos);

-	v.z = ParseFloat(line, pos);

-	return v;

-}

-

-void ParseLine(FILE *fp, char *line)

-{

-	int i, j;

-	char c = '_';

-	for (i = 0, j= 0; i < 2048; i++)

-	{

-		c = getc(fp);

-		if (c != 10 && c != 13)

-			line[j++] = c;

-		if (c == EOF || ((c == 10 || c == 13) && j > 0))

-		{

-			if (c == EOF)

-				atFileEnd = 1;

-			line[j] = 0;

-			return;

-		}

-	}

-	line[j] = 0;

-	return;

-}

-

-

-// Dispose the strings in the materials list

-static void DisposeMtlList(Mtl **materials)

-{

-	if (materials != NULL)

-	for (int i = 0; materials[i] != NULL; i++)

-		free(materials[i]);

-	free(materials);

-}

-

-static Mtl **ParseMTL(char *filename)

-{

-	Mtl *m;

-	char s[255];

-	char line[2048];

-	int pos;

-	Mtl **materials = NULL;

-	FILE *fp;

-

-	// It seems Windows/VS doesn't like fopen any more, but fopen_s is not on the others.

-	#if defined(_WIN32)

-	fopen_s(&fp, filename, "r");

-	#else

-	fp = fopen(filename, "rb"); // rw works everywhere except Windows?

-	#endif

-	if (fp == NULL)

-		return NULL;

-	atLineEnd = 0;

-	atFileEnd = 0;

-	int matcount = 0;

-

-	while (!atFileEnd)

-	{

-		ParseLine(fp, line);

-		pos = 0;

-		ParseString(line, &pos, s);

-		if (strcmp(s, "newmtl") == 0)

-			matcount++;

-	}

-	rewind(fp);

-

-	materials = (Mtl **)calloc(sizeof(MtlPtr)*(matcount+1), 1);

-

-	matcount = 0;

-	atLineEnd = 0;

-	atFileEnd = 0;

-	

-	while (!atFileEnd)

-	{

-		ParseLine(fp, line);

-		pos = 0;

-		ParseString(line, &pos, s);

-

-		// NEW MATERIAL!

-		if (strcmp(s, "newmtl") == 0)

-		{

-			matcount++;

-			materials[matcount-1] = (Mtl *)calloc(sizeof(Mtl),1);

-			m = materials[matcount-1];

-			materials[matcount] = NULL;

-			

-			ParseString(line, &pos, m->newmtl);

-		}

-

-		if (m != NULL)

-		{

-			if (strcmp(s, "Ka") == 0)

-				m->Ka = ParseVec3(line, &pos);

-			if (strcmp(s, "Kd") == 0)

-				m->Kd = ParseVec3(line, &pos);

-			if (strcmp(s, "Ks") == 0)

-				m->Ks = ParseVec3(line, &pos);

-			if (strcmp(s, "Ke") == 0)

-				m->Ke = ParseVec3(line, &pos);

-			if (strcmp(s, "Tr") == 0)

-			{

-				m->Tr = ParseFloat(line, &pos);

-				m->d = 1 - m->Tr;

-			}

-			if (strcmp(s, "d") == 0)

-			{

-				m->d = ParseFloat(line, &pos);

-				m->Tr = 1 - m->d;

-			}

-

-			if (strcmp(s, "illum") == 0)

-				m->illum = ParseInt(line, &pos, NULL);

-

-			if (strcmp(s, "map_Ka") == 0)

-				ParseString(line, &pos, m->map_Ka);

-			if (strcmp(s, "map_Kd") == 0)

-				ParseString(line, &pos, m->map_Kd);

-			if (strcmp(s, "map_Ks") == 0)

-				ParseString(line, &pos, m->map_Ks);

-			if (strcmp(s, "map_Ke") == 0)

-				ParseString(line, &pos, m->map_Ke);

-			if (strcmp(s, "map_d") == 0)

-				ParseString(line, &pos, m->map_d);

-			if (strcmp(s, "map_bump") == 0)

-				ParseString(line, &pos, m->map_bump);

-			if (strcmp(s, "bump") == 0)

-				ParseString(line, &pos, m->map_bump);

-		}

-	}

-	fclose(fp);

-

-	return materials;

-}

-

-typedef struct Mesh

-{

-	vec3	*vertices;

-	int		vertexCount;

-	vec3	*vertexNormals;

-	int		normalsCount;

-	vec2	*textureCoords;

-	int		texCount;

-	

-	int		*coordIndex;

-	int		*normalsIndex;

-	int		*textureIndex;

-	int		coordCount; // Number of indices in each index struct

-	

-	// Borders between groups

-	int		*coordStarts;

-	int		groupCount;

-	

-	char	*materialName;

-} Mesh, *MeshPtr;

-

-// Globals set by LoadObj

-static int vertCount, texCount, normalsCount, coordCount;

-static int zeroFix;

-static char hasPositionIndices;

-static char hasNormalIndices;

-static char hasTexCoordIndices;

-

-// List of materials

-Mtl **gMaterials;

-char **gMtlNameList;

-char *gMtlLibName = NULL;

-

-static char ParseOBJ(const char *filename, MeshPtr theMesh)

-{

-	int lastCoordCount = -1;

-	FILE *fp;

-	

-	// It seems Windows/VS doesn't like fopen any more, but fopen_s is not on the others.

-	#if defined(_WIN32)

-	fopen_s(&fp, filename, "r");

-	#else

-	fp = fopen(filename, "rb"); // rw works everywhere except Windows?

-	#endif

-	if (fp == NULL)

-		return -1;

-

-// These must be taken care of by the caller!

-	vertCount=0;

-	texCount=0;

-	normalsCount=0;

-	coordCount=0;

-

-	atLineEnd = 0;

-	atFileEnd = 0;

-		

-	while (!atFileEnd)

-	{

-		char line[2048];

-		ParseLine(fp, line);

-		int pos = 0;

-		

-		char s[256];

-		ParseString(line, &pos, s);

-		

-		if (strcmp(s, "v") == 0)

-		{

-			vec3 v = ParseVec3(line, &pos);

-			if (theMesh->vertices != NULL)

-				theMesh->vertices[vertCount++] = v;

-			else

-				vertCount += 1;

-		}

-		if (strcmp(s, "vn") == 0)

-		{

-			vec3 v = ParseVec3(line, &pos);			

-			if (theMesh->vertexNormals != NULL)

-				theMesh->vertexNormals[normalsCount++] = v;

-			else

-				normalsCount += 1;

-		}

-		if (strcmp(s, "vt") == 0)

-		{

-			vec3 v = ParseVec3(line, &pos);

-			if (theMesh->textureCoords != NULL)

-			{

-				theMesh->textureCoords[texCount].x = v.x;

-				theMesh->textureCoords[texCount++].y = v.y;

-			}

-			else

-				texCount += 1;

-		}

-		if (strcmp(s, "f") == 0)

-		{

-		// Unknown number of singeltons or triplets!

-			

-			int p = -1;

-			int i = -1;

-			int p1;

-			char *ns;

-			char done = 0;

-			for (i = pos ; !done; pos++)

-			{

-				if (line[pos] == 0)

-					done = 1;

-				if (p >= 0) // in triplet)

-				{

-					char c = line[pos];

-					if (c == '/' || c == ' ' || c == 0)

-					{

-						ns = &line[p1]; // Start of substring

-						line[pos] = 0; // End of substring

-						if (p1 != pos)

-						{

-							i = atoi(ns);

-							if (i == 0)

-								zeroFix = 1;

-							if (i < 0)

-							{

-								switch (p)

-								{

-									case 0: i = vertCount + i + 1; break;

-									case 1: i = texCount + i + 1; break;

-									case 2: i = normalsCount + i + 1; break;

-								}

-							}

-							i = i + zeroFix;

-						}

-						else

-							i = 0; // -1

-						

-						if (i > 0)

-						switch (p)

-						{

-							case 0:

-								if (theMesh->coordIndex != NULL)

-									theMesh->coordIndex[coordCount-1] = i-1;

-								break;

-							case 1:

-								if (theMesh->textureIndex != NULL)

-									if (i >= 0)

-										theMesh->textureIndex[coordCount-1] = i-1;

-								hasTexCoordIndices = 1;

-								break;

-							case 2:

-								if (theMesh->normalsIndex != NULL)

-									if (i >= 0)

-										theMesh->normalsIndex[coordCount-1] = i-1;

-								hasNormalIndices = 1;

-								break;

-						}

-						p1 = pos + 1;

-						p++;

-					}

-					if (c == ' ')

-					{

-						p = -1; // Next triplet

-					}

-				}

-				else // Wait for non-space

-				if (line[pos] != ' ')

-				{

-					if (!done)

-						coordCount++;

-					p = 0; // Triplet starts!

-					p1 = pos;

-				}

-			}

-			

-			if (theMesh->coordIndex != NULL)

-				theMesh->coordIndex[coordCount] = -1;

-			if (theMesh->textureIndex != NULL)

-				theMesh->textureIndex[coordCount] = -1;

-			if (theMesh->normalsIndex != NULL)

-				theMesh->normalsIndex[coordCount] = -1;

-			coordCount++;

-		}

-		if (strcmp(s, "mtllib") == 0)

-		{

-			// Save file name for later

-			char libname[256];

-			

-			// Added by Felicia Castenbrandt: Get path of main file, if any

-        	char temp[255];

-			int index = 0;

-

-			//find index of last /

-			for(int i = 0; i < strlen(filename); i++)

-				if(filename[i] == '/')

-					index = i;

-

-			//copy everything before the last / to temp

-			if (index != 0)

-			{

-				for(int i = 0; i < index+1; i++)

-				{

-					char ch = filename[i];

-					strncat(temp, &ch, 1);

-				}

-			}

-			// End of addition

-			

-			

-			/*char c =*/ ParseString(line, &pos, libname);

-			gMtlLibName = (char *)malloc(strlen(libname)+1);

-#if defined(_WIN32)

-			strcpy_s(gMtlLibName, strlen(libname) + 1, libname);

-#else

-			strcpy(gMtlLibName, libname);

-#endif

-

-		}

-		if (strcmp(s, "usemtl") == 0)

-		{

-			// Groups are only identified by usemtl!

-			

-			if (coordCount > 0) // If no data has been seen, this must be the first group!

-			{

-				if (lastCoordCount != coordCount) // must not be the same; empty group (happens if a model has both "g" and "o")

-				{

-					theMesh->groupCount += 1;

-					if (theMesh->coordStarts != NULL) // NULL if we are just counting

-						theMesh->coordStarts[theMesh->groupCount] = coordCount;

-

-					lastCoordCount = coordCount;

-				}

-				else

-					printf("Ignored part!\n");

-			}

-			

-			if (gMtlNameList != NULL)

-			{

-				// Save matname for later

-				char matname[255];

-				ParseString(line, &pos, matname);

-				gMtlNameList[theMesh->groupCount] = (char *)malloc(strlen(matname)+1);

-#if defined(_WIN32)

-				strcpy_s(gMtlNameList[theMesh->groupCount], strlen(matname) + 1, matname);

-#else

-				strcpy(gMtlNameList[theMesh->groupCount], matname);

-#endif

-

-

-			}

-		}

-	} // While

-	

-	// Add last groups *if* there was more data since last time!

-	if (coordCount > lastCoordCount)

-	{

-		theMesh->groupCount += 1; // End of last group

-		if (theMesh->coordStarts != NULL)

-			theMesh->coordStarts[theMesh->groupCount] = coordCount;

-	}

-		

-	fclose(fp);

-	

-	if (gMtlLibName != NULL)

-		gMaterials = ParseMTL(gMtlLibName);

-	// else try based on filename: filename.obj -> filename.mtl or filename_obj.mtl

-	if (gMaterials == NULL)

-	if (strlen(filename) > 4)

-	{

-		char tryname[255];

-		strcpy(tryname, filename);

-		tryname[strlen(tryname) - 4] = '_';

-		strcat(tryname, ".mtl");

-		gMaterials = ParseMTL(tryname);

-	}

-	if (gMaterials == NULL)

-	if (strlen(filename) > 4)

-	{

-		char tmpname[255];

-		strcpy(tmpname, filename);

-		tmpname[strlen(tmpname) - 4] = 0;

-		strcat(tmpname, ".mtl");

-		gMaterials = ParseMTL(tmpname);

-	}

-	return 0;

-}

-

-// Load raw, unprocessed OBJ data!

-static struct Mesh * LoadOBJ(const char *filename)

-{

-	// Reads once to find sizes, again to fill buffers

-	Mesh *theMesh;

-	

-	// Allocate Mesh but not the buffers

-	theMesh = (Mesh *)calloc(sizeof(Mesh), 1);

-

-	hasPositionIndices = 1;

-	hasTexCoordIndices = 0;

-	hasNormalIndices = 0;

-

-	theMesh->coordStarts = NULL;

-	theMesh->groupCount = 0;

-	gMtlNameList = NULL;

-

-// Dispose if they exist!

-	gMtlLibName = NULL;

-	gMaterials = NULL;

-

-	vertCount=0;

-	texCount=0;

-	normalsCount=0;

-	coordCount=0;

-	zeroFix = 0;

-		

-	// Parse for size

-	ParseOBJ(filename, theMesh);

-

-	// Allocate arrays!

-	if (vertCount > 0)

-		theMesh->vertices = (vec3 *)malloc(sizeof(vec3) * vertCount);

-	if (texCount > 0)

-		theMesh->textureCoords = (vec2 *)malloc(sizeof(vec2) * texCount);

-	if (normalsCount > 0)

-		theMesh->vertexNormals = (vec3 *)malloc(sizeof(vec3) * normalsCount);

-	if (hasPositionIndices)

-		theMesh->coordIndex = (int *)calloc(coordCount, sizeof(int));

-	if (hasNormalIndices)

-		theMesh->normalsIndex = (int *)calloc(coordCount, sizeof(int));

-	if (hasTexCoordIndices)

-		theMesh->textureIndex = (int *)calloc(coordCount, sizeof(int));

-

-	gMtlNameList = (char **)calloc(sizeof(char *) * (theMesh->groupCount+1), 1);

-	theMesh->coordStarts = (int *)calloc(sizeof(int) * (theMesh->groupCount+2), 1); // Length found on last pass

-	theMesh->groupCount = 0;

-

-	// Zero again

-	vertCount=0;

-	texCount=0;

-	normalsCount=0;

-	coordCount=0;

-

-	// Parse again for filling buffers

-	ParseOBJ(filename, theMesh);

-	

-	theMesh->vertexCount = vertCount;

-	theMesh->coordCount = coordCount;

-	theMesh->texCount = texCount;

-	theMesh->normalsCount = normalsCount;

-

-	return theMesh;

-}

-

-void DecomposeToTriangles(struct Mesh *theMesh)

-{

-	int i, vertexCount, triangleCount;

-	int *newCoords, *newNormalsIndex, *newTextureIndex;

-	int newIndex = 0; // Index in newCoords

-	int first = 0;

-

-	// 1.1 Calculate how big the list will become

-	

-	vertexCount = 0; // Number of vertices in current polygon

-	triangleCount = 0; // Resulting number of triangles

-	for (i = 0; i < theMesh->coordCount; i++)

-	{

-		if (theMesh->coordIndex[i] == -1)

-		{

-		if (vertexCount > 2) triangleCount += vertexCount - 2;

-			vertexCount = 0;

-		}

-		else

-		{

-			vertexCount = vertexCount + 1;

-		}

-	}

-		

-	newCoords = (int *)calloc(triangleCount * 3, sizeof(int));

-	if (theMesh->normalsIndex != NULL)

-		newNormalsIndex = (int *)calloc(triangleCount * 3, sizeof(int));

-	if (theMesh->textureIndex != NULL)

-		newTextureIndex = (int *)calloc(triangleCount * 3, sizeof(int));

-	

-	// 1.2 Loop through old list and write the new one

-	// Almost same loop but now it has space to write the result

-	vertexCount = 0;

-	for (i = 0; i < theMesh->coordCount; i++)

-	{

-		if (theMesh->coordIndex[i] == -1)

-		{

-			first = i + 1;

-			vertexCount = 0;

-		}

-		else

-		{

-			vertexCount = vertexCount + 1;

-			if (vertexCount > 2)

-			{

-				newCoords[newIndex++] = theMesh->coordIndex[first];

-				newCoords[newIndex++] = theMesh->coordIndex[i-1];

-				newCoords[newIndex++] = theMesh->coordIndex[i];

-				if (theMesh->normalsIndex != NULL)

-				{

-					newNormalsIndex[newIndex-3] = theMesh->normalsIndex[first];

-					newNormalsIndex[newIndex-2] = theMesh->normalsIndex[i-1];

-					newNormalsIndex[newIndex-1] = theMesh->normalsIndex[i];

-				}

-				if (theMesh->textureIndex != NULL)

-				{

-					newTextureIndex[newIndex-3] = theMesh->textureIndex[first];

-					newTextureIndex[newIndex-2] = theMesh->textureIndex[i-1];

-					newTextureIndex[newIndex-1] = theMesh->textureIndex[i];

-				}

-			}

-		}

-	}

-	

-	free(theMesh->coordIndex);

-	theMesh->coordIndex = newCoords;

-	theMesh->coordCount = triangleCount * 3;

-	if (theMesh->normalsIndex != NULL)

-	{

-		free(theMesh->normalsIndex);

-		theMesh->normalsIndex = newNormalsIndex;

-	}

-	if (theMesh->textureIndex != NULL)

-	{

-		free(theMesh->textureIndex);

-		theMesh->textureIndex = newTextureIndex;

-	}

-} // DecomposeToTriangles

-

-static void GenerateNormals(Mesh* mesh)

-{

-	// If model has vertices but no vertexnormals, generate normals

-	if (mesh->vertices && !mesh->vertexNormals)

-	{

-		int face;

-		int normalIndex;

-

-		mesh->vertexNormals = (vec3 *)calloc(sizeof(vec3) * mesh->vertexCount, 1);

-		mesh->normalsCount = mesh->vertexCount;

-

-		mesh->normalsIndex = (int *)calloc(mesh->coordCount, sizeof(GLuint));

-		memcpy(mesh->normalsIndex, mesh->coordIndex, sizeof(GLuint) * mesh->coordCount);

-

-		for (face = 0; face * 3 < mesh->coordCount; face++)

-		{

-			int i0 = mesh->coordIndex[face * 3 + 0];

-			int i1 = mesh->coordIndex[face * 3 + 1];

-			int i2 = mesh->coordIndex[face * 3 + 2];

-			

-			vec3 v0 = VectorSub(mesh->vertices[i1], mesh->vertices[i0]);

-			vec3 v1 = VectorSub(mesh->vertices[i2], mesh->vertices[i0]);

-			vec3 v2 = VectorSub(mesh->vertices[i2], mesh->vertices[i1]);

-

-			float sqrLen0 = dot(v0, v0);

-			float sqrLen1 = dot(v1, v1);

-			float sqrLen2 = dot(v2, v2);

-

-			float len0 = (sqrLen0 >= 1e-6f) ? sqrt(sqrLen0) : 1e-3f;

-			float len1 = (sqrLen1 >= 1e-6f) ? sqrt(sqrLen1) : 1e-3f;

-			float len2 = (sqrLen2 >= 1e-6f) ? sqrt(sqrLen2) : 1e-3f;

-

-			float influence0 = dot(v0, v1) / (len0 * len1);

-			float influence1 = -dot(v0, v2) / (len0 * len2);

-			float influence2 = dot(v1, v2) / (len1 * len2);

-

-			float angle0 = (influence0 >= 1.f) ? 0 : 

-				(influence0 <= -1.f) ? M_PI : acos(influence0);

-			float angle1 = (influence1 >= 1.f) ? 0 : 

-				(influence1 <= -1.f) ? M_PI : acos(influence1);

-			float angle2 = (influence2 >= 1.f) ? 0 : 

-				(influence2 <= -1.f) ? M_PI : acos(influence2);

-

-			vec3 normal = cross(v0, v1);

-			mesh->vertexNormals[i0] = VectorAdd(ScalarMult(normal, angle0), mesh->vertexNormals[i0]);

-			mesh->vertexNormals[i1] = VectorAdd(ScalarMult(normal, angle1), mesh->vertexNormals[i1]);

-			mesh->vertexNormals[i2] = VectorAdd(ScalarMult(normal, angle2), mesh->vertexNormals[i2]);

-		}

-

-		for (normalIndex = 0; normalIndex < mesh->normalsCount; normalIndex++)

-		{

-			float length = Norm(mesh->vertexNormals[normalIndex]);

-			if (length > 0.01f)

-				mesh->vertexNormals[normalIndex] = ScalarMult(mesh->vertexNormals[normalIndex], 1/length);

-		}

-	}

-}

-

-static Model* GenerateModel(Mesh* mesh)

-{

-	// Convert from Mesh format (multiple index lists) to Model format

-	// (one index list) by generating a new set of vertices/indices

-	// and where new vertices have been created whenever necessary

-

-	typedef struct

-	{

-		int positionIndex;

-		int normalIndex;

-		int texCoordIndex;

-		int newIndex;

-	} IndexTriplet;

-

-	int hashGap = 6;

-

-	int indexHashMapSize = (mesh->vertexCount * hashGap + mesh->coordCount);

-

-	IndexTriplet* indexHashMap = (IndexTriplet *)malloc(sizeof(IndexTriplet)

-							* indexHashMapSize);

-

-	int numNewVertices = 0;

-	int index;

-

-	int maxValue = 0;

-		

-	Model* model = (Model *)malloc(sizeof(Model));

-	memset(model, 0, sizeof(Model));

-

-	model->indexArray = (GLuint *)malloc(sizeof(GLuint) * mesh->coordCount);

-	model->numIndices = mesh->coordCount;

-

-	memset(indexHashMap, 0xff, sizeof(IndexTriplet) * indexHashMapSize);

-

-	for (index = 0; index < mesh->coordCount; index++)

-	{

-		IndexTriplet currentVertex = { -1, -1, -1, -1 };

-		int insertPos = 0;

-		if (mesh->coordIndex)

-			currentVertex.positionIndex = mesh->coordIndex[index];

-		if (mesh->normalsIndex)

-			currentVertex.normalIndex = mesh->normalsIndex[index];

-		if (mesh->textureIndex)

-			currentVertex.texCoordIndex = mesh->textureIndex[index];

-

-		if (maxValue < currentVertex.texCoordIndex)

-			maxValue = currentVertex.texCoordIndex;

- 

-		if (currentVertex.positionIndex >= 0)

-			insertPos = currentVertex.positionIndex * hashGap;

-

-		while (1)

-		{

-			if (indexHashMap[insertPos].newIndex == -1)