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

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
pull/1/head
aramis_acg 2010-04-11 01:41:24 +00:00
parent f816066668
commit 01a25c1fb4
8 changed files with 215 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/CMakeLists.txt
View File

@ -393,9 +393,9 @@ SOURCE_GROUP( XFile FILES
) )
SOURCE_GROUP( Extra FILES SOURCE_GROUP( Extra FILES
extra/MakeVerboseFormat.cpp MakeVerboseFormat.cpp
extra/MakeVerboseFormat.h MakeVerboseFormat.h
extra/MD4FileData.h MD4FileData.h
) )
SOURCE_GROUP( IrrXML FILES SOURCE_GROUP( IrrXML FILES
@ -633,9 +633,9 @@ ADD_LIBRARY( assimp SHARED
fast_atof.h fast_atof.h
irrXMLWrapper.h irrXMLWrapper.h
qnan.h qnan.h
extra/MakeVerboseFormat.cpp MakeVerboseFormat.cpp
extra/MakeVerboseFormat.h MakeVerboseFormat.h
extra/MD4FileData.h MD4FileData.h
../contrib/irrXML/CXMLReaderImpl.h ../contrib/irrXML/CXMLReaderImpl.h
../contrib/irrXML/heapsort.h ../contrib/irrXML/heapsort.h
../contrib/irrXML/irrArray.h ../contrib/irrXML/irrArray.h

0
code/extra/MD4FileData.h → code/MD4FileData.h
View File

2
code/extra/MakeVerboseFormat.cpp → code/MakeVerboseFormat.cpp
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Implementation of the post processing step "MakeVerboseFormat" /** @file Implementation of the post processing step "MakeVerboseFormat"
*/ */
#include "../AssimpPCH.h" #include "AssimpPCH.h"
#include "MakeVerboseFormat.h" #include "MakeVerboseFormat.h"
using namespace Assimp; using namespace Assimp;

23
code/extra/MakeVerboseFormat.h → code/MakeVerboseFormat.h
View File

@ -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 /** @file Defines a post processing step to bring a given scene
into the verbose format that is expected by most postprocess steps. 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 #ifndef AI_MAKEVERBOSEFORMAT_H_INC
#define AI_MAKEVERBOSEFORMAT_H_INC #define AI_MAKEVERBOSEFORMAT_H_INC
#include "../BaseProcess.h" #include "BaseProcess.h"
#include "../../include/aiMesh.h" namespace Assimp {
namespace Assimp
{
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** MakeVerboseFormatProcess: Class to convert an asset to the verbose /** 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 * 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 * during import). It is intended for applications intending to modify the
* returned aiScene. After this step has been executed, they can execute * 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 * 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 * it has been moved to the main library since others might find it
* useful, too. * useful, too. */
*/
class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess
{ {
friend class Importer; friend class Importer;
protected: protected:
/** Constructor to be privately used by Importer, or by applications /** Constructor to be privately used by Importer, or by applications
which know what they are doing if they modify the aiScene object */ which know what they are doing if they modify the aiScene object */
MakeVerboseFormatProcess(); MakeVerboseFormatProcess();
@ -75,12 +75,12 @@ protected:
~MakeVerboseFormatProcess(); ~MakeVerboseFormatProcess();
public: public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Returns whether the processing step is present in the given flag field. /** Returns whether the processing step is present in the given flag field.
* @param pFlags The processing flags the importer was called with. A bitwise * @param pFlags The processing flags the importer was called with. A bitwise
* combination of #aiPostProcessSteps. * 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 bool IsActive( unsigned int /*pFlags*/ ) const
{ {
// NOTE: There is no direct flag that corresponds to // NOTE: There is no direct flag that corresponds to
@ -91,8 +91,7 @@ public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Executes the post processing step on the given imported data. /** Executes the post processing step on the given imported data.
* At the moment a process is not supposed to fail. * 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); void Execute( aiScene* pScene);

2
tools/assimp_view/Normals.cpp
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "GenVertexNormalsProcess.h" #include "GenVertexNormalsProcess.h"
#include "JoinVerticesProcess.h" #include "JoinVerticesProcess.h"
#include "CalcTangentsProcess.h" #include "CalcTangentsProcess.h"
#include "extra/MakeVerboseFormat.h" #include "MakeVerboseFormat.h"
namespace AssimpView { namespace AssimpView {

194
workspaces/vc8/assimp.vcproj
View File

@ -1301,103 +1301,7 @@
Name="extra" Name="extra"
> >
<File <File
RelativePath="..\..\code\extra\MakeVerboseFormat.cpp" RelativePath="..\..\code\MD4FileData.h"
>
<FileConfiguration
Name="debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\code\extra\MakeVerboseFormat.h"
>
</File>
<File
RelativePath="..\..\code\extra\MD4FileData.h"
> >
</File> </File>
</Filter> </Filter>
@ -3544,6 +3448,102 @@
RelativePath="..\..\code\LineSplitter.h" RelativePath="..\..\code\LineSplitter.h"
> >
</File> </File>
<File
RelativePath="..\..\code\MakeVerboseFormat.cpp"
>
<FileConfiguration
Name="debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\code\MakeVerboseFormat.h"
>
</File>
<File <File
RelativePath="..\..\code\MaterialSystem.cpp" RelativePath="..\..\code\MaterialSystem.cpp"
> >

194
workspaces/vc9/assimp.vcproj
View File

@ -1316,103 +1316,7 @@
Name="extra" Name="extra"
> >
<File <File
RelativePath="..\..\code\extra\MakeVerboseFormat.cpp" RelativePath="..\..\code\MD4FileData.h"
>
<FileConfiguration
Name="debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\code\extra\MakeVerboseFormat.h"
>
</File>
<File
RelativePath="..\..\code\extra\MD4FileData.h"
> >
</File> </File>
</Filter> </Filter>
@ -2367,6 +2271,102 @@
RelativePath="..\..\code\LineSplitter.h" RelativePath="..\..\code\LineSplitter.h"
> >
</File> </File>
<File
RelativePath="..\..\code\MakeVerboseFormat.cpp"
>
<FileConfiguration
Name="debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\code\MakeVerboseFormat.h"
>
</File>
<File <File
RelativePath="..\..\code\MaterialSystem.cpp" RelativePath="..\..\code\MaterialSystem.cpp"
> >

4
workspaces/vc9/assimp_cmd.vcproj
View File

@ -282,7 +282,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include" AdditionalIncludeDirectories="..\..\include;..\..\code\BoostWorkaround"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -361,7 +361,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\include" AdditionalIncludeDirectories="..\..\include;..\..\code\BoostWorkaround"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"