new release version,

Features:
- performance improvement,
- code improvement,
- move the model to the center,
- scale everything to 1,
- do not open a default file for release build
Bugs:
- cloth is not displayed correctly,
- turning in the wrong x direction when model is turned 180° in y direction,
- consular class corvette is not displayed,
- rep_weap_LJ-50 is not displayed correctly

MshViewer/Header/Object.h

@@ -14,6 +14,12 @@ enum Mtyp {
 	shadowMesh = 6
 };
 
+struct Bbox {
+	float quaternion[4];
+	float center[3];
+	float extents[3];
+};
+
 struct ChunkHeader {
 	char name[5];
 	std::uint32_t size;
@@ -24,7 +30,7 @@ struct Segment {
 	std::uint32_t textureIndex	= 0;
 	float* vertex				= nullptr;
 	float* uv					= nullptr;
-	std::vector<std::vector<std::uint32_t>*> meshIndices;	// indices into vertex array
+	std::vector<std::vector<std::uint32_t>> meshIndices;	// indices into vertex array
 };
 
 struct Modl {
@@ -45,10 +51,10 @@ public:
 
 private:
 
-	std::vector<Modl*> vModls;
+	std::vector<Modl*>* vModls;
 	std::fstream fsMesh;
 	std::vector<std::string> vTextures;
-
+	Bbox boundingBox;
 
 private:
 	void loadChunks(std::list<ChunkHeader*> &destination, std::streampos start, const std::uint32_t end);
@@ -63,7 +69,7 @@ private:
 	
 
 public:
-	std::vector<Modl*> getModels() const;
+	std::vector<Modl*>* getModels() const;
 	std::vector<std::string> getTextureList() const;
-
+	Bbox getBoundgBox() const;
 };

MshViewer/Header/OpenGLController.h

@@ -70,8 +70,9 @@ private:
 // ========================================
 
 	// data
-	std::vector<Modl*> vModels;
+	std::vector<Modl*>* vModels = NULL;
 	std::vector<textureData*> vTextures;
+	Bbox sceneBoundingBox;
 
 // transformation =========================
 	//values
@@ -80,7 +81,7 @@ private:
 	float fRotationZ			= 0;
 	double dTranslationX		= 0;
 	double dTranslationY		= 0;
-	double dTranslationZ		= 5;
+	double dTranslationZ		= 3;
 
 // ========================================
 

MshViewer/Header/Texture.h

@@ -9,22 +9,13 @@ public:
 	~TextureTGA();
 
 private:
-	std::vector<std::uint8_t> vui8Pixels;
-	bool bCompressed;
-	std::uint32_t ui32IDLength;
-	bool bColorTabel;
-	std::uint32_t ui32PicType;
-	std::uint32_t ui32PaletteBegin;
-	std::uint32_t ui32PaletteLength;
-	std::uint32_t ui32PaletteBpP;
+	std::vector<std::uint8_t>* vui8Pixels;
+	std::uint32_t ui32BpP;
 	std::uint32_t ui32Width;
 	std::uint32_t ui32Height;
-	std::uint32_t ui32Size;
-	std::uint32_t ui32BpP;
-	std::uint32_t ui32Attribut;
 
 public:
-	std::vector<std::uint8_t> getData() const;
+	std::vector<std::uint8_t>* getData() const;
 	bool hasAlpha() const;
 	std::uint32_t getWidth() const;
 	std::uint32_t getHeight() const;

MshViewer/Source/Object.cpp

@@ -10,6 +10,8 @@
 
 Object::Object(const char* path)
 {
+	vModls = new std::vector<Modl*>;
+
 	// open file
 	fsMesh.open(path, std::ios::in | std::ios::binary);
 
@@ -65,9 +67,6 @@ Object::~Object()
 {
 	// clear texture list
 	vTextures.clear();
-
-	// clear Model list (don't delete the elements)
-	vModls.clear();
 }
 
 
@@ -108,28 +107,59 @@ void Object::loadChunks(std::list<ChunkHeader*>& destination, std::streampos sta
 
 void Object::analyseMsh2Chunks(std::list<ChunkHeader*>& chunkList)
 {
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
-		if (!strcmp("MATL", (*it)->name))
+		if (!strcmp("SINF", it->name))
+		{
+			std::list<ChunkHeader*> tempSinfChunks;
+			loadChunks(tempSinfChunks, it->position, it->size);
+
+			// evaluate MATL subchunks
+			for (auto& it : tempSinfChunks)
+			{
+				if (!strcmp("BBOX", it->name))
+				{
+					fsMesh.seekg(it->position);
+
+					// read in the quaternion
+					for (int i = 0; i < 4; i++)
+						fsMesh.read(reinterpret_cast<char*>(&boundingBox.quaternion[i]), sizeof(float));
+
+					//read in the center
+					for (int i = 0; i < 3; i++)
+						fsMesh.read(reinterpret_cast<char*>(&boundingBox.center[i]), sizeof(float));
+
+					//read in the extents
+					for (int i = 0; i < 3; i++)
+						fsMesh.read(reinterpret_cast<char*>(&boundingBox.extents[i]), sizeof(float));
+				}
+			}
+
+			for (ChunkHeader* it : tempSinfChunks)
+				delete it;
+		}
+
+		else if (!strcmp("MATL", it->name))
 		{
 			// "useless" information how many MATD follow
-			fsMesh.seekg((*it)->position);
-			std::uint32_t tempMatdCount;
-			fsMesh.read(reinterpret_cast<char*>(&tempMatdCount), sizeof(std::uint32_t));
+			fsMesh.seekg(it->position);
+			fsMesh.seekg(sizeof(std::uint32_t), std::ios_base::cur);
 
 			// get all MATD from MATL list
 			std::list<ChunkHeader*> tempMatlChunks;
-			loadChunks(tempMatlChunks, fsMesh.tellg(), (*it)->size - 4);
+			loadChunks(tempMatlChunks, fsMesh.tellg(), it->size - 4);
 
 			// evaluate MATL subchunks
-			for (std::list<ChunkHeader*>::iterator it = tempMatlChunks.begin(); it != tempMatlChunks.end(); it++)
+			for (auto& it : tempMatlChunks)
 			{
 				// This shouldn't be anything else than MATD
-				if (!strcmp("MATD", (*it)->name))
+				if (!strcmp("MATD", it->name))
 				{
 					// get all subchunks from MATD
 					std::list<ChunkHeader*> tempMatdChunks;
-					loadChunks(tempMatdChunks, (*it)->position, (*it)->size);
+					loadChunks(tempMatdChunks, it->position, it->size);
+
+					vTextures.push_back("");
 
 					// analyse MATD subchunks
 					analyseMatdChunks(tempMatdChunks);
@@ -151,17 +181,15 @@ void Object::analyseMsh2Chunks(std::list<ChunkHeader*>& chunkList)
 				tempMatlChunks.pop_front();
 				delete tempCursor;
 			}
-
-			continue;
 		}
 
-		if (!strcmp("MODL", (*it)->name))
+		else if (!strcmp("MODL", it->name))
 		{
 			Modl* tempModl = new Modl;
 
 			// get all subchunks
 			std::list<ChunkHeader*> tempChunks;
-			loadChunks(tempChunks, (*it)->position, (*it)->size);
+			loadChunks(tempChunks, it->position, it->size);
 
 			// evaluate MODL subchunks
 			analyseModlChunks(tempModl, tempChunks);
@@ -175,81 +203,75 @@ void Object::analyseMsh2Chunks(std::list<ChunkHeader*>& chunkList)
 			}
 
 			// save Model data
-			vModls.push_back(tempModl);
-
-			continue;
+			vModls->push_back(tempModl);
 		}
 	}
 }
 
 void Object::analyseMatdChunks(std::list<ChunkHeader*>& chunkList)
 {
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
 		//TX1D, TX2D, TX3D
-		if (!strcmp("TX0D", (*it)->name))
+		if (!strcmp("TX0D", it->name))
 		{
-			fsMesh.seekg((*it)->position);
-			char* buffer = new char[(*it)->size + 1];
+			fsMesh.seekg(it->position);
+			char* buffer = new char[it->size + 1];
 			*buffer = { 0 };
-			fsMesh.read(buffer, (*it)->size);
-			vTextures.push_back(buffer);
-			delete buffer;
-			continue;
+			fsMesh.read(buffer, it->size);
+			vTextures.back() = buffer;
+			delete[] buffer;
 		}
 	}
 }
 
 void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& chunkList)
 {
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
-		if (!strcmp("MTYP", (*it)->name))
+		if (!strcmp("MTYP", it->name))
 		{
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 			std::uint32_t tempType;
 			fsMesh.read(reinterpret_cast<char*>(&tempType), sizeof(tempType));
 			dataDestination->type = (Mtyp)tempType;
-			continue;
 		}
 
-		if (!strcmp("PRNT", (*it)->name))
+		else if (!strcmp("PRNT", it->name))
 		{
-			fsMesh.seekg((*it)->position);
-			char* buffer = new char[(*it)->size];
+			fsMesh.seekg(it->position);
+			char* buffer = new char[it->size];
 			*buffer = { 0 };
-			fsMesh.read(buffer, (*it)->size); 
+			fsMesh.read(buffer, it->size); 
 			dataDestination->parent = buffer;
-			delete buffer;
-			continue;
+			delete[] buffer;
 		}
 
-		if (!strcmp("NAME", (*it)->name))
+		else if (!strcmp("NAME", it->name))
 		{
-			fsMesh.seekg((*it)->position);
-			char* buffer = new char[(*it)->size];
+			fsMesh.seekg(it->position);
+			char* buffer = new char[it->size];
 			*buffer = { 0 };
-			fsMesh.read(buffer, (*it)->size);
+			fsMesh.read(buffer, it->size);
 			dataDestination->name = buffer;
-			delete buffer;
-			continue;
+			delete[] buffer;
 		}
 
-		if (!strcmp("FLGS", (*it)->name))
+		else if (!strcmp("FLGS", it->name))
 		{
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 			fsMesh.read(reinterpret_cast<char*>(&dataDestination->renderFlags), sizeof(dataDestination->renderFlags));
-			continue;
 		}
 
-		if (!strcmp("TRAN", (*it)->name))
+		else if (!strcmp("TRAN", it->name))
 		{
 			float tempScale[3];
 			float tempRotation[4];
 			float tempTrans[3];
 
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 
+			//TODO: use loop
 			fsMesh.read(reinterpret_cast<char*>(&tempScale[0]), sizeof(float));
 			fsMesh.read(reinterpret_cast<char*>(&tempScale[1]), sizeof(float));
 			fsMesh.read(reinterpret_cast<char*>(&tempScale[2]), sizeof(float));
@@ -259,6 +281,7 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& c
 			fsMesh.read(reinterpret_cast<char*>(&tempRotation[2]), sizeof(float));
 			fsMesh.read(reinterpret_cast<char*>(&tempRotation[3]), sizeof(float));
 
+			//TODO: make a function for this
 			//calculate x,y,z rotation
 			tempRotation[0] = atan2(2 * (tempRotation[0] * tempRotation[1] + tempRotation[2] * tempRotation[3]),
 									1 - 2 * (pow(tempRotation[1], 2) + pow(tempRotation[2], 2)));
@@ -298,14 +321,13 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& c
 				glm::vec3(0, 0, 1)
 			);
 
-			continue;
 		}
 
-		if (!strcmp("GEOM", (*it)->name))
+		else if (!strcmp("GEOM", it->name))
 		{
 			// get all subchunks
 			std::list<ChunkHeader*> tempGeomChunks;
-			loadChunks(tempGeomChunks, (*it)->position, (*it)->size);
+			loadChunks(tempGeomChunks, it->position, it->size);
 
 			// evaluate GEOM subchunks
 			analyseGeomChunks(dataDestination, tempGeomChunks);
@@ -317,21 +339,19 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list<ChunkHeader*>& c
 				tempGeomChunks.pop_front();
 				delete tempCursor;
 			}
-
-			continue;
 		}
 	}
 }
 
 void Object::analyseGeomChunks(Modl * dataDestination, std::list<ChunkHeader*>& chunkList)
 {
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
-		if (!strcmp("SEGM", (*it)->name))
+		if (!strcmp("SEGM", it->name))
 		{
 			// get all subchunks
 			std::list<ChunkHeader*> tempSegmChunks;
-			loadChunks(tempSegmChunks, (*it)->position, (*it)->size);
+			loadChunks(tempSegmChunks, it->position, it->size);
 
 			// evaluate SEGM subchunks
 			analyseSegmChunks(dataDestination, tempSegmChunks);
@@ -346,11 +366,11 @@ void Object::analyseGeomChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 			continue;
 		}
 		
-		if (!strcmp("CLTH", (*it)->name))
+		if (!strcmp("CLTH", it->name))
 		{
 			// get all subchunks
 			std::list<ChunkHeader*> tempClthChunks;
-			loadChunks(tempClthChunks, (*it)->position, (*it)->size);
+			loadChunks(tempClthChunks, it->position, it->size);
 
 			// evaluate CLTH subchunks
 			analyseClthChunks(dataDestination, tempClthChunks);
@@ -371,37 +391,35 @@ void Object::analyseSegmChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 {
 	Segment* tempData = new Segment;
 
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
-		if (!strcmp("MATI", (*it)->name))
+		if (!strcmp("MATI", it->name))
 		{
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 			fsMesh.read(reinterpret_cast<char*>(&tempData->textureIndex), sizeof(tempData->textureIndex));
-			continue;
 		}
 
-		if (!strcmp("POSL", (*it)->name))
+		else if (!strcmp("POSL", it->name))
 		{
-			readVertex(tempData, (*it)->position);
-			continue;
+			readVertex(tempData, it->position);
 		}
 
-		/*if (!strcmp("NRML", (*it)->name))
+		/*else if (!strcmp("NRML", it->name))
 		{
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
+			std::uint32_t tempSize;
+			fsMesh.read(reinterpret_cast<char*>(&tempSize), sizeof(tempSize));
 			// List of normals
 			// long int - 4 - number of normal vectores stored in this list
 			// float[3][] - 12 each - UVW vector for each vertex
-			continue;
 		}*/
 
-		if (!strcmp("UV0L", (*it)->name))
+		else if (!strcmp("UV0L", it->name))
 		{
-			readUV(tempData, (*it)->position);
-			continue;
+			readUV(tempData, it->position);
 		}
 
-		if (!strcmp("STRP", (*it)->name))
+		else if (!strcmp("STRP", it->name))
 		{
 			// don't get null, bone, shadowMesh and hidden mesh indices
 			if (dataDestination->type == null ||
@@ -412,11 +430,11 @@ void Object::analyseSegmChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 
 			// jump to the data section and read the size;
 			std::uint32_t tempSize;
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 			fsMesh.read(reinterpret_cast<char*>(&tempSize), sizeof(tempSize));
 
 			int highBitCount(0);
-			std::vector<uint32_t>* tempPoly = new std::vector<uint32_t>;
+			std::vector<uint32_t> tempPoly; // = new std::vector<uint32_t>;
 			
 			for (unsigned int i = 0; i < tempSize; i++)
 			{
@@ -431,7 +449,7 @@ void Object::analyseSegmChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 					tempValue = (std::uint16_t(tempValue << 1) >> 1);
 				}
 
-				tempPoly->push_back((std::uint32_t)tempValue);
+				tempPoly.push_back((std::uint32_t)tempValue);
 
 				// new Polygon found
 				if (highBitCount == 2)
@@ -443,18 +461,17 @@ void Object::analyseSegmChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 					std::uint32_t saveData[2];
 					for (int i = 0; i < 2; i++)
 					{
-						saveData[i] = tempPoly->back();
-						tempPoly->pop_back();
+						saveData[i] = tempPoly.back();
+						tempPoly.pop_back();
 					}
 
 					// ..and save them in the new vector
-					std::vector<uint32_t>* newPointer = new std::vector<uint32_t>;
-					for (int i = 1; i >= 0; i--)
-						newPointer->push_back(saveData[i]);
-
-					// save the old vector and set the pointer to the new one
 					tempData->meshIndices.push_back(tempPoly);
-					tempPoly = newPointer;
+
+					tempPoly.clear();
+					for (int i = 1; i >= 0; i--)
+						tempPoly.push_back(saveData[i]);
+
 				}	// if high bit set
 				
 			}	// for all values
@@ -464,9 +481,9 @@ void Object::analyseSegmChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 
 			// kick the first element, it's empty as a reason of the algo above;
 			tempData->meshIndices.erase(tempData->meshIndices.begin());
-			continue;
 		}
 	}
+
 	dataDestination->segmLst.push_back(tempData);
 }
 
@@ -474,14 +491,14 @@ void Object::analyseClthChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 {
 	Segment* tempData = new Segment;
 
-	for (std::list<ChunkHeader*>::iterator it = chunkList.begin(); it != chunkList.end(); it++)
+	for (auto& it : chunkList)
 	{
-		if (!strcmp("CTEX", (*it)->name))
+		if (!strcmp("CTEX", it->name))
 		{
-			fsMesh.seekg((*it)->position);
-			char* buffer = new char[(*it)->size];
+			fsMesh.seekg(it->position);
+			char* buffer = new char[it->size];
 			*buffer = { 0 };
-			fsMesh.read(buffer, (*it)->size);
+			fsMesh.read(buffer, it->size);
 
 			bool tempFound(false);
 
@@ -501,46 +518,42 @@ void Object::analyseClthChunks(Modl * dataDestination, std::list<ChunkHeader*>&
 				tempData->textureIndex = vTextures.size() - 1;
 			}
 
-			delete buffer;
-			continue;
+			delete[] buffer;
 		}
 
-		if (!strcmp("CPOS", (*it)->name))
+		else if (!strcmp("CPOS", it->name))
 		{
-			readVertex(tempData, (*it)->position);
-			continue;
+			readVertex(tempData, it->position);
 		}
 
-		if (!strcmp("CUV0", (*it)->name))
+		else if (!strcmp("CUV0", it->name))
 		{
-			readUV(tempData, (*it)->position);
-			continue;
+			readUV(tempData, it->position);
 		}
 
-		if (!strcmp("CMSH", (*it)->name))
+		else if (!strcmp("CMSH", it->name))
 		{
 			// jump to the data section and read the size;
 			std::uint32_t tempSize;
-			fsMesh.seekg((*it)->position);
+			fsMesh.seekg(it->position);
 			fsMesh.read(reinterpret_cast<char*>(&tempSize), sizeof(tempSize));
 
-			std::vector<uint32_t>* tempPoly;
+			std::vector<uint32_t> tempPoly;
 
 			// for every triangle..
 			for (unsigned int i = 0; i < tempSize; i += 3)
 			{
-				tempPoly = new std::vector<uint32_t>;
+				tempPoly.clear();
 
 				// ..get the 3 indices and save them
 				for (int j = 0; j < 3; j++)
 				{
 					std::uint32_t tempValue;
 					fsMesh.read(reinterpret_cast<char*>(&tempValue), sizeof(std::uint32_t));
-					tempPoly->push_back(tempValue);
+					tempPoly.push_back(tempValue);
 				}
 				tempData->meshIndices.push_back(tempPoly);
 			}
-			continue;
 		}
 	}
 	dataDestination->segmLst.push_back(tempData);
@@ -574,7 +587,7 @@ void Object::readUV(Segment* dataDestination, std::streampos position)
 /////////////////////////////////////////////////////////////////////////
 // public getter
 
-std::vector<Modl*> Object::getModels() const
+std::vector<Modl*>* Object::getModels() const
 {
 	return vModls;
 }
@@ -584,6 +597,11 @@ std::vector<std::string> Object::getTextureList() const
 	return vTextures;
 }
 
+Bbox Object::getBoundgBox() const
+{
+	return boundingBox;
+}
+
 
 /////////////////////////////////////////////////////////////////////////
 // public functions

MshViewer/Source/OpenGlController.cpp

@@ -109,37 +109,43 @@ void OpenGLController::processInit()
 
 void OpenGLController::deleteVectors()
 {
-	while (!vModels.empty())
+	//TODO: does .clear() work, too??
+	if (vModels != NULL)
 	{
-		Modl* cursor = vModels.back();
-		vModels.pop_back();
-
-		while (!cursor->segmLst.empty())
+		while (!vModels->empty())
 		{
-			Segment* segmCuror = cursor->segmLst.back();
-			cursor->segmLst.pop_back();
+			Modl* cursor = vModels->back();
+			vModels->pop_back();
 
-			delete segmCuror->uv;
-			delete segmCuror->vertex;
-
-			while (!segmCuror->meshIndices.empty())
+			while (!cursor->segmLst.empty())
 			{
-				std::vector<std::uint32_t>* meshCursor = segmCuror->meshIndices.back();
-				meshCursor->clear();
-				segmCuror->meshIndices.pop_back();
-				delete meshCursor;
+				Segment* segmCuror = cursor->segmLst.back();
+				cursor->segmLst.pop_back();
+
+				delete[] segmCuror->uv;
+				delete[] segmCuror->vertex;
+
+				while (!segmCuror->meshIndices.empty())
+				{
+					while (!segmCuror->meshIndices.back().empty())
+						segmCuror->meshIndices.back().pop_back();
+					
+					segmCuror->meshIndices.pop_back();
+				}
+
+				delete segmCuror;
 			}
 
-			delete segmCuror;
+			delete cursor;
 		}
-		
-		delete cursor;
+		delete vModels;
 	}
 
 	while (!vTextures.empty())
 	{
 		textureData* cursor = vTextures.back();
 		vTextures.pop_back();
+		cursor->data->clear();
 		delete cursor->data;
 		delete cursor;
 	}
@@ -207,16 +213,16 @@ glm::mat4 OpenGLController::getModelMatrix(unsigned int index)
 {
 	glm::mat4 tempParentMatrix = glm::mat4(1.0f);
 
-	for (unsigned int loop = 0; loop < vModels.size(); loop++)
+	for (unsigned int loop = 0; loop < vModels->size(); loop++)
 	{
-		if (!strcmp(vModels[index]->parent.c_str(), vModels[loop]->name.c_str()))
+		if (!strcmp(vModels->at(index)->parent.c_str(), vModels->at(loop)->name.c_str()))
 		{
 			tempParentMatrix = getModelMatrix(loop);
 			break;
 		}
 	}
 
-	return tempParentMatrix * vModels[index]->m4x4Translation;
+	return tempParentMatrix * vModels->at(index)->m4x4Translation;
 }
 
 glm::mat4 OpenGLController::getMVPMatrix(unsigned int index)
@@ -237,8 +243,19 @@ glm::mat4 OpenGLController::getMVPMatrix(unsigned int index)
 	m4x4ModelRot = glm::rotate(m4x4ModelRot, fRotationY, glm::vec3(0, 1, 0));
 	m4x4ModelRot = glm::rotate(m4x4ModelRot, fRotationZ, glm::vec3(0, 0, 1));
 
+	// move to center
+	glm::mat4 m4x4ModelCenter = glm::translate(
+		glm::mat4(1.0f),
+		glm::vec3(-sceneBoundingBox.center[0], -sceneBoundingBox.center[1], -sceneBoundingBox.center[2])
+	);
+
+	//scale to 1
+	float maxExtent = max(max(sceneBoundingBox.extents[0], sceneBoundingBox.extents[1]), sceneBoundingBox.extents[2]);
+	glm::mat4 m4x4Normalize = glm::mat4(1.0f); 
+	m4x4Normalize = glm::scale(m4x4Normalize, glm::vec3(1/maxExtent, 1 / maxExtent, 1 / maxExtent));
+
 	// Return MVP
-	return m4x4Projection * m4x4View * m4x4ModelRot * getModelMatrix(index);
+	return m4x4Projection * m4x4View * m4x4ModelRot * m4x4Normalize * m4x4ModelCenter * getModelMatrix(index);
 }
 
 
@@ -309,52 +326,54 @@ void OpenGLController::updateScene()
 	// tell sampler to use texture unit 0
 	glUniform1i(gluiSamplerID, 0);
 
-	int instanceOffset(0);
-
-	for (unsigned int modelIndex = 0; modelIndex < vModels.size(); modelIndex++)
+	if (vModels != NULL)
 	{
-		// skip null, bones, shadowMesh, hidden things (don't increase textrue index!!)
-		if (vModels[modelIndex]->type == null ||
-			vModels[modelIndex]->type == bone ||
-			vModels[modelIndex]->type == shadowMesh ||
-			vModels[modelIndex]->renderFlags == 1)
-			continue;
+		int instanceOffset(0);
 
-		for (auto& segIt : vModels[modelIndex]->segmLst)
+		for (unsigned int modelIndex = 0; modelIndex < vModels->size(); modelIndex++)
 		{
-			// give texture to the shader
-			std::uint32_t tempTexIndex = segIt->textureIndex >= vTextures.size() ? vTextures.size() - 1 : segIt->textureIndex;
+			// skip null, bones, shadowMesh, hidden things (don't increase textrue index!!)
+			if (vModels->at(modelIndex)->type == null ||
+				vModels->at(modelIndex)->type == bone ||
+				vModels->at(modelIndex)->type == shadowMesh ||
+				vModels->at(modelIndex)->renderFlags == 1)
+				continue;
 
-			glTexImage2D(
-				GL_TEXTURE_2D,
-				0,
-				vTextures[tempTexIndex]->alpha ? GL_RGBA : GL_RGB,
-				vTextures[tempTexIndex]->width,
-				vTextures[tempTexIndex]->height,
-				0,
-				vTextures[tempTexIndex]->alpha ? GL_BGRA : GL_BGR,
-				GL_UNSIGNED_BYTE,
-				vTextures[tempTexIndex]->data->data()
-			);
+			for (auto& segIt : vModels->at(modelIndex)->segmLst)
+			{
+				// give texture to the shader
+				std::uint32_t tempTexIndex = segIt->textureIndex >= vTextures.size() ? vTextures.size() - 1 : segIt->textureIndex;
 
-			glGenerateMipmap(GL_TEXTURE_2D);
+				glTexImage2D(
+					GL_TEXTURE_2D,
+					0,
+					vTextures[tempTexIndex]->alpha ? GL_RGBA : GL_RGB,
+					vTextures[tempTexIndex]->width,
+					vTextures[tempTexIndex]->height,
+					0,
+					vTextures[tempTexIndex]->alpha ? GL_BGRA : GL_BGR,
+					GL_UNSIGNED_BYTE,
+					vTextures[tempTexIndex]->data->data()
+				);
 
-			// give the MVP to the shader
-			glUniformMatrix4fv(gluiMatrixID, 1, GL_FALSE, &getMVPMatrix(modelIndex)[0][0]);
+				glGenerateMipmap(GL_TEXTURE_2D);
 
-			// calculate the number of vertex
-			unsigned int vertexCount(0);
-			for (auto& it : segIt->meshIndices)
-				vertexCount += (it->size() - 2) * 3;
+				// give the MVP to the shader
+				glUniformMatrix4fv(gluiMatrixID, 1, GL_FALSE, &getMVPMatrix(modelIndex)[0][0]);
+
+				// calculate the number of vertex
+				unsigned int vertexCount(0);
+				for (auto& it : segIt->meshIndices)
+					vertexCount += (it.size() - 2) * 3;
 
 
-			glDrawArrays(GL_TRIANGLES, instanceOffset, vertexCount);
+				glDrawArrays(GL_TRIANGLES, instanceOffset, vertexCount);
 
-			// increase the offset
-			instanceOffset += vertexCount;
+				// increase the offset
+				instanceOffset += vertexCount;
+			}
 		}
 	}
-
 	glfwSwapBuffers(pWindow);
 	glfwPollEvents();
 }
@@ -372,26 +391,27 @@ void OpenGLController::loadMsh(const char * path)
 		Object obj(path);
 		vModels = obj.getModels();
 		tempTexList = obj.getTextureList();
+		sceneBoundingBox = obj.getBoundgBox();
 	}
 	catch (std::invalid_argument e)
 	{
 		MessageBox(NULL, e.what(), "MeshViewer 2.0 Error", MB_OK | MB_ICONERROR);
-		return; exit(1);
+		return;
 	}
 
 	// collect vertex data of all models
 	std::vector<Vertex> tempBufferData;
 
-	for (auto& modIt : vModels)		// for every model chunk
+	for (auto& modIt : *vModels)		// for every model chunk
 	{
 		for (auto& segIt : modIt->segmLst)		// for every cluster
 		{
 			for (auto& mshIt : segIt->meshIndices)		// for every polygon
 			{
-				if (mshIt->size() >= 3)		// multipoly
+				if (mshIt.size() >= 3)		// multipoly
 				{
 					// for every triangle of the multi polygon
-					for (unsigned int tri = 0; tri < mshIt->size() - 2; tri++)
+					for (unsigned int tri = 0; tri < mshIt.size() - 2; tri++)
 					{
 						// for every edge of the triangle
 						for (int triEdge = 0; triEdge < 3; triEdge++)
@@ -399,7 +419,7 @@ void OpenGLController::loadMsh(const char * path)
 							Vertex tempVertex;
 							// every edge has 3 coordinates
 							for (int j = 0; j < 3; j++)
-								tempVertex.position[j] = (GLfloat)segIt->vertex[(*mshIt)[triEdge > 0 ? tri + triEdge : 0] * 3 + j];
+								tempVertex.position[j] = (GLfloat)segIt->vertex[mshIt[tri + triEdge - ((tri % 2) * (triEdge - 1) * 2)] * 3 + j];
 
 							// and 2 UV
 							if (segIt->uv == NULL)
@@ -410,7 +430,7 @@ void OpenGLController::loadMsh(const char * path)
 							else
 							{
 								for (int j = 0; j < 2; j++)
-									tempVertex.uv[j] = (GLfloat)segIt->uv[(*mshIt)[triEdge > 0 ? tri + triEdge : 0] * 2 + j];
+									tempVertex.uv[j] = (GLfloat)segIt->uv[mshIt[tri + triEdge - ((tri % 2) * (triEdge - 1) * 2)] * 2 + j];
 							}
 							tempBufferData.push_back(tempVertex);
 						}
@@ -436,6 +456,8 @@ void OpenGLController::loadMsh(const char * path)
 	);
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
+	tempBufferData.clear();
+
 
 	// get textures path
 	std::string tempPath = path;
@@ -455,11 +477,10 @@ void OpenGLController::loadMsh(const char * path)
 			tempData->alpha = tempTex.hasAlpha();
 			tempData->width = tempTex.getWidth();
 			tempData->height = tempTex.getHeight();
-			tempData->data = new std::vector<std::uint8_t>(tempTex.getData());
+			tempData->data = tempTex.getData();
 		}
 		catch (std::invalid_argument e)
 		{
-			GLubyte solidColor[4] = { 0, 0, 255, 255 };
 			tempData->alpha = true;
 			tempData->width = 1;
 			tempData->height = 1;
@@ -471,7 +492,6 @@ void OpenGLController::loadMsh(const char * path)
 
 	// add a solid default color at the end (maybe there is an invalid index later)
 	textureData* tempData = new textureData;
-	GLubyte solidColor[4] = { 0, 0, 255, 255 };
 	tempData->alpha = true;
 	tempData->width = 1;
 	tempData->height = 1;

MshViewer/Source/Texture.cpp

@@ -13,35 +13,26 @@ TextureTGA::TextureTGA(const char * filePath)
 	std::uint8_t ui8x18Header[19] = { 0 };
 	fsPicture.read(reinterpret_cast<char*>(&ui8x18Header), sizeof(ui8x18Header)-1);
 	
+	//get variables
+	vui8Pixels = new std::vector<std::uint8_t>;
+	bool bCompressed;
+	std::uint32_t ui32IDLength;
+	std::uint32_t ui32PicType;
+	std::uint32_t ui32PaletteLength;
+	std::uint32_t ui32Size;
+
 	// extract all information from header
 	ui32IDLength = ui8x18Header[0];
-	bColorTabel = ui8x18Header[1] == 1;
 	ui32PicType = ui8x18Header[2];
-	ui32PaletteBegin = ui8x18Header[4] * 0x100 + ui8x18Header[3];
 	ui32PaletteLength = ui8x18Header[6] * 0x100 + ui8x18Header[5];
-	ui32PaletteBpP = ui8x18Header[7];
 	ui32Width = ui8x18Header[13] * 0x100 + ui8x18Header[12];
 	ui32Height = ui8x18Header[15] * 0x100 + ui8x18Header[14];
 	ui32BpP = ui8x18Header[16];
-	ui32Attribut = ui8x18Header[17];
 
 	// calculate some more information
 	ui32Size = ui32Width * ui32Height * ui32BpP/8;
 	bCompressed = ui32PicType == 9 || ui32PicType == 10;
-	vui8Pixels.resize(ui32Size);
-
-	/* consol output of the header
-	std::cout << "Header\n"
-		<< "ID l<>nge: " << ui32IDLength << std::endl
-		<< "Farbtabelle: " << (int)bColorTabel << std::endl
-		<< "Bildtype: " << ui32PicType << std::endl
-		<< "Palletenbegin: " << ui32PaletteBegin << std::endl
-		<< "Palletenl<6E>ngen: " << ui32PaletteLength << std::endl
-		<< "Bits pro Palleteneintrag: " << ui32PaletteBpP << std::endl
-		<< "Breite: " << ui32Width << std::endl
-		<< "H<>he: " << ui32Height << std::endl
-		<< "Bit pro Pixel: " << ui32BpP << std::endl
-		<< "Bild Attribute: " << ui32Attribut << std::endl;*/
+	vui8Pixels->resize(ui32Size);
 
 	// jump to the data block
 	fsPicture.seekg(ui32IDLength + ui32PaletteLength, std::ios_base::cur);
@@ -49,7 +40,7 @@ TextureTGA::TextureTGA(const char * filePath)
 	// If not compressed 24 or 32 bit
 	if (ui32PicType == 2 && (ui32BpP == 24 || ui32BpP == 32))
 	{
-		fsPicture.read(reinterpret_cast<char*>(vui8Pixels.data()), ui32Size);
+		fsPicture.read(reinterpret_cast<char*>(vui8Pixels->data()), ui32Size);
 	}
 	// else if compressed 24 or 32 bit
 	else if (ui32PicType == 10 && (ui32BpP == 24 || ui32BpP == 32))	// compressed
@@ -57,7 +48,6 @@ TextureTGA::TextureTGA(const char * filePath)
 		std::uint8_t tempChunkHeader;
 		std::uint8_t tempData[5];
 		unsigned int tempByteIndex = 0;
-		std::size_t tempPixelIndex = 0;
 
 		do {
 			fsPicture.read(reinterpret_cast<char*>(&tempChunkHeader), sizeof(tempChunkHeader));
@@ -71,10 +61,10 @@ TextureTGA::TextureTGA(const char * filePath)
 
 				for (int i = 0; i <= tempChunkHeader; i++)
 				{
-					vui8Pixels[tempByteIndex++] = tempData[0];
-					vui8Pixels[tempByteIndex++] = tempData[1];
-					vui8Pixels[tempByteIndex++] = tempData[2];
-					if(ui32BpP == 32) vui8Pixels[tempByteIndex++] = tempData[3];
+					vui8Pixels->at(tempByteIndex++) = tempData[0];
+					vui8Pixels->at(tempByteIndex++) = tempData[1];
+					vui8Pixels->at(tempByteIndex++) = tempData[2];
+					if(ui32BpP == 32) vui8Pixels->at(tempByteIndex++) = tempData[3];
 				}
 			}
 			else						// data count
@@ -86,10 +76,10 @@ TextureTGA::TextureTGA(const char * filePath)
 				{
 					fsPicture.read(reinterpret_cast<char*>(&tempData), ui32BpP/8);
 
-					vui8Pixels[tempByteIndex++] = tempData[0];
-					vui8Pixels[tempByteIndex++] = tempData[1];
-					vui8Pixels[tempByteIndex++] = tempData[2];
-					if (ui32BpP == 32) vui8Pixels[tempByteIndex++] = tempData[3];
+					vui8Pixels->at(tempByteIndex++) = tempData[0];
+					vui8Pixels->at(tempByteIndex++) = tempData[1];
+					vui8Pixels->at(tempByteIndex++) = tempData[2];
+					if (ui32BpP == 32) vui8Pixels->at(tempByteIndex++) = tempData[3];
 				}
 			}
 		} while (tempByteIndex < ui32Size);
@@ -106,10 +96,9 @@ TextureTGA::TextureTGA(const char * filePath)
 
 TextureTGA::~TextureTGA()
 {
-	vui8Pixels.clear();
 }
 
-std::vector<std::uint8_t> TextureTGA::getData() const
+std::vector<std::uint8_t>* TextureTGA::getData() const
 {
 	return vui8Pixels;
 }

MshViewer/main.cpp

@@ -17,7 +17,9 @@ int main(int argc, char** argv)
 	else
 		scene = OpenGLController::getInstance();
 
-	scene->loadMsh("..\\Release\\Msh\\cluster.msh");
+#ifdef _DEBUG
+	scene->loadMsh("..\\Release\\Msh\\quadPoly.msh");
+#endif // DEBUG
 
 	do {
 		scene->updateScene();

README.md

@@ -13,10 +13,7 @@ Feel free to use my code the way you like. But remember i used some public libra
 licence, too.
 
 ### To Do
-- cluster use wrong textures
-- use normals or fix ccw and cw
-- multipoly triangulation not 100% good
-- cloth testing
+- cloth not working correctly
 - optional display bones, shadow, collision,...
 - integrate into a software:
 -> gui open file ( + drag and drop),