unchanged:
--- ./code/ACLoader.cpp.unbundle 2011-03-23 21:41:01.125343648 -0400
+++ ./code/ACLoader.cpp 2011-03-23 21:41:21.987343659 -0400
@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "Subdivision.h"
using namespace Assimp;
-
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// skip to the next token
unchanged:
--- ./code/ASEParser.cpp.unbundle 2011-03-23 21:41:47.254343631 -0400
+++ ./code/ASEParser.cpp 2011-03-23 21:42:15.258343625 -0400
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::ASE;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
unchanged:
--- ./code/BlenderDNA.cpp.unbundle 2011-03-23 21:44:29.224343605 -0400
+++ ./code/BlenderDNA.cpp 2011-03-23 21:44:41.802343605 -0400
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::Blender;
using namespace Assimp::Formatter;
-
+using namespace irr::core;
#define for_each BOOST_FOREACH
bool match4(StreamReaderAny& stream, const char* string) {
char tmp[] = {
unchanged:
--- ./code/BVHLoader.cpp.unbundle 2011-03-23 21:44:56.331343598 -0400
+++ ./code/BVHLoader.cpp 2011-03-23 21:45:12.305343508 -0400
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "SkeletonMeshBuilder.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/COBLoader.cpp.unbundle 2011-03-23 21:45:31.765343574 -0400
+++ ./code/COBLoader.cpp 2011-03-23 21:45:46.945343598 -0400
@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::COB;
using namespace Assimp::Formatter;
+using namespace irr::core;
#define for_each BOOST_FOREACH
unchanged:
--- ./code/ColladaLoader.cpp.unbundle 2011-03-23 21:45:55.314343575 -0400
+++ ./code/ColladaLoader.cpp 2011-03-23 21:46:10.225343577 -0400
@@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "time.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/ColladaParser.cpp.unbundle 2011-03-23 21:46:24.981343567 -0400
+++ ./code/ColladaParser.cpp 2011-03-23 21:46:47.605343536 -0400
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::Collada;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/CSMLoader.cpp.unbundle 2011-03-23 21:46:59.343343561 -0400
+++ ./code/CSMLoader.cpp 2011-03-23 21:47:18.005343554 -0400
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "fast_atof.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/DXFHelper.h.unbundle 2011-03-23 22:05:57.754343272 -0400
+++ ./code/DXFHelper.h 2011-03-23 22:12:02.645343177 -0400
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
namespace Assimp {
namespace DXF {
-
+using namespace irr::core;
// read pairs of lines, parse group code and value and provide utilities
// to convert the data to the target data type.
class LineReader
@@ -99,17 +99,17 @@ public:
// -----------------------------------------
unsigned int ValueAsUnsignedInt() const {
- return strtoul10(value.c_str());
+ return irr::core::strtoul10(value.c_str());
}
// -----------------------------------------
int ValueAsSignedInt() const {
- return strtol10(value.c_str());
+ return irr::core::strtol10(value.c_str());
}
// -----------------------------------------
float ValueAsFloat() const {
- return fast_atof(value.c_str());
+ return irr::core::fast_atof(value.c_str());
}
public:
@@ -125,7 +125,7 @@ public:
}
try {
- groupcode = strtol10(splitter->c_str());
+ groupcode = irr::core::strtol10(splitter->c_str());
splitter++;
value = *splitter;
unchanged:
--- ./code/DXFLoader.cpp.unbundle 2011-03-23 21:47:31.836343565 -0400
+++ ./code/DXFLoader.cpp 2011-03-23 21:47:49.751343542 -0400
@@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "DXFHelper.h"
using namespace Assimp;
+using namespace irr::core;
// AutoCAD Binary DXF<CR><LF><SUB><NULL>
#define AI_DXF_BINARY_IDENT ("AutoCAD Binary DXF\r\n\x1a\0")
unchanged:
--- ./code/IRRLoader.cpp.unbundle 2011-03-23 21:49:20.457343529 -0400
+++ ./code/IRRLoader.cpp 2011-03-23 21:50:01.779343515 -0400
@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace irr;
using namespace irr::io;
-
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/IRRMeshLoader.cpp.unbundle 2011-03-23 21:49:26.022343523 -0400
+++ ./code/IRRMeshLoader.cpp 2011-03-23 21:50:17.416343509 -0400
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace irr;
using namespace irr::io;
-
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
IRRMeshImporter::IRRMeshImporter()
unchanged:
--- ./code/IRRShared.cpp.unbundle 2011-03-23 21:49:41.669343519 -0400
+++ ./code/IRRShared.cpp 2011-03-23 21:50:27.889343507 -0400
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace irr;
using namespace irr::io;
+using namespace irr::core;
// Transformation matrix to convert from Assimp to IRR space
const aiMatrix4x4 Assimp::AI_TO_IRR_MATRIX = aiMatrix4x4 (
unchanged:
--- ./code/irrXMLWrapper.h.unbundle 2011-03-23 20:52:45.743344385 -0400
+++ ./code/irrXMLWrapper.h 2011-03-23 20:57:17.692344314 -0400
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#define INCLUDED_AI_IRRXML_WRAPPER
// some long includes ....
-#include "./../contrib/irrXML/irrXML.h"
+#include "irrXML.h"
#include "./../include/IOStream.h"
namespace Assimp {
@@ -115,7 +115,7 @@ public:
// ----------------------------------------------------------------------------------
//! Returns size of file in bytes
- virtual int getSize() {
+ virtual long getSize() const {
return (int)data.size();
}
unchanged:
--- ./code/MD5Parser.cpp.unbundle 2011-03-23 21:52:52.063343472 -0400
+++ ./code/MD5Parser.cpp 2011-03-23 21:53:02.696343467 -0400
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::MD5;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Parse the segment structure fo a MD5 file
unchanged:
--- ./code/NFFLoader.cpp.unbundle 2011-03-23 21:53:28.996343462 -0400
+++ ./code/NFFLoader.cpp 2011-03-23 21:53:39.807343522 -0400
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "RemoveComments.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/ObjFileMtlImporter.cpp.unbundle 2011-03-23 21:54:14.222343453 -0400
+++ ./code/ObjFileMtlImporter.cpp 2011-03-23 21:54:35.751343456 -0400
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "ObjFileData.h"
#include "fast_atof.h"
+using namespace irr::core;
namespace Assimp {
// -------------------------------------------------------------------
unchanged:
--- ./code/ObjTools.h.unbundle 2011-03-23 21:54:56.550343444 -0400
+++ ./code/ObjTools.h 2011-03-23 21:55:09.938343448 -0400
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#define OBJ_TOOLS_H_INC
#include "fast_atof.h"
+using namespace irr::core;
namespace Assimp
{
unchanged:
--- ./code/OFFLoader.cpp.unbundle 2011-03-23 21:55:19.651343434 -0400
+++ ./code/OFFLoader.cpp 2011-03-23 21:55:37.045343406 -0400
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/OgreXmlHelper.h.unbundle 2011-03-23 21:55:58.418343421 -0400
+++ ./code/OgreXmlHelper.h 2011-03-23 21:56:25.438343414 -0400
@@ -1,6 +1,7 @@
#include "irrXMLWrapper.h"
#include "fast_atof.h"
+using namespace irr::core;
namespace Assimp
{
unchanged:
--- ./code/PlyParser.cpp.unbundle 2011-03-23 21:56:40.350343411 -0400
+++ ./code/PlyParser.cpp 2011-03-23 21:56:51.269343393 -0400
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "fast_atof.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
PLY::EDataType PLY::Property::ParseDataType(const char* pCur,const char** pCurOut)
unchanged:
--- ./code/RawLoader.cpp.unbundle 2011-03-23 21:57:57.564343410 -0400
+++ ./code/RawLoader.cpp 2011-03-23 21:58:07.303343389 -0400
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "fast_atof.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/SceneCombiner.cpp.unbundle 2011-03-23 21:58:24.127343385 -0400
+++ ./code/SceneCombiner.cpp 2011-03-23 21:58:51.071343379 -0400
@@ -52,6 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "Hash.h"
#include "time.h"
+using namespace irr::core;
+
namespace Assimp {
// ------------------------------------------------------------------------------------------------
unchanged:
--- ./code/SMDLoader.cpp.unbundle 2011-03-23 21:59:04.323343376 -0400
+++ ./code/SMDLoader.cpp 2011-03-23 21:59:14.629343374 -0400
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "SkeletonMeshBuilder.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/STLLoader.cpp.unbundle 2011-03-23 21:59:30.182343374 -0400
+++ ./code/STLLoader.cpp 2011-03-23 21:59:47.109343351 -0400
@@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "fast_atof.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
unchanged:
--- ./code/UnrealLoader.cpp.unbundle 2011-03-23 21:59:57.342343413 -0400
+++ ./code/UnrealLoader.cpp 2011-03-23 22:00:06.991343406 -0400
@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "ConvertToLHProcess.h"
using namespace Assimp;
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
unchanged:
--- ./code/XFileParser.cpp.unbundle 2011-03-23 22:00:21.502343355 -0400
+++ ./code/XFileParser.cpp 2011-03-23 22:00:37.987343352 -0400
@@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
using namespace Assimp;
using namespace Assimp::XFile;
+using namespace irr::core;
#ifndef ASSIMP_BUILD_NO_COMPRESSED_X
diff -u ./tools/assimp_cmd/ImageExtractor.cpp ./tools/assimp_cmd/ImageExtractor.cpp
--- ./tools/assimp_cmd/ImageExtractor.cpp 2011-03-23 22:01:45.684343323 -0400
+++ ./tools/assimp_cmd/ImageExtractor.cpp 2011-08-24 21:11:13.728999240 -0400
@@ -44,9 +44,10 @@
*/
#include "Main.h"
-#include <../code/fast_atof.h>
+#include <fast_atof.h>
#include <../code/StringComparison.h>
+using namespace irr::core;
const char* AICMD_MSG_DUMP_HELP_E =
"assimp extract <model> [<out>] [-t<n>] [-f<fmt>] [-ba] [-s] [common parameters]\n"
"\t -ba Writes BMP's with alpha channel\n"
@@ -58,6 +59,7 @@
#define AI_EXTRACT_WRITE_BMP_ALPHA 0x1
#include "Compiler/pushpack1.h"
+using namespace irr::core;
// -----------------------------------------------------------------------------------
// Data structure for the first header of a BMP
@@ -269,10 +271,10 @@
nosuffix = true;
}
else if ( !strncmp( params[i], "--texture=",10)) {
- texIdx = Assimp::strtoul10(params[i]+10);
+ texIdx = strtoul10(params[i]+10);
}
else if ( !strncmp( params[i], "-t",2)) {
- texIdx = Assimp::strtoul10(params[i]+2);
+ texIdx = strtoul10(params[i]+2);
}
else if ( !strcmp( params[i], "-ba") || !strcmp( params[i], "--bmp-with-alpha")) {
flags |= AI_EXTRACT_WRITE_BMP_ALPHA;
unchanged:
--- ./CMakeLists.txt.irrxml 2011-08-24 19:58:48.590392282 -0400
+++ ./CMakeLists.txt 2011-08-24 20:52:56.758647734 -0400
@@ -97,6 +97,12 @@ if (PKG_CONFIG_FOUND)
PKG_CHECK_MODULES(UNZIP minizip)
endif (PKG_CONFIG_FOUND)
+# Search for irrXML
+FIND_LIBRARY(IRRXML_LIB IrrXML HINTS ${IRRXML_LIB_PATH})
+FIND_FILE(IRRXML_H irrXML.h PATHS ${IRRXML_INCLUDE_PATH})
+ message (STATUS "Found External IrrXML")
+ set(HAVE_IRRXML true)
+
IF ( NO_EXPORT )
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT)
MESSAGE( STATUS "Build an import-only version of Assimp." )
unchanged:
--- ./code/CMakeLists.txt.irrxml 2011-08-24 20:01:47.895466510 -0400
+++ ./code/CMakeLists.txt 2011-08-24 20:46:03.550302122 -0400
@@ -89,7 +89,7 @@ SET( Logging_SRCS
SOURCE_GROUP(Logging FILES ${Logging_SRCS})
SET( Common_SRCS
- fast_atof.h
+ #fast_atof.h
qnan.h
BaseImporter.cpp
BaseImporter.h
@@ -592,9 +592,9 @@ ADD_LIBRARY( assimp SHARED
${IFC_SRCS}
# Third-party libraries
- ${IrrXML_SRCS}
- ${ConvertUTF_SRCS}
- ${unzip_compile_SRCS}
+ #${IrrXML_SRCS}
+ ${ConvertUTF_SRCS}
+ #${unzip_compile_SRCS}
# Necessary to show the headers in the project when using the VC++ generator:
${Boost_SRCS}
@@ -616,6 +616,13 @@ else (UNZIP_FOUND)
INCLUDE_DIRECTORIES("../contrib/unzip")
endif (UNZIP_FOUND)
+if (HAVE_IRRXML)
+ INCLUDE_DIRECTORIES(${IRRXML_INCLUDE_PATH})
+ TARGET_LINK_LIBRARIES(assimp ${IRRXML_LIB})
+else (HAVE_IRRXML)
+ INCLUDE_DIRECTORIES("../contrib/irrXML")
+endif (HAVE_IRRXML)
+
INSTALL( TARGETS assimp DESTINATION ${LIB_INSTALL_DIR} COMPONENT libassimp${ASSIMP_VERSION_MAJOR})
INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)
INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)
only in patch2:
unchanged:
--- ./code/FileSystemFilter.h.unbundle 2011-08-24 20:20:40.500037178 -0400
+++ ./code/FileSystemFilter.h 2011-08-24 20:20:53.539428337 -0400
@@ -234,7 +234,7 @@ private:
// Hex sequence in URIs
if( IsHex((&*it)[0]) && IsHex((&*it)[1]) ) {
- *it = HexOctetToDecimal(&*it);
+ *it = irr::core::HexOctetToDecimal(&*it);
it = in.erase(it+1,it+2);
--it;
}
only in patch2:
unchanged:
--- ./code/LWSLoader.cpp.unbundle 2011-08-24 21:04:54.737754312 -0400
+++ ./code/LWSLoader.cpp 2011-08-24 20:59:35.286381910 -0400
@@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "Importer.h"
using namespace Assimp;
-
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Recursive parsing of LWS files
void LWS::Element::Parse (const char*& buffer)
only in patch2:
unchanged:
--- ./code/MaterialSystem.cpp.unbundle 2011-08-24 20:24:34.927884069 -0400
+++ ./code/MaterialSystem.cpp 2011-08-24 20:24:51.464354603 -0400
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "MaterialSystem.h"
using namespace Assimp;
-
+using namespace irr::core;
// ------------------------------------------------------------------------------------------------
// Get a specific property from a material
aiReturn aiGetMaterialProperty(const aiMaterial* pMat,
only in patch2:
unchanged:
--- ./code/STEPFileReader.cpp.unbundle 2011-08-24 21:03:11.001539590 -0400
+++ ./code/STEPFileReader.cpp 2011-08-24 21:03:31.053359977 -0400
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "fast_atof.h"
using namespace Assimp;
+using namespace irr::core;
namespace EXPRESS = STEP::EXPRESS;
#include <functional>
only in patch2:
unchanged:
--- ./tools/assimp_cmd/CMakeLists.txt.unbundle 2011-08-24 21:07:32.570036019 -0400
+++ ./tools/assimp_cmd/CMakeLists.txt 2011-08-24 21:12:35.384289299 -0400
@@ -16,8 +16,9 @@ ADD_EXECUTABLE( assimp_cmd
Info.cpp
Export.cpp
)
-
+INCLUDE_DIRECTORIES(${IRRXML_INCLUDE_PATH})
TARGET_LINK_LIBRARIES( assimp_cmd assimp ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES( assimp_cmd ${IRRXML_LIB})
SET_TARGET_PROPERTIES( assimp_cmd PROPERTIES
OUTPUT_NAME assimp
)