From 8c002e69989409e853df9b258f39d92070206b67 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Thu, 22 May 2008 10:20:31 +0000 Subject: [PATCH] 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 | 2 +- code/3DSGenNormals.cpp | 2 +- code/3DSHelper.h | 2 +- code/3DSLoader.cpp | 2 +- code/3DSLoader.h | 2 +- code/3DSSpatialSort.cpp | 2 +- code/3DSSpatialSort.h | 2 +- code/ASELoader.cpp | 2 +- code/ASELoader.h | 2 +- code/ASEParser.cpp | 2 +- code/ASEParser.h | 2 +- code/Assimp.cpp | 2 +- code/BaseImporter.cpp | 2 +- code/BaseImporter.h | 2 +- code/BaseProcess.h | 2 +- code/ByteSwap.h | 2 +- code/CalcTangentsProcess.cpp | 2 +- code/CalcTangentsProcess.h | 2 +- code/ConvertToLHProcess.h | 2 +- code/DefaultIOStream.cpp | 2 +- code/DefaultIOStream.h | 2 +- code/DefaultIOSystem.cpp | 2 +- code/DefaultIOSystem.h | 2 +- code/DefaultLogger.cpp | 2 +- code/DefaultLogger.h | 2 +- code/GenFaceNormalsProcess.cpp | 2 +- code/GenFaceNormalsProcess.h | 2 +- code/GenVertexNormalsProcess.cpp | 2 +- code/GenVertexNormalsProcess.h | 2 +- code/Importer.cpp | 2 +- code/JNICalls.cpp | 49 +++++++ code/JoinVerticesProcess.cpp | 2 +- code/JoinVerticesProcess.h | 2 +- code/KillNormalsProcess.cpp | 2 +- code/KillNormalsProcess.h | 2 +- code/MD2FileData.h | 2 +- code/MD2Loader.cpp | 2 +- code/MD2Loader.h | 2 +- code/MD2NormalTable.h | 2 +- code/MD3FileData.h | 2 +- code/MD3Loader.cpp | 2 +- code/MD3Loader.h | 2 +- code/MD4FileData.h | 2 +- code/MD4Loader.cpp | 2 +- code/MD4Loader.h | 2 +- code/MD5Loader.h | 2 +- code/MDLDefaultColorMap.h | 2 +- code/MDLFileData.h | 2 +- code/MDLLoader.cpp | 91 ++++++++++++- code/MDLLoader.h | 16 ++- code/MaterialSystem.cpp | 2 +- code/MaterialSystem.h | 2 +- code/ObjFileData.h | 2 +- code/ObjFileImporter.h | 2 +- code/ObjFileMtlImporter.h | 2 +- code/ObjFileParser.h | 2 +- code/ObjTools.h | 2 +- code/PlyLoader.cpp | 2 +- code/PlyLoader.h | 2 +- code/PlyParser.cpp | 2 +- code/PlyParser.h | 2 +- code/SpatialSort.cpp | 2 +- code/SpatialSort.h | 2 +- code/SplitLargeMeshes.cpp | 2 +- code/SplitLargeMeshes.h | 2 +- code/TriangulateProcess.h | 2 +- code/XFileHelper.h | 2 +- code/XFileImporter.cpp | 2 +- code/XFileImporter.h | 2 +- code/XFileParser.cpp | 2 +- code/XFileParser.h | 2 +- code/res/assimp.rc | 46 ++++++- doc/ImporterNotes.rtf | Bin 2335 -> 2335 bytes doc/Preamble.txt | 2 +- include/aiAnim.h | 2 +- include/aiFileIO.h | 2 +- include/aiMaterial.h | 2 +- include/aiMesh.h | 2 +- include/aiPostProcess.h | 2 +- include/aiScene.h | 2 +- include/aiTexture.h | 2 +- include/aiTypes.h | 2 +- include/assimp.h | 2 +- include/assimp.hpp | 2 +- tools/assimp_view/AssetHelper.h | 2 +- tools/assimp_view/Background.cpp | 2 +- tools/assimp_view/Display.cpp | 2 +- tools/assimp_view/Display.h | 2 +- tools/assimp_view/HelpDialog.cpp | 2 +- tools/assimp_view/Input.cpp | 2 +- tools/assimp_view/LogDisplay.cpp | 2 +- tools/assimp_view/LogDisplay.h | 2 +- tools/assimp_view/LogWindow.cpp | 2 +- tools/assimp_view/LogWindow.h | 2 +- tools/assimp_view/Material.cpp | 2 +- tools/assimp_view/MaterialManager.h | 2 +- tools/assimp_view/MeshRenderer.cpp | 2 +- tools/assimp_view/MeshRenderer.h | 2 +- tools/assimp_view/MessageProc.cpp | 2 +- tools/assimp_view/Normals.cpp | 2 +- tools/assimp_view/Shaders.cpp | 2 +- tools/assimp_view/assimp_view.cpp | 2 +- tools/assimp_view/assimp_view.h | 2 +- tools/assimp_view/assimp_view.rc | 2 +- workspaces/jidea5.1/jAssimp.ipr | 199 ++++++++++++++++++++++++++++ workspaces/vc8/assimp.sln | 20 ++- workspaces/vc8/assimp.vcproj | 157 ++++++++++++++++++++++ 107 files changed, 666 insertions(+), 110 deletions(-) create mode 100644 code/JNICalls.cpp create mode 100644 workspaces/jidea5.1/jAssimp.ipr diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp index 6ec6b5339..92a1905c7 100644 --- a/code/3DSConverter.cpp +++ b/code/3DSConverter.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSGenNormals.cpp b/code/3DSGenNormals.cpp index 2e9356ecf..57c09160a 100644 --- a/code/3DSGenNormals.cpp +++ b/code/3DSGenNormals.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSHelper.h b/code/3DSHelper.h index d53bf9bc8..5adc9fa00 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp index f313bade8..239a07701 100644 --- a/code/3DSLoader.cpp +++ b/code/3DSLoader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSLoader.h b/code/3DSLoader.h index 517cb25b7..c330948be 100644 --- a/code/3DSLoader.h +++ b/code/3DSLoader.h @@ -1,6 +1,6 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSSpatialSort.cpp b/code/3DSSpatialSort.cpp index ac0bdd98a..e03d059f5 100644 --- a/code/3DSSpatialSort.cpp +++ b/code/3DSSpatialSort.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/3DSSpatialSort.h b/code/3DSSpatialSort.h index 8078ccf81..a8e9a44d1 100644 --- a/code/3DSSpatialSort.h +++ b/code/3DSSpatialSort.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp index 042ba367d..f00d4b763 100644 --- a/code/ASELoader.cpp +++ b/code/ASELoader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ASELoader.h b/code/ASELoader.h index 760180779..6ba01cf5a 100644 --- a/code/ASELoader.h +++ b/code/ASELoader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ASEParser.cpp b/code/ASEParser.cpp index 68345e082..7c101b4b0 100644 --- a/code/ASEParser.cpp +++ b/code/ASEParser.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ASEParser.h b/code/ASEParser.h index 012e4b450..68d329b96 100644 --- a/code/ASEParser.h +++ b/code/ASEParser.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/Assimp.cpp b/code/Assimp.cpp index a5cc75d2e..b9bb0cce8 100644 --- a/code/Assimp.cpp +++ b/code/Assimp.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index d3bb8d3cb..382678675 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/BaseImporter.h b/code/BaseImporter.h index 32ab5b22b..48194ef98 100644 --- a/code/BaseImporter.h +++ b/code/BaseImporter.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/BaseProcess.h b/code/BaseProcess.h index 79b79e04e..c66cd72d1 100644 --- a/code/BaseProcess.h +++ b/code/BaseProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ByteSwap.h b/code/ByteSwap.h index 153d117be..54fa22d4f 100644 --- a/code/ByteSwap.h +++ b/code/ByteSwap.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/CalcTangentsProcess.cpp b/code/CalcTangentsProcess.cpp index 74a88ccab..76eb04b2e 100644 --- a/code/CalcTangentsProcess.cpp +++ b/code/CalcTangentsProcess.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/CalcTangentsProcess.h b/code/CalcTangentsProcess.h index fb37fd981..1621ba822 100644 --- a/code/CalcTangentsProcess.h +++ b/code/CalcTangentsProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h index 5647f1e92..9f2adcf16 100644 --- a/code/ConvertToLHProcess.h +++ b/code/ConvertToLHProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultIOStream.cpp b/code/DefaultIOStream.cpp index 17bcf876e..2ddb7f6cf 100644 --- a/code/DefaultIOStream.cpp +++ b/code/DefaultIOStream.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultIOStream.h b/code/DefaultIOStream.h index 8e687f99c..1ef9cdcc0 100644 --- a/code/DefaultIOStream.h +++ b/code/DefaultIOStream.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultIOSystem.cpp b/code/DefaultIOSystem.cpp index 5f1de7f80..4feb0705c 100644 --- a/code/DefaultIOSystem.cpp +++ b/code/DefaultIOSystem.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultIOSystem.h b/code/DefaultIOSystem.h index 14605a666..147fb2673 100644 --- a/code/DefaultIOSystem.h +++ b/code/DefaultIOSystem.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp index dd8ce1aef..8971cedf5 100644 --- a/code/DefaultLogger.cpp +++ b/code/DefaultLogger.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/DefaultLogger.h b/code/DefaultLogger.h index 29152a9f1..1ae2cdbfc 100644 --- a/code/DefaultLogger.h +++ b/code/DefaultLogger.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/GenFaceNormalsProcess.cpp b/code/GenFaceNormalsProcess.cpp index c6f1c999c..79cb74166 100644 --- a/code/GenFaceNormalsProcess.cpp +++ b/code/GenFaceNormalsProcess.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h index 52c154148..1e4d99af3 100644 --- a/code/GenFaceNormalsProcess.h +++ b/code/GenFaceNormalsProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/GenVertexNormalsProcess.cpp b/code/GenVertexNormalsProcess.cpp index c61977c2f..c605cef4f 100644 --- a/code/GenVertexNormalsProcess.cpp +++ b/code/GenVertexNormalsProcess.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h index 516bcc9c4..4f04e90f7 100644 --- a/code/GenVertexNormalsProcess.h +++ b/code/GenVertexNormalsProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/Importer.cpp b/code/Importer.cpp index b5b634025..3ab4fc4f8 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/JNICalls.cpp b/code/JNICalls.cpp new file mode 100644 index 000000000..4e5325f20 --- /dev/null +++ b/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 + +#endif // !ASSIMP_JNI_EXPORT \ No newline at end of file diff --git a/code/JoinVerticesProcess.cpp b/code/JoinVerticesProcess.cpp index 9afd28295..b0348277a 100644 --- a/code/JoinVerticesProcess.cpp +++ b/code/JoinVerticesProcess.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h index 277f4b5cd..9ca1b9a04 100644 --- a/code/JoinVerticesProcess.h +++ b/code/JoinVerticesProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/KillNormalsProcess.cpp b/code/KillNormalsProcess.cpp index 342ad8fc7..d7c40a2dd 100644 --- a/code/KillNormalsProcess.cpp +++ b/code/KillNormalsProcess.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/KillNormalsProcess.h b/code/KillNormalsProcess.h index 698c0d92a..d7f7b65e6 100644 --- a/code/KillNormalsProcess.h +++ b/code/KillNormalsProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD2FileData.h b/code/MD2FileData.h index 9a8b8b615..907bf528f 100644 --- a/code/MD2FileData.h +++ b/code/MD2FileData.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp index 57d8a9974..c2f6301c1 100644 --- a/code/MD2Loader.cpp +++ b/code/MD2Loader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD2Loader.h b/code/MD2Loader.h index e70bc7e3b..f26dbdeb2 100644 --- a/code/MD2Loader.h +++ b/code/MD2Loader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD2NormalTable.h b/code/MD2NormalTable.h index 12440707f..129cfc173 100644 --- a/code/MD2NormalTable.h +++ b/code/MD2NormalTable.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD3FileData.h b/code/MD3FileData.h index 21f9b6ee5..398198ac2 100644 --- a/code/MD3FileData.h +++ b/code/MD3FileData.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp index e6197ac7a..2c4d6d5ab 100644 --- a/code/MD3Loader.cpp +++ b/code/MD3Loader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD3Loader.h b/code/MD3Loader.h index 94f008c09..f34af8d8c 100644 --- a/code/MD3Loader.h +++ b/code/MD3Loader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD4FileData.h b/code/MD4FileData.h index 5a6064aa5..d75d3ec3c 100644 --- a/code/MD4FileData.h +++ b/code/MD4FileData.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD4Loader.cpp b/code/MD4Loader.cpp index 250d08c65..f806e3e9e 100644 --- a/code/MD4Loader.cpp +++ b/code/MD4Loader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD4Loader.h b/code/MD4Loader.h index 147c38fc8..2560f0cb1 100644 --- a/code/MD4Loader.h +++ b/code/MD4Loader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MD5Loader.h b/code/MD5Loader.h index 83244d1b3..01144e006 100644 --- a/code/MD5Loader.h +++ b/code/MD5Loader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MDLDefaultColorMap.h b/code/MDLDefaultColorMap.h index 76762edc8..009d23d7a 100644 --- a/code/MDLDefaultColorMap.h +++ b/code/MDLDefaultColorMap.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MDLFileData.h b/code/MDLFileData.h index 7a4d41f2d..e49e0abcc 100644 --- a/code/MDLFileData.h +++ b/code/MDLFileData.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp index 606eb8471..e47254575 100644 --- a/code/MDLLoader.cpp +++ b/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(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(&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(&clrTemp.a,1,AI_MATKEY_OPACITY); @@ -1677,6 +1701,9 @@ void MDLImporter::GenerateOutputMeshes_GameStudioA7( const std::vector& vTextureCoords1, const std::vector& 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; } \ No newline at end of file diff --git a/code/MDLLoader.h b/code/MDLLoader.h index e9275c666..a1b75e6d5 100644 --- a/code/MDLLoader.h +++ b/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 */ diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp index 39a8e1037..065ef0f0c 100644 --- a/code/MaterialSystem.cpp +++ b/code/MaterialSystem.cpp @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/MaterialSystem.h b/code/MaterialSystem.h index a72d917ae..54ebee3f6 100644 --- a/code/MaterialSystem.h +++ b/code/MaterialSystem.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ObjFileData.h b/code/ObjFileData.h index 60975a952..d5052a50a 100644 --- a/code/ObjFileData.h +++ b/code/ObjFileData.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ObjFileImporter.h b/code/ObjFileImporter.h index 7ee8c318b..19401a579 100644 --- a/code/ObjFileImporter.h +++ b/code/ObjFileImporter.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ObjFileMtlImporter.h b/code/ObjFileMtlImporter.h index ea0357a7c..fd0bff02f 100644 --- a/code/ObjFileMtlImporter.h +++ b/code/ObjFileMtlImporter.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h index 528676d0a..9ca3f5756 100644 --- a/code/ObjFileParser.h +++ b/code/ObjFileParser.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/ObjTools.h b/code/ObjTools.h index 1f3a72c01..ab1c0e390 100644 --- a/code/ObjTools.h +++ b/code/ObjTools.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 23fd2cc37..ef175d97f 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/PlyLoader.h b/code/PlyLoader.h index 8b4a316dc..e99f1ec0e 100644 --- a/code/PlyLoader.h +++ b/code/PlyLoader.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp index cb2f3e287..c20caacea 100644 --- a/code/PlyParser.cpp +++ b/code/PlyParser.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/PlyParser.h b/code/PlyParser.h index b8a35440f..7c19f43c0 100644 --- a/code/PlyParser.h +++ b/code/PlyParser.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/SpatialSort.cpp b/code/SpatialSort.cpp index fad57134f..17f52fd16 100644 --- a/code/SpatialSort.cpp +++ b/code/SpatialSort.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/SpatialSort.h b/code/SpatialSort.h index a6e5579f9..289040d62 100644 --- a/code/SpatialSort.h +++ b/code/SpatialSort.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/SplitLargeMeshes.cpp b/code/SplitLargeMeshes.cpp index 977fda6e3..89de99778 100644 --- a/code/SplitLargeMeshes.cpp +++ b/code/SplitLargeMeshes.cpp @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h index becf0fba2..6e4ba19b0 100644 --- a/code/SplitLargeMeshes.h +++ b/code/SplitLargeMeshes.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/TriangulateProcess.h b/code/TriangulateProcess.h index 10cde2eb6..5d63e4f69 100644 --- a/code/TriangulateProcess.h +++ b/code/TriangulateProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/XFileHelper.h b/code/XFileHelper.h index e1133a6a4..ca1b20bed 100644 --- a/code/XFileHelper.h +++ b/code/XFileHelper.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp index 380de4db9..e57edcec0 100644 --- a/code/XFileImporter.cpp +++ b/code/XFileImporter.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/XFileImporter.h b/code/XFileImporter.h index 8118f9f46..b929056bd 100644 --- a/code/XFileImporter.h +++ b/code/XFileImporter.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp index 02c3ee815..037973d53 100644 --- a/code/XFileParser.cpp +++ b/code/XFileParser.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/XFileParser.h b/code/XFileParser.h index a4968e49a..16f8be747 100644 --- a/code/XFileParser.h +++ b/code/XFileParser.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/code/res/assimp.rc b/code/res/assimp.rc index 29e0a77b8..127f2e734 100644 --- a/code/res/assimp.rc +++ b/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,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 ///////////////////////////////////////////////////////////////////////////// diff --git a/doc/ImporterNotes.rtf b/doc/ImporterNotes.rtf index 0c1cb54c5b0d47cf5d71ce60bf43c803d29d5a66..23fcfd1f544261c550327929cd542acd037cc051 100644 GIT binary patch delta 17 YcmbO)G+$_g3L}euL2BM+4aV>605X*Yr~m)} delta 17 YcmbO)G+$_g3L}eKQEKXD4aV>605Tp0m;e9( diff --git a/doc/Preamble.txt b/doc/Preamble.txt index 93ff96f28..2293293a6 100644 --- a/doc/Preamble.txt +++ b/doc/Preamble.txt @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiAnim.h b/include/aiAnim.h index 49f046f16..8bf62b87f 100644 --- a/include/aiAnim.h +++ b/include/aiAnim.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiFileIO.h b/include/aiFileIO.h index 561a4abfe..b59edc642 100644 --- a/include/aiFileIO.h +++ b/include/aiFileIO.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiMaterial.h b/include/aiMaterial.h index 0387a8c2e..56b51682b 100644 --- a/include/aiMaterial.h +++ b/include/aiMaterial.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiMesh.h b/include/aiMesh.h index d8746a2f4..c561ff870 100644 --- a/include/aiMesh.h +++ b/include/aiMesh.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiPostProcess.h b/include/aiPostProcess.h index 29a1d0c13..359b43f08 100644 --- a/include/aiPostProcess.h +++ b/include/aiPostProcess.h @@ -1,5 +1,5 @@ /* -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiScene.h b/include/aiScene.h index dff35f1e9..b0dc10208 100644 --- a/include/aiScene.h +++ b/include/aiScene.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/aiTexture.h b/include/aiTexture.h index 764a6b4f8..333c9321f 100644 --- a/include/aiTexture.h +++ b/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 diff --git a/include/aiTypes.h b/include/aiTypes.h index 31d7f47fe..9ea2ea0e0 100644 --- a/include/aiTypes.h +++ b/include/aiTypes.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/assimp.h b/include/assimp.h index c55802136..b54fd2d33 100644 --- a/include/assimp.h +++ b/include/assimp.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/include/assimp.hpp b/include/assimp.hpp index df80903a6..cc7e725d0 100644 --- a/include/assimp.hpp +++ b/include/assimp.hpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/tools/assimp_view/AssetHelper.h b/tools/assimp_view/AssetHelper.h index 72c3a1a2d..cc815d036 100644 --- a/tools/assimp_view/AssetHelper.h +++ b/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 diff --git a/tools/assimp_view/Background.cpp b/tools/assimp_view/Background.cpp index 0d63453a5..07ee0afe4 100644 --- a/tools/assimp_view/Background.cpp +++ b/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 diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp index 59c5fc9c9..396be06e5 100644 --- a/tools/assimp_view/Display.cpp +++ b/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 diff --git a/tools/assimp_view/Display.h b/tools/assimp_view/Display.h index 44e4a1718..2fde5428f 100644 --- a/tools/assimp_view/Display.h +++ b/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 diff --git a/tools/assimp_view/HelpDialog.cpp b/tools/assimp_view/HelpDialog.cpp index 604fba59b..60742cfc8 100644 --- a/tools/assimp_view/HelpDialog.cpp +++ b/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 diff --git a/tools/assimp_view/Input.cpp b/tools/assimp_view/Input.cpp index d9da956b8..59a5059cf 100644 --- a/tools/assimp_view/Input.cpp +++ b/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 diff --git a/tools/assimp_view/LogDisplay.cpp b/tools/assimp_view/LogDisplay.cpp index 0c720e622..d4e48faf0 100644 --- a/tools/assimp_view/LogDisplay.cpp +++ b/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 diff --git a/tools/assimp_view/LogDisplay.h b/tools/assimp_view/LogDisplay.h index 4fb947ecd..9117374ae 100644 --- a/tools/assimp_view/LogDisplay.h +++ b/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 diff --git a/tools/assimp_view/LogWindow.cpp b/tools/assimp_view/LogWindow.cpp index d172ccdee..c30b0c167 100644 --- a/tools/assimp_view/LogWindow.cpp +++ b/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 diff --git a/tools/assimp_view/LogWindow.h b/tools/assimp_view/LogWindow.h index da5a00a4f..c9c365285 100644 --- a/tools/assimp_view/LogWindow.h +++ b/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 diff --git a/tools/assimp_view/Material.cpp b/tools/assimp_view/Material.cpp index 8b2e0ab47..52e892846 100644 --- a/tools/assimp_view/Material.cpp +++ b/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 diff --git a/tools/assimp_view/MaterialManager.h b/tools/assimp_view/MaterialManager.h index 705e8cfe1..363d632fb 100644 --- a/tools/assimp_view/MaterialManager.h +++ b/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 diff --git a/tools/assimp_view/MeshRenderer.cpp b/tools/assimp_view/MeshRenderer.cpp index 00153cdb9..d9dae890d 100644 --- a/tools/assimp_view/MeshRenderer.cpp +++ b/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 diff --git a/tools/assimp_view/MeshRenderer.h b/tools/assimp_view/MeshRenderer.h index c153c6685..b4617627f 100644 --- a/tools/assimp_view/MeshRenderer.h +++ b/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 diff --git a/tools/assimp_view/MessageProc.cpp b/tools/assimp_view/MessageProc.cpp index b2f73d69c..221e96ea7 100644 --- a/tools/assimp_view/MessageProc.cpp +++ b/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 diff --git a/tools/assimp_view/Normals.cpp b/tools/assimp_view/Normals.cpp index 190f3ad6d..78a612813 100644 --- a/tools/assimp_view/Normals.cpp +++ b/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 diff --git a/tools/assimp_view/Shaders.cpp b/tools/assimp_view/Shaders.cpp index 64e21ca42..69350c073 100644 --- a/tools/assimp_view/Shaders.cpp +++ b/tools/assimp_view/Shaders.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/tools/assimp_view/assimp_view.cpp b/tools/assimp_view/assimp_view.cpp index 5672e3e22..e5c4bdbcc 100644 --- a/tools/assimp_view/assimp_view.cpp +++ b/tools/assimp_view/assimp_view.cpp @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h index 3f9d1e2fc..8681838d4 100644 --- a/tools/assimp_view/assimp_view.h +++ b/tools/assimp_view/assimp_view.h @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------------- -Free Asset Import Library (ASSIMP) +Open Asset Import Library (ASSIMP) --------------------------------------------------------------------------- Copyright (c) 2006-2008, ASSIMP Development Team diff --git a/tools/assimp_view/assimp_view.rc b/tools/assimp_view/assimp_view.rc index cacb93841..1a16da64c 100644 --- a/tools/assimp_view/assimp_view.rc +++ b/tools/assimp_view/assimp_view.rc @@ -58,7 +58,7 @@ END IDD_DIALOGMAIN DIALOGEX 0, 0, 594, 384 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Free Asset Import Library - ModelViewer " +CAPTION "Open Asset Import Library - ModelViewer " MENU IDR_MENU1 FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/workspaces/jidea5.1/jAssimp.ipr b/workspaces/jidea5.1/jAssimp.ipr new file mode 100644 index 000000000..fe4ae4cf4 --- /dev/null +++ b/workspaces/jidea5.1/jAssimp.ipr @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workspaces/vc8/assimp.sln b/workspaces/vc8/assimp.sln index 6c00864fc..797b37559 100644 --- a/workspaces/vc8/assimp.sln +++ b/workspaces/vc8/assimp.sln @@ -1,35 +1,49 @@  Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp_view", "assimp_view.vcproj", "{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection ProjectSection(ProjectDependencies) = postProject {5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524} EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "assimp.vcproj", "{5691E159-2D9B-407F-971F-EA5C592DC524}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "assimp.vcproj", "{5691E159-2D9B-407F-971F-EA5C592DC524}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_DLL_Java|Win32 = Debug_DLL_Java|Win32 Debug_DLL|Win32 = Debug_DLL|Win32 Debug|Win32 = Debug|Win32 + Release_DLL_Java|Win32 = Release_DLL_Java|Win32 Release_DLL|Win32 = Release_DLL|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL_Java|Win32.ActiveCfg = Debug|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL_Java|Win32.Build.0 = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.ActiveCfg = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.ActiveCfg = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.Build.0 = Debug|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL_Java|Win32.ActiveCfg = Release|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL_Java|Win32.Build.0 = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.ActiveCfg = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.ActiveCfg = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.Build.0 = Release|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL_Java|Win32.ActiveCfg = Debug_DLL_Java|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL_Java|Win32.Build.0 = Debug_DLL_Java|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL|Win32.ActiveCfg = Debug_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL|Win32.Build.0 = Debug_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug|Win32.ActiveCfg = Debug|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug|Win32.Build.0 = Debug|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL_Java|Win32.ActiveCfg = Release_DLL_Java|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL_Java|Win32.Build.0 = Release_DLL_Java|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL|Win32.Build.0 = Release_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index e378e8afd..17c13b897 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -280,6 +280,151 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -615,6 +760,10 @@ > + + + + + +