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

- update tools/ 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1149 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-02-03 16:26:11 +00:00
parent 075b1acaf0
commit f07901df9d
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/assimp_cmd/ImageExtractor.cpp
View File

@ -59,7 +59,7 @@ const char* AICMD_MSG_DUMP_HELP_E =
; ;
#define AI_EXTRACT_WRITE_BMP_ALPHA 0x1 #define AI_EXTRACT_WRITE_BMP_ALPHA 0x1
#include "Compiler/pushpack1.h" #include <assimp/Compiler/pushpack1.h>
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------
// Data structure for the first header of a BMP // Data structure for the first header of a BMP
@ -114,7 +114,7 @@ struct TGA_HEADER
} PACK_STRUCT; } PACK_STRUCT;
#include "Compiler/poppack1.h" #include <assimp/Compiler/poppack1.h>
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------
// Save a texture as bitmap // Save a texture as bitmap

12
tools/assimp_cmd/Main.h
View File

@ -53,14 +53,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <time.h> #include <time.h>
#include <limits> #include <limits>
#include <aiPostProcess.h> #include <assimp/aiPostProcess.h>
#include <aiVersion.h> #include <assimp/aiVersion.h>
#include <aiScene.h> #include <assimp/aiScene.h>
#include <assimp.hpp> #include <assimp/assimp.hpp>
#include <DefaultLogger.h> #include <assimp/DefaultLogger.h>
#ifndef ASSIMP_BUILD_NO_EXPORT #ifndef ASSIMP_BUILD_NO_EXPORT
# include <export.hpp> # include <assimp/export.hpp>
#endif #endif
#include <../code/AssimpPCH.h> /* to get stdint.h */ #include <../code/AssimpPCH.h> /* to get stdint.h */

24
tools/assimp_view/assimp_view.h
View File

@ -48,21 +48,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "resource.h" #include "resource.h"
// Include ASSIMP headers (XXX: do we really need all of them?) // Include ASSIMP headers (XXX: do we really need all of them?)
#include "assimp.h" #include <assimp/assimp.h>
#include "assimp.hpp" #include <assimp/assimp.hpp>
#include "aiAssert.h" #include <assimp/aiAssert.h>
#include "aiFileIO.h" #include <assimp/aiFileIO.h>
#include "aiPostProcess.h" #include <assimp/aiPostProcess.h>
#include "aiScene.h" #include <assimp/aiScene.h>
#include "IOSystem.h" #include <assimp/IOSystem.h>
#include "IOStream.h" #include <assimp/IOStream.h>
#include "LogStream.h" #include <assimp/LogStream.h>
#include "DefaultLogger.h" #include <assimp/DefaultLogger.h>
#include "../../code/AssimpPCH.h" /* HACK */ #include "../../code/AssimpPCH.h" /* HACK */
#include "MaterialSystem.h" // aiMaterial clas #include "../../code/MaterialSystem.h" // aiMaterial class
#include "StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp #include "../../code/StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
// in order for std::min and std::max to behave properly // in order for std::min and std::max to behave properly
#ifdef min #ifdef min