From 01a25c1fb458cb2a299c83818c5cd14d657954c2 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sun, 11 Apr 2010 01:41:24 +0000 Subject: [PATCH] Get rid of ./extra folder in ./code. Move contents to main code folder. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@664 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/CMakeLists.txt | 12 +- code/{extra => }/MD4FileData.h | 0 code/{extra => }/MakeVerboseFormat.cpp | 2 +- code/{extra => }/MakeVerboseFormat.h | 23 ++- tools/assimp_view/Normals.cpp | 2 +- workspaces/vc8/assimp.vcproj | 194 ++++++++++++------------- workspaces/vc9/assimp.vcproj | 194 ++++++++++++------------- workspaces/vc9/assimp_cmd.vcproj | 4 +- 8 files changed, 215 insertions(+), 216 deletions(-) rename code/{extra => }/MD4FileData.h (100%) rename code/{extra => }/MakeVerboseFormat.cpp (96%) rename code/{extra => }/MakeVerboseFormat.h (89%) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 8e114e7e9..71306cadb 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -393,9 +393,9 @@ SOURCE_GROUP( XFile FILES ) SOURCE_GROUP( Extra FILES - extra/MakeVerboseFormat.cpp - extra/MakeVerboseFormat.h - extra/MD4FileData.h + MakeVerboseFormat.cpp + MakeVerboseFormat.h + MD4FileData.h ) SOURCE_GROUP( IrrXML FILES @@ -633,9 +633,9 @@ ADD_LIBRARY( assimp SHARED fast_atof.h irrXMLWrapper.h qnan.h - extra/MakeVerboseFormat.cpp - extra/MakeVerboseFormat.h - extra/MD4FileData.h + MakeVerboseFormat.cpp + MakeVerboseFormat.h + MD4FileData.h ../contrib/irrXML/CXMLReaderImpl.h ../contrib/irrXML/heapsort.h ../contrib/irrXML/irrArray.h diff --git a/code/extra/MD4FileData.h b/code/MD4FileData.h similarity index 100% rename from code/extra/MD4FileData.h rename to code/MD4FileData.h diff --git a/code/extra/MakeVerboseFormat.cpp b/code/MakeVerboseFormat.cpp similarity index 96% rename from code/extra/MakeVerboseFormat.cpp rename to code/MakeVerboseFormat.cpp index fb3ed02a8..335e02e78 100644 --- a/code/extra/MakeVerboseFormat.cpp +++ b/code/MakeVerboseFormat.cpp @@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Implementation of the post processing step "MakeVerboseFormat" */ -#include "../AssimpPCH.h" +#include "AssimpPCH.h" #include "MakeVerboseFormat.h" using namespace Assimp; diff --git a/code/extra/MakeVerboseFormat.h b/code/MakeVerboseFormat.h similarity index 89% rename from code/extra/MakeVerboseFormat.h rename to code/MakeVerboseFormat.h index feb4bb12e..7140ffc02 100644 --- a/code/extra/MakeVerboseFormat.h +++ b/code/MakeVerboseFormat.h @@ -40,14 +40,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Defines a post processing step to bring a given scene into the verbose format that is expected by most postprocess steps. - This is the inverse of the "JoinIdenticalVertices" steps */ + This is the inverse of the "JoinIdenticalVertices" step. */ #ifndef AI_MAKEVERBOSEFORMAT_H_INC #define AI_MAKEVERBOSEFORMAT_H_INC -#include "../BaseProcess.h" -#include "../../include/aiMesh.h" -namespace Assimp - { +#include "BaseProcess.h" +namespace Assimp { // --------------------------------------------------------------------------- /** MakeVerboseFormatProcess: Class to convert an asset to the verbose @@ -57,16 +55,18 @@ namespace Assimp * This step has no official flag (since it wouldn't make sense to run it * during import). It is intended for applications intending to modify the * returned aiScene. After this step has been executed, they can execute - * other postprocess steps on the data. + * other postprocess steps on the data. The code might also be useful to + * quickly adapt code that doesn't result in a verbose representation of + * the scene data. * The step has been added because it was required by the viewer, however * it has been moved to the main library since others might find it - * useful, too. -*/ + * useful, too. */ class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess { friend class Importer; protected: + /** Constructor to be privately used by Importer, or by applications which know what they are doing if they modify the aiScene object */ MakeVerboseFormatProcess(); @@ -75,12 +75,12 @@ protected: ~MakeVerboseFormatProcess(); public: + // ------------------------------------------------------------------- /** Returns whether the processing step is present in the given flag field. * @param pFlags The processing flags the importer was called with. A bitwise * combination of #aiPostProcessSteps. - * @return true if the process is present in this flag fields, false if not. - */ + * @return true if the process is present in this flag fields, false if not */ bool IsActive( unsigned int /*pFlags*/ ) const { // NOTE: There is no direct flag that corresponds to @@ -91,8 +91,7 @@ public: // ------------------------------------------------------------------- /** Executes the post processing step on the given imported data. * At the moment a process is not supposed to fail. - * @param pScene The imported data to work at. - */ + * @param pScene The imported data to work at. */ void Execute( aiScene* pScene); diff --git a/tools/assimp_view/Normals.cpp b/tools/assimp_view/Normals.cpp index 8ab46f0d2..1a03d1cc3 100644 --- a/tools/assimp_view/Normals.cpp +++ b/tools/assimp_view/Normals.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "GenVertexNormalsProcess.h" #include "JoinVerticesProcess.h" #include "CalcTangentsProcess.h" -#include "extra/MakeVerboseFormat.h" +#include "MakeVerboseFormat.h" namespace AssimpView { diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index 8d622f46d..08ca4cd74 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -1301,103 +1301,7 @@ Name="extra" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3544,6 +3448,102 @@ RelativePath="..\..\code\LineSplitter.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workspaces/vc9/assimp.vcproj b/workspaces/vc9/assimp.vcproj index cae7136fd..766c6ce28 100644 --- a/workspaces/vc9/assimp.vcproj +++ b/workspaces/vc9/assimp.vcproj @@ -1316,103 +1316,7 @@ Name="extra" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2367,6 +2271,102 @@ RelativePath="..\..\code\LineSplitter.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workspaces/vc9/assimp_cmd.vcproj b/workspaces/vc9/assimp_cmd.vcproj index e8ed6beab..00358ed97 100644 --- a/workspaces/vc9/assimp_cmd.vcproj +++ b/workspaces/vc9/assimp_cmd.vcproj @@ -282,7 +282,7 @@ />