Skip to content

Commit b938bf7

Browse files
committed
fix typo in Carve
1 parent d2b0e9c commit b938bf7

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ IfcPlusPlus/src/ifcpp----/
5252
examples/LoadFileExample/dump_mesh_debug.txt
5353
examples/CreateIfcWallAndWriteFile/example.ifc
5454
examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user
55+
examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user

Diff for: IfcPlusPlus/IfcPlusPlus.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
267267
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
268268
<LanguageStandard>stdcpp17</LanguageStandard>
269+
<DisableSpecificWarnings>4267;4244</DisableSpecificWarnings>
269270
</ClCompile>
270271
<Link>
271272
<EnableCOMDATFolding>

Diff for: IfcPlusPlus/src/external/Carve/src/lib/triangle_intersection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ int sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i) {
177177
// returns: -1 - no intersection
178178
// 0 - touching
179179
// +1 - intersection
180-
bool sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i, unsigned int j) {
180+
int sat_edge(const vec2 tri_a[3], const vec2 tri_b[3], unsigned int i, unsigned int j) {
181181
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])));
182182
}
183183

Diff for: examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
1919
</PropertyGroup>
2020
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
21-
<QtLastBackgroundBuild>2023-12-17T08:34:13.6152753Z</QtLastBackgroundBuild>
21+
<QtLastBackgroundBuild>2023-12-27T08:43:03.7303049Z</QtLastBackgroundBuild>
2222
</PropertyGroup>
2323
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
24-
<QtLastBackgroundBuild>2023-12-17T08:34:13.7675508Z</QtLastBackgroundBuild>
24+
<QtLastBackgroundBuild>2023-12-27T08:43:03.7959271Z</QtLastBackgroundBuild>
2525
</PropertyGroup>
2626
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
27-
<QtLastBackgroundBuild>2023-12-17T08:34:13.9015642Z</QtLastBackgroundBuild>
27+
<QtLastBackgroundBuild>2023-12-27T08:43:04.3729773Z</QtLastBackgroundBuild>
2828
</PropertyGroup>
2929
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
30-
<QtLastBackgroundBuild>2023-12-17T08:34:14.0941691Z</QtLastBackgroundBuild>
30+
<QtLastBackgroundBuild>2023-12-27T08:43:04.5996832Z</QtLastBackgroundBuild>
3131
</PropertyGroup>
3232
</Project>

0 commit comments

Comments
 (0)