diff --git a/.gitignore b/.gitignore index f3881feae..d66b9dcf9 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ IfcPlusPlus/src/ifcpp----/ examples/LoadFileExample/dump_mesh_debug.txt examples/CreateIfcWallAndWriteFile/example.ifc examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user +examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user diff --git a/IfcPlusPlus/IfcPlusPlus.vcxproj b/IfcPlusPlus/IfcPlusPlus.vcxproj index 84884952f..08230496a 100644 --- a/IfcPlusPlus/IfcPlusPlus.vcxproj +++ b/IfcPlusPlus/IfcPlusPlus.vcxproj @@ -266,6 +266,7 @@ Default true stdcpp17 + 4267;4244 diff --git a/IfcPlusPlus/src/external/Carve/src/lib/triangle_intersection.cpp b/IfcPlusPlus/src/external/Carve/src/lib/triangle_intersection.cpp index 60c5f6b86..b32a5a9d9 100644 --- a/IfcPlusPlus/src/external/Carve/src/lib/triangle_intersection.cpp +++ b/IfcPlusPlus/src/external/Carve/src/lib/triangle_intersection.cpp @@ -177,7 +177,7 @@ int sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i) { // returns: -1 - no intersection // 0 - touching // +1 - intersection -bool sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i, unsigned int j) { +int sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i, unsigned int j) { return std::max(dbl_sign(orient2d_exact(tri_a[i], tri_a[(i + 1) % 3], tri_b[(j + 1) % 3])), dbl_sign(orient2d_exact(tri_a[i], tri_a[(i + 1) % 3], tri_b[(j + 2) % 3]))); } diff --git a/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user b/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user index f2ae6737f..14b73ea2e 100644 --- a/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user +++ b/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user @@ -18,15 +18,15 @@ PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH) - 2023-12-17T08:34:13.6152753Z + 2023-12-27T08:43:03.7303049Z - 2023-12-17T08:34:13.7675508Z + 2023-12-27T08:43:03.7959271Z - 2023-12-17T08:34:13.9015642Z + 2023-12-27T08:43:04.3729773Z - 2023-12-17T08:34:14.0941691Z + 2023-12-27T08:43:04.5996832Z \ No newline at end of file