From 7d21c02e287cdcceeb30be3123a2ecc695b070dd Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sat, 13 Sep 2008 22:31:15 +0000 Subject: [PATCH] ASSIMP Beta 1, final fixes for the release. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@141 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- LICENSE | 35 +++ README | 5 +- code/BaseImporter.cpp | 3 + code/BaseImporter.h | 10 +- code/CalcTangentsProcess.h | 2 +- code/ConvertToLHProcess.h | 2 +- code/FixNormalsStep.h | 2 +- code/OptimizeGraphProcess.cpp | 1 + code/extra/MakeVerboseFormat.h | 2 +- include/DefaultLogger.h | 2 +- include/NullLogger.h | 2 +- workspaces/jidea5.1/jAssimp.ipr | 2 +- workspaces/vc8/UnitTest.vcproj | 8 +- workspaces/vc8/assimp.vcproj | 8 +- workspaces/vc8/assimp_view.vcproj | 358 ++++++++++++++++++++++++++++++ workspaces/vc8/jAssimp.vcproj | 2 +- 16 files changed, 423 insertions(+), 21 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..c3e88b4db --- /dev/null +++ b/LICENSE @@ -0,0 +1,35 @@ +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. diff --git a/README b/README index 9049c2d4b..92e76e495 100644 --- a/README +++ b/README @@ -44,8 +44,9 @@ are: /include Public headers. /lib Static libraries. /obj Object files. - /port Ports to other languages. The Java port is not finished, but - the Java part of the interface is fixed. + /port Ports to other languages. The Java port is not yet finished, but + the Java part of the interface is fixed. So: you can't use it, but + you can see how it will look like. /test Unit- and regression tests. /tools Tools. /workspaces Build enviroments. diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index f0ce83263..faee2fe7e 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../include/assimp.hpp" using namespace Assimp; + // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer BaseImporter::BaseImporter() @@ -97,3 +98,5 @@ void BaseImporter::SetupProperties(const Importer* pImp) // the default implementation does nothing } + + diff --git a/code/BaseImporter.h b/code/BaseImporter.h index 913d9db74..d729e33fb 100644 --- a/code/BaseImporter.h +++ b/code/BaseImporter.h @@ -43,18 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_BASEIMPORTER_H_INC #include +#include "./../include/aiTypes.h" struct aiScene; -namespace Assimp -{ +namespace Assimp { class IOSystem; class Importer; // --------------------------------------------------------------------------- /** Simple exception class to be thrown if an error occurs while importing. */ -class ImportErrorException +class ASSIMP_API ImportErrorException { public: /** Constructor with arguments */ @@ -82,7 +82,7 @@ private: * imports the given file. ReadFile is not overridable, it just calls * InternReadFile() and catches any ImportErrorException that might occur. */ -class BaseImporter +class ASSIMP_API BaseImporter { friend class Importer; @@ -187,6 +187,8 @@ protected: std::string mErrorText; }; + + } // end of namespace Assimp #endif // AI_BASEIMPORTER_H_INC diff --git a/code/CalcTangentsProcess.h b/code/CalcTangentsProcess.h index 5802f7a23..d871283d1 100644 --- a/code/CalcTangentsProcess.h +++ b/code/CalcTangentsProcess.h @@ -57,7 +57,7 @@ namespace Assimp * because the joining of vertices also considers tangents and bitangents for * uniqueness. */ -class CalcTangentsProcess : public BaseProcess +class ASSIMP_API CalcTangentsProcess : public BaseProcess { friend class Importer; diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h index dd6846bf3..69ff27e8c 100644 --- a/code/ConvertToLHProcess.h +++ b/code/ConvertToLHProcess.h @@ -57,7 +57,7 @@ namespace Assimp * invert the orientation of all faces, and adapting skinning and animation * data in a similar way. */ -class ConvertToLHProcess : public BaseProcess +class ASSIMP_API ConvertToLHProcess : public BaseProcess { friend class Importer; diff --git a/code/FixNormalsStep.h b/code/FixNormalsStep.h index 98c1999d4..0e200de91 100644 --- a/code/FixNormalsStep.h +++ b/code/FixNormalsStep.h @@ -55,7 +55,7 @@ namespace Assimp * vectors of an object are facing inwards. In this case they will be * flipped. */ -class FixInfacingNormalsProcess : public BaseProcess + class ASSIMP_API FixInfacingNormalsProcess : public BaseProcess { friend class Importer; diff --git a/code/OptimizeGraphProcess.cpp b/code/OptimizeGraphProcess.cpp index 738fbcccc..52338c3c2 100644 --- a/code/OptimizeGraphProcess.cpp +++ b/code/OptimizeGraphProcess.cpp @@ -847,6 +847,7 @@ void OptimizeGraphProcess::BuildOutputMeshList() // Executes the post processing step on the given imported data. void OptimizeGraphProcess::Execute( aiScene* pScene) { + throw new ImportErrorException("This step is disabled in this beta"); this->pScene = pScene; /* diff --git a/code/extra/MakeVerboseFormat.h b/code/extra/MakeVerboseFormat.h index c73e9ee61..ad5a3052a 100644 --- a/code/extra/MakeVerboseFormat.h +++ b/code/extra/MakeVerboseFormat.h @@ -62,7 +62,7 @@ namespace Assimp * it has been moved to the main library since others might find it * useful, too. */ -class MakeVerboseFormatProcess : public BaseProcess +class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess { friend class Importer; diff --git a/include/DefaultLogger.h b/include/DefaultLogger.h index 66773b364..75b616c73 100644 --- a/include/DefaultLogger.h +++ b/include/DefaultLogger.h @@ -58,7 +58,7 @@ struct LogStreamInfo; * The name can be set by creating the logger. If no filename was specified * the logger will use the standard out and error streams. */ -class DefaultLogger : +class ASSIMP_API DefaultLogger : public Logger { public: diff --git a/include/NullLogger.h b/include/NullLogger.h index 410894eb2..7fa5c1eaf 100644 --- a/include/NullLogger.h +++ b/include/NullLogger.h @@ -52,7 +52,7 @@ namespace Assimp * if the application hasn't specified a custom logger (or DefaultLogger) * via DefaultLogger::set() or DefaultLogger::create(); */ -class NullLogger : public Logger +class ASSIMP_API NullLogger : public Logger { public: /** @brief Logs a debug message */ diff --git a/workspaces/jidea5.1/jAssimp.ipr b/workspaces/jidea5.1/jAssimp.ipr index b35bfceac..d66e5dcc9 100644 --- a/workspaces/jidea5.1/jAssimp.ipr +++ b/workspaces/jidea5.1/jAssimp.ipr @@ -50,7 +50,7 @@