Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).
Added a working makefile for mingw, provides more configs now. Not perfect yet. Added decompression part of zlib (inflate). Moved IrrXML to ./contrib dir. Moved some IRR/IRRmesh shared code. FIXME: makefile for gnu/linux is untested yet. Code cleanup. Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives. OBJ loader supports map_bump, map_ka, map_ks, map_ns now. Endianess conversion in the ply loader is correct now. Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -42,20 +42,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
/** @file Implementation of the DXF importer class */
|
||||
|
||||
#include "AssimpPCH.h"
|
||||
|
||||
#ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
|
||||
|
||||
#include "DXFLoader.h"
|
||||
#include "ParsingUtils.h"
|
||||
#include "fast_atof.h"
|
||||
|
||||
|
||||
using namespace Assimp;
|
||||
|
||||
// AutoCAD Binary DXF<CR><LF><SUB><NULL>
|
||||
#define AI_DXF_BINARY_IDENT ("AutoCAD Binary DXF\r\n\x1a\0")
|
||||
#define AI_DXF_BINARY_IDENT_LEN (24)
|
||||
|
||||
|
||||
// color indices for DXF - 16 are supported
|
||||
static aiColor4D g_aclrDxfIndexColors[] =
|
||||
{
|
||||
@@ -113,6 +111,7 @@ bool DXFImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler) const
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Get a copy of the next data line, skip strange data
|
||||
bool DXFImporter::GetNextLine()
|
||||
{
|
||||
if(!SkipLine(&buffer))
|
||||
@@ -135,6 +134,7 @@ bool DXFImporter::GetNextLine()
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Get the next token in the file
|
||||
bool DXFImporter::GetNextToken()
|
||||
{
|
||||
if (bRepeat)
|
||||
@@ -626,4 +626,5 @@ bool DXFImporter::Parse3DFace()
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif // !! ASSIMP_BUILD_NO_DXF_IMPORTER
|
||||
|
||||
|
||||
Reference in New Issue
Block a user