Changed "Free" to "Open", Java build configs, port directory added, intellij idea5.1 project file added

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@25 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/3DSConverter.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSGenNormals.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSHelper.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSLoader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSLoader.h

@@ -1,6 +1,6 @@
 
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSSpatialSort.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/3DSSpatialSort.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ASELoader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ASELoader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ASEParser.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ASEParser.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/Assimp.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/BaseImporter.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/BaseImporter.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/BaseProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ByteSwap.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/CalcTangentsProcess.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/CalcTangentsProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ConvertToLHProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultIOStream.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultIOStream.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultIOSystem.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultIOSystem.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultLogger.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/DefaultLogger.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/GenFaceNormalsProcess.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/GenFaceNormalsProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/GenVertexNormalsProcess.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/GenVertexNormalsProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/Importer.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/JNICalls.cpp

@@ -0,0 +1,49 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (ASSIMP)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2008, ASSIMP Development Team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, 
+with or without modification, are permitted provided that the following 
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the ASSIMP team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the ASSIMP Development Team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+
+/** @file Implementation of the JNI API for jAssimp */
+
+#if (defined ASSIMP_JNI_EXPORT)
+
+// include the JNI API
+#include <jni.h>
+
+#endif // !ASSIMP_JNI_EXPORT

code/JoinVerticesProcess.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/JoinVerticesProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/KillNormalsProcess.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/KillNormalsProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD2FileData.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD2Loader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD2Loader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD2NormalTable.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD3FileData.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD3Loader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD3Loader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD4FileData.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD4Loader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD4Loader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MD5Loader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MDLDefaultColorMap.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MDLFileData.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MDLLoader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team
@@ -147,12 +147,14 @@ void MDLImporter::InternReadFile(
 	if (AI_MDL_MAGIC_NUMBER_BE == this->m_pcHeader->ident ||
 		AI_MDL_MAGIC_NUMBER_LE == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: Quake 1, magic word is IDPO");
 		this->InternReadFile_Quake1();
 	}
 	// GameStudio A4 MDL3 format
 	else if (AI_MDL_MAGIC_NUMBER_BE_GS4 == this->m_pcHeader->ident ||
 			 AI_MDL_MAGIC_NUMBER_LE_GS4 == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: 3D GameStudio A4, magic word is MDL3");
 		this->iGSFileVersion = 3;
 		this->InternReadFile_GameStudio();
 	}
@@ -160,6 +162,7 @@ void MDLImporter::InternReadFile(
 	else if (AI_MDL_MAGIC_NUMBER_BE_GS5a == this->m_pcHeader->ident ||
 			 AI_MDL_MAGIC_NUMBER_LE_GS5a == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: 3D GameStudio A4, magic word is MDL4");
 		this->iGSFileVersion = 4;
 		this->InternReadFile_GameStudio();
 	}
@@ -167,6 +170,7 @@ void MDLImporter::InternReadFile(
 	else if (AI_MDL_MAGIC_NUMBER_BE_GS5b == this->m_pcHeader->ident ||
 			 AI_MDL_MAGIC_NUMBER_LE_GS5b == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: 3D GameStudio A5, magic word is MDL5");
 		this->iGSFileVersion = 5;
 		this->InternReadFile_GameStudio();
 	}
@@ -174,6 +178,7 @@ void MDLImporter::InternReadFile(
 	else if (AI_MDL_MAGIC_NUMBER_BE_GS6 == this->m_pcHeader->ident ||
 			 AI_MDL_MAGIC_NUMBER_LE_GS6 == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: 3D GameStudio A6, magic word is MDL6");
 		this->iGSFileVersion = 6;
 		this->InternReadFile_GameStudio();
 	}
@@ -181,9 +186,19 @@ void MDLImporter::InternReadFile(
 	else if (AI_MDL_MAGIC_NUMBER_BE_GS7 == this->m_pcHeader->ident ||
 			 AI_MDL_MAGIC_NUMBER_LE_GS7 == this->m_pcHeader->ident)
 	{
+		DefaultLogger::get()->debug("MDL subtype: 3D GameStudio A7, magic word is MDL7");
 		this->iGSFileVersion = 7;
 		this->InternReadFile_GameStudioA7();
 	}
+	// IDST/IDSQ Format (CS:S/HL², etc ...)
+	else if (AI_MDL_MAGIC_NUMBER_BE_HL2a == this->m_pcHeader->ident ||
+			 AI_MDL_MAGIC_NUMBER_LE_HL2a == this->m_pcHeader->ident ||
+			 AI_MDL_MAGIC_NUMBER_BE_HL2b == this->m_pcHeader->ident ||
+			 AI_MDL_MAGIC_NUMBER_LE_HL2b == this->m_pcHeader->ident)
+	{
+		DefaultLogger::get()->debug("MDL subtype: CS:S\\HL², magic word is IDST/IDSQ");
+		this->InternReadFile_HL2();
+	}
 	else
 	{
 		// we're definitely unable to load this file
@@ -191,6 +206,10 @@ void MDLImporter::InternReadFile(
 			". Magic word is not known");
 	}
 
+	// make sure that the normals are facing outwards
+	for (unsigned int i = 0; i < pScene->mNumMeshes;++i)
+		this->FlipNormals(pScene->mMeshes[i]);
+
 	// delete the file buffer
 	delete[] this->mBuffer;
 	return;
@@ -208,6 +227,9 @@ void MDLImporter::SearchPalette(const unsigned char** pszColorMap)
 		{
 			szColorMap = new unsigned char[256*3];
 			pcStream->Read(const_cast<unsigned char*>(szColorMap),256*3,1);
+
+			DefaultLogger::get()->info("Found valid colormap.lmp in directory. "
+				"It will be used to decode embedded textures in palletized formats.");
 		}
 		delete pcStream;
 		pcStream = NULL;
@@ -861,7 +883,7 @@ void MDLImporter::InternReadFile_GameStudio( )
 		}
 
 	}
-	// short packed vertices
+	// short packed vertices (duplicating the code is smaller than using templates ....)
 	else
 	{
 		// now get a pointer to the first frame in the file
@@ -970,7 +992,7 @@ void MDLImporter::InternReadFile_GameStudio( )
 			{
 				(*i).x /= iWidth;
 				(*i).y /= iHeight;
-				(*i).y = 1.0f- (*i).y;
+				(*i).y = 1.0f- (*i).y; // DX to OGL
 			}
 		}
 	}
@@ -1048,7 +1070,7 @@ void MDLImporter::ParseSkinLump_GameStudioA7(
 	}
 	if (0x7 == iMasked)
 	{
-		// ***** REFERENCE TO EXTERNAL FILE FILE *****
+		// ***** REFERENCE TO EXTERNAL FILE *****
 		if (1 != pcSkin->height)
 		{
 			DefaultLogger::get()->warn("Found a reference to an external texture, "
@@ -1147,6 +1169,8 @@ void MDLImporter::ParseSkinLump_GameStudioA7(
 		pcMatOut->AddProperty<aiColor4D>(&clrTemp,1,AI_MATKEY_COLOR_EMISSIVE);
 
 		// FIX: Take the opacity from the ambient color
+		// the doc says something else, but it is fact that MED exports the
+		// opacity like this .... ARRRGGHH!
 		clrTemp.a = pcMatIn->Ambient.a;
 		pcMatOut->AddProperty<float>(&clrTemp.a,1,AI_MATKEY_OPACITY);
 
@@ -1677,6 +1701,9 @@ void MDLImporter::GenerateOutputMeshes_GameStudioA7(
 	const std::vector<aiVector3D>& vTextureCoords1,
 	const std::vector<aiVector3D>& vTextureCoords2)
 {
+	ai_assert(NULL != aiSplit);
+	ai_assert(NULL != pcFaces);
+
 	for (unsigned int i = 0; i < pcMats.size();++i)
 	{
 		if (!aiSplit[i]->empty())
@@ -1762,4 +1789,60 @@ void MDLImporter::JoinSkins_GameStudioA7(
 		pcMatOut->AddProperty(&sString,AI_MATKEY_TEXTURE_DIFFUSE(1));
 	}
 	return;
+}
+// ------------------------------------------------------------------------------------------------
+void MDLImporter::FlipNormals(aiMesh* pcMesh)
+{
+	ai_assert(NULL != pcMesh);
+
+	// compute the bounding box of both the model vertices + normals and
+	// the umodified model vertices. Then check whether the first BB
+	// is smaller than the second. In this case we can assume that the
+	// normals need to be flipped, although there are a few special cases ..
+	// convex, concave, planar models ...
+
+	aiVector3D vMin0(1e10f,1e10f,1e10f);
+	aiVector3D vMin1(1e10f,1e10f,1e10f);
+	aiVector3D vMax0(-1e10f,-1e10f,-1e10f);
+	aiVector3D vMax1(-1e10f,-1e10f,-1e10f);
+
+	for (unsigned int i = 0; i < pcMesh->mNumVertices;++i)
+	{
+		vMin1.x = std::min(vMin1.x,pcMesh->mVertices[i].x);
+		vMin1.y = std::min(vMin1.y,pcMesh->mVertices[i].y);
+		vMin1.z = std::min(vMin1.z,pcMesh->mVertices[i].z);
+
+		vMax1.x = std::max(vMax1.x,pcMesh->mVertices[i].x);
+		vMax1.y = std::max(vMax1.y,pcMesh->mVertices[i].y);
+		vMax1.z = std::max(vMax1.z,pcMesh->mVertices[i].z);
+
+		aiVector3D vWithNormal = pcMesh->mVertices[i] + pcMesh->mNormals[i];
+
+		vMin0.x = std::min(vMin0.x,vWithNormal.x);
+		vMin0.y = std::min(vMin0.y,vWithNormal.y);
+		vMin0.z = std::min(vMin0.z,vWithNormal.z);
+
+		vMax0.x = std::max(vMax0.x,vWithNormal.x);
+		vMax0.y = std::max(vMax0.y,vWithNormal.y);
+		vMax0.z = std::max(vMax0.z,vWithNormal.z);
+	}
+
+	if (fabsf((vMax0.x - vMin0.x) * (vMax0.y - vMin0.y) * (vMax0.z - vMin0.z)) <= 
+		fabsf((vMax1.x - vMin1.x) * (vMax1.y - vMin1.y) * (vMax1.z - vMin1.z)))
+	{
+		DefaultLogger::get()->info("The models normals are facing inwards "
+			"(or the model is too planar or concave). Flipping the normal set ...");
+
+		for (unsigned int i = 0; i < pcMesh->mNumVertices;++i)
+		{
+			pcMesh->mNormals[i] *= -1.0f;
+		}
+	}
+	return;
+}
+// ------------------------------------------------------------------------------------------------
+void MDLImporter::InternReadFile_HL2( )
+{
+	const MDL::Header_HL2* pcHeader = (const MDL::Header_HL2*)this->mBuffer;
+	return;
 }

code/MDLLoader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team
@@ -117,6 +117,11 @@ protected:
 	*/
 	void InternReadFile_GameStudioA7( );
 
+	// -------------------------------------------------------------------
+	/** Import a CS:S/HL2 MDL file
+	*/
+	void InternReadFile_HL2( );
+
 	// -------------------------------------------------------------------
 	/** Load a paletized texture from the file and convert it to 32bpp
 	*/
@@ -216,6 +221,15 @@ protected:
 	 */
 	void FreePalette(const unsigned char* pszColorMap);
 
+	// -------------------------------------------------------------------
+	/** Try to determine whether the normals of the model are flipped
+	 *  Some MDL7 models seem to have flipped normals (and there is also 
+	 *  an option "flip normals" in MED). However, I don't see a proper
+	 *  way to read from the file whether all normals are correctly 
+	 *  facing outwards ...
+	 */
+	void FlipNormals(aiMesh* pcMesh);
+
 private:
 
 	/** Header of the MDL file */

code/MaterialSystem.cpp

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/MaterialSystem.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ObjFileData.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ObjFileImporter.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ObjFileMtlImporter.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ObjFileParser.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/ObjTools.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/PlyLoader.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/PlyLoader.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/PlyParser.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/PlyParser.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/SpatialSort.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/SpatialSort.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/SplitLargeMeshes.cpp

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/SplitLargeMeshes.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/TriangulateProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/XFileHelper.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/XFileImporter.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/XFileImporter.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/XFileParser.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/XFileParser.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

code/res/assimp.rc

@@ -29,6 +29,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 // Version
 //
 
+#if (!defined ASSIMP_JNI_EXPORT)
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,1
  PRODUCTVERSION 1,0,0,1
@@ -48,12 +50,48 @@ BEGIN
         BEGIN
             VALUE "Comments", "Licensed under a 3-clause BSD license"
             VALUE "CompanyName", "ASSIMP Development Team"
-            VALUE "FileDescription", "Free Asset Import Library "
+            VALUE "FileDescription", "Open Asset Import Library "
             VALUE "FileVersion", "1, 0, 0, 0"
             VALUE "InternalName", "assimp"
             VALUE "LegalCopyright", "Copyright (C) 2008"
-            VALUE "OriginalFilename", "assimp32.dll"
-            VALUE "ProductName", "Free Asset Import Library "
+            VALUE "OriginalFilename", "assimpNN.dll"
+            VALUE "ProductName", "Open Asset Import Library "
+            VALUE "ProductVersion", "1, 0, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x407, 1200
+    END
+END
+
+#else
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x7L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040704b0"
+        BEGIN
+            VALUE "Comments", "Licensed under a 3-clause BSD license"
+            VALUE "CompanyName", "ASSIMP Development Team"
+            VALUE "FileDescription", "ASSIMP-JNI bridge module"
+            VALUE "FileVersion", "1, 0, 0, 0"
+            VALUE "InternalName", "jassimp"
+            VALUE "LegalCopyright", "Copyright (C) 2008"
+            VALUE "OriginalFilename", "jAssimpNN.dll"
+            VALUE "ProductName", "ASSIMP-JNI bridge module"
             VALUE "ProductVersion", "1, 0, 0, 0"
         END
     END
@@ -63,6 +101,8 @@ BEGIN
     END
 END
 
+#endif // !!ASSIMP_JNI_EXPORT 
+
 #endif    // Deutsch (Deutschland) resources
 /////////////////////////////////////////////////////////////////////////////
 

doc/Preamble.txt

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiAnim.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiFileIO.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiMaterial.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiMesh.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiPostProcess.h

@@ -1,5 +1,5 @@
 /*
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiScene.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/aiTexture.h

@@ -1,6 +1,6 @@
 
 /** 
- ** This file is part of the Free Asset Import Library ASSIMP.
+ ** This file is part of the Open Asset Import Library ASSIMP.
  ** -------------------------------------------------------------------------
  **
  ** ASSIMP is free software: you can redistribute it and/or modify it 

include/aiTypes.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/assimp.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

include/assimp.hpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/AssetHelper.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Background.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Display.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Display.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/HelpDialog.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Input.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/LogDisplay.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/LogDisplay.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/LogWindow.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/LogWindow.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Material.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/MaterialManager.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/MeshRenderer.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/MeshRenderer.h

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/MessageProc.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team

tools/assimp_view/Normals.cpp

@@ -1,6 +1,6 @@
 /*
 ---------------------------------------------------------------------------
-Free Asset Import Library (ASSIMP)
+Open Asset Import Library (ASSIMP)
 ---------------------------------------------------------------------------
 
 Copyright (c) 2006-2008, ASSIMP Development Team