Merge branch 'v0.7.0' into merge/upstream/v0.7.0

# Conflicts:
#	cmake/CMakeLists.txt

Author: FrogsInSpace

src/ifcmax/CMakeLists.txt

@@ -33,7 +33,7 @@ LINK_DIRECTORIES(${LINK_DIRECTORIES} ${IfcOpenShell_BINARY_DIR} ${OCC_LIBRARY_DI
 ADD_LIBRARY(IfcMax_${max_year} SHARED IfcMax.h IfcMax.cpp)
 
 # TODO: find the minimal subset of 3dsmax libraries to reference
-TARGET_LINK_LIBRARIES(IfcMax_${max_year} ${IFCOPENSHELL_LIBRARIES} Comctl32.lib zlibdll.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib
+TARGET_LINK_LIBRARIES(IfcMax_${max_year} ${IFCOPENSHELL_LIBRARIES} Comctl32.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib
     flt.lib geom.lib gfx.lib gup.lib imageViewers.lib ManipSys.lib maxnet.lib Maxscrpt.lib
     maxutil.lib MenuMan.lib menus.lib mesh.lib MNMath.lib Paramblk2.lib particle.lib Poly.lib RenderUtil.lib
     tessint.lib viewfile.lib ${OPENCASCADE_LIBRARIES}

src/ifcmax/IfcMax.cpp

@@ -27,7 +27,7 @@
 
 #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 #include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
-#include "../ifcgeom/IfcGeomElement.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
 
 static const int NUM_MATERIAL_SLOTS = 24;
 
@@ -46,6 +46,11 @@ static class IFCImpClassDesc :public ClassDesc {
     void *                  Create(BOOL /*loading = FALSE*/) { return new IFCImp; }
     // TODO Delete() function?
     const TCHAR *			ClassName() { return _T("IFCImp"); }
+
+#if MAX_VERSION_MAJOR >= 24
+	const TCHAR *	NonLocalizedClassName() { return ClassName(); }
+#endif 
+
     SClass_ID               SuperClassID() { return SCENE_IMPORT_CLASS_ID; }
     Class_ID                ClassID() { return Class_ID(0x3f230dbf, 0x5b3015c2); }
     const TCHAR*			Category() { return _T("Chrutilities"); }
@@ -230,9 +235,13 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 #endif
 
 	IfcParse::IfcFile file(fn_mb);
-	IfcGeom::Iterator<float> iterator(settings, &file);
+	
+	//IfcGeom::Iterator<float> iterator(settings, &file);
+
+	IfcGeom::Iterator* iterator = new IfcGeom::Iterator( settings, &file);
+
     delete fn_mb;
-	if (!iterator.initialize()) return false;
+	if (!iterator->initialize()) return false;
 
 	itfc->ProgressStart(_T("Importing file..."), TRUE, fn, NULL);
 
@@ -242,10 +251,12 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 	std::map<std::vector<std::string>, Mtl*> material_cache;
 
 	do{
-		const IfcGeom::TriangulationElement<float>* o = static_cast<const IfcGeom::TriangulationElement<float>*>(iterator.get());
+		const IfcGeom::Element* element = static_cast<const IfcGeom::Element*>(iterator->get());
+		const IfcGeom::TriangulationElement* o = static_cast<const IfcGeom::TriangulationElement*>(iterator->get());
 
 		TSTR o_type = S(o->type());
 		TSTR o_guid = S(o->guid());
+		TSTR o_name = S(o->name());
 
 		Mtl *m = ComposeMultiMaterial(material_cache, mats, itfc, slot, o->geometry().materials(), o->type(), o->geometry().material_ids());
 
@@ -307,19 +318,22 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 
 		ImpNode* node = impitfc->CreateNode();
 		node->Reference(tri);
-		node->SetName(o_guid);
+		
+		node->SetName( o_name );
+
 		node->GetINode()->Hide(o->type() == "IfcOpeningElement" || o->type() == "IfcSpace");
 		if (m) {
 			node->GetINode()->SetMtl(m);
 		}
-		const std::vector<float>& matrix_data = o->transformation().matrix().data();
+		const std::vector<double>& matrix_data = o->transformation().matrix().data();
+
 		node->SetTransform(0,Matrix3 ( Point3(matrix_data[0],matrix_data[1],matrix_data[2]),Point3(matrix_data[3],matrix_data[4],matrix_data[5]),
 			Point3(matrix_data[6],matrix_data[7],matrix_data[8]),Point3(matrix_data[9],matrix_data[10],matrix_data[11]) ));
 		impitfc->AddNodeToScene(node);
 
-		itfc->ProgressUpdate(iterator.progress(), true, _T(""));
+		itfc->ProgressUpdate(iterator->progress(), true, _T(""));
 
-	} while (iterator.next());
+	} while (iterator->next());
 
 	itfc->ProgressEnd();
 

win/build-deps.cmd

@@ -86,7 +86,7 @@ IF NOT EXIST "%INSTALL_DIR%". mkdir "%INSTALL_DIR%"
 IF %VS_VER%==2008 set PATH=C:\Windows\Microsoft.NET\Framework\v3.5;%PATH%
 
 :: User-configurable build options
-IF NOT DEFINED IFCOS_INSTALL_PYTHON set IFCOS_INSTALL_PYTHON=TRUE
+IF NOT DEFINED IFCOS_INSTALL_PYTHON set IFCOS_INSTALL_PYTHON=FALSE
 IF NOT DEFINED IFCOS_NUM_BUILD_PROCS set IFCOS_NUM_BUILD_PROCS=%NUMBER_OF_PROCESSORS%
 
 :: For subroutines