v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
pull/1/head
aramis_acg 2008-05-22 10:20:31 +00:00
parent c6d5acf604
commit 8c002e6998
107 changed files with 666 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/3DSConverter.cpp
View File

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

2
code/3DSGenNormals.cpp
View File

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

2
code/3DSHelper.h
View File

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

2
code/3DSLoader.cpp
View File

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

2
code/3DSLoader.h
View File

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

2
code/3DSSpatialSort.cpp
View File

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

2
code/3DSSpatialSort.h
View File

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

2
code/ASELoader.cpp
View File

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

2
code/ASELoader.h
View File

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

2
code/ASEParser.cpp
View File

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

2
code/ASEParser.h
View File

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

2
code/Assimp.cpp
View File

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

2
code/BaseImporter.cpp
View File

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

2
code/BaseImporter.h
View File

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

2
code/BaseProcess.h
View File

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

2
code/ByteSwap.h
View File

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

2
code/CalcTangentsProcess.cpp
View File

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

2
code/CalcTangentsProcess.h
View File

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

2
code/ConvertToLHProcess.h
View File

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

2
code/DefaultIOStream.cpp
View File

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

2
code/DefaultIOStream.h
View File

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

2
code/DefaultIOSystem.cpp
View File

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

2
code/DefaultIOSystem.h
View File

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

2
code/DefaultLogger.cpp
View File

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

2
code/DefaultLogger.h
View File

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

2
code/GenFaceNormalsProcess.cpp
View File

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

2
code/GenFaceNormalsProcess.h
View File

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

2
code/GenVertexNormalsProcess.cpp
View File

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

2
code/GenVertexNormalsProcess.h
View File

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

2
code/Importer.cpp
View File

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

49
code/JNICalls.cpp 100644
View File

@ -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

2
code/JoinVerticesProcess.cpp
View File

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

2
code/JoinVerticesProcess.h
View File

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

2
code/KillNormalsProcess.cpp
View File

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

2
code/KillNormalsProcess.h
View File

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

2
code/MD2FileData.h
View File

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

2
code/MD2Loader.cpp
View File

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

2
code/MD2Loader.h
View File

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

2
code/MD2NormalTable.h
View File

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

2
code/MD3FileData.h
View File

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

2
code/MD3Loader.cpp
View File

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

2
code/MD3Loader.h
View File

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

2
code/MD4FileData.h
View File

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

2
code/MD4Loader.cpp
View File

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

2
code/MD4Loader.h
View File

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

2
code/MD5Loader.h
View File

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

2
code/MDLDefaultColorMap.h
View File

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

2
code/MDLFileData.h
View File

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

91
code/MDLLoader.cpp
View File

@ -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())
@ -1763,3 +1790,59 @@ void MDLImporter::JoinSkins_GameStudioA7(
}
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;
}

16
code/MDLLoader.h
View File

@ -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 */

2
code/MaterialSystem.cpp
View File

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

2
code/MaterialSystem.h
View File

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

2
code/ObjFileData.h
View File

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

2
code/ObjFileImporter.h
View File

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

2
code/ObjFileMtlImporter.h
View File

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

2
code/ObjFileParser.h
View File

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

2
code/ObjTools.h
View File

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

2
code/PlyLoader.cpp
View File

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

2
code/PlyLoader.h
View File

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

2
code/PlyParser.cpp
View File

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

2
code/PlyParser.h
View File

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

2
code/SpatialSort.cpp
View File

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

2
code/SpatialSort.h
View File

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

2
code/SplitLargeMeshes.cpp
View File

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

2
code/SplitLargeMeshes.h
View File

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

2
code/TriangulateProcess.h
View File

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

2
code/XFileHelper.h
View File

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

2
code/XFileImporter.cpp
View File

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

2
code/XFileImporter.h
View File

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

2
code/XFileParser.cpp
View File

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

2
code/XFileParser.h
View File

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

46
code/res/assimp.rc
View File

@ -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,12 @@ 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
@ -63,6 +65,44 @@ BEGIN
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
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x407, 1200
END
END
#endif // !!ASSIMP_JNI_EXPORT
#endif // Deutsch (Deutschland) resources
/////////////////////////////////////////////////////////////////////////////

BIN
doc/ImporterNotes.rtf
View File

Binary file not shown.

2
doc/Preamble.txt
View File

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

2
include/aiAnim.h
View File

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

2
include/aiFileIO.h
View File

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

2
include/aiMaterial.h
View File

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

2
include/aiMesh.h
View File

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

2
include/aiPostProcess.h
View File

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

2
include/aiScene.h
View File

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

2
include/aiTexture.h
View File

@ -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

2
include/aiTypes.h
View File

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

2
include/assimp.h
View File

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

2
include/assimp.hpp
View File

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

2
tools/assimp_view/AssetHelper.h
View File

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

2
tools/assimp_view/Background.cpp
View File

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

2
tools/assimp_view/Display.cpp
View File

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

2
tools/assimp_view/Display.h
View File

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

2
tools/assimp_view/HelpDialog.cpp
View File

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

2
tools/assimp_view/Input.cpp
View File

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

2
tools/assimp_view/LogDisplay.cpp
View File

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

2
tools/assimp_view/LogDisplay.h
View File

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

2
tools/assimp_view/LogWindow.cpp
View File

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

2
tools/assimp_view/LogWindow.h
View File

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

2
tools/assimp_view/Material.cpp
View File

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

2
tools/assimp_view/MaterialManager.h
View File

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

2
tools/assimp_view/MeshRenderer.cpp
View File

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

2
tools/assimp_view/MeshRenderer.h
View File

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

2
tools/assimp_view/MessageProc.cpp
View File

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

2
tools/assimp_view/Normals.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More