fix typo in Carve

ifcquery · Dec 27, 2023 · b938bf7 · b938bf7
1 parent d2b0e9c
commit b938bf7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -266,6 +266,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <DisableSpecificWarnings>4267;4244</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>

diff --git 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
@@ -18,15 +18,15 @@
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <QtLastBackgroundBuild>2023-12-17T08:34:13.6152753Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2023-12-27T08:43:03.7303049Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QtLastBackgroundBuild>2023-12-17T08:34:13.7675508Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2023-12-27T08:43:03.7959271Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <QtLastBackgroundBuild>2023-12-17T08:34:13.9015642Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2023-12-27T08:43:04.3729773Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QtLastBackgroundBuild>2023-12-17T08:34:14.0941691Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2023-12-27T08:43:04.5996832Z</QtLastBackgroundBuild>
   </PropertyGroup>
 </Project>