Egalware/vroni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vroni :

Browse Source 
- corretto errore e disabilitato warning corrispondente.
This commit is contained in:
SaraP
2024-02-14 11:38:40 +01:00
parent 14c66a0671
commit 6b3c2fd793
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
intersections.cc
+6 -6
View File
@@ -1640,7 +1640,7 @@ vr_bool vroniObject::ComputeAllIntersections(double_arg eps)
if (GetSegSegIntersection(seg1->num, seg2->num, &res1, eps,
&ident)) {
if (AddSegIntersection(seg1, res1) ||
if (AddSegIntersection(seg1, res1) |
AddSegIntersection(seg2, res1))
intersections++;
}
@@ -1658,12 +1658,12 @@ vr_bool vroniObject::ComputeAllIntersections(double_arg eps)
if ((cnt = GetSegArcIntersection(seg1->num, arc1->num,
&res1, &res2, eps)) > 0) {
if (AddSegIntersection(seg1, res1) ||
AddArcIntersection(arc1, res1))
if ( AddSegIntersection(seg1, res1) |
AddArcIntersection(arc1, res1))
intersections++;
if (cnt > 1) {
assert(cnt == 2);
if (AddSegIntersection(seg1, res2) ||
if (AddSegIntersection(seg1, res2) |
AddArcIntersection(arc1, res2))
intersections++;
}
@@ -1684,13 +1684,13 @@ vr_bool vroniObject::ComputeAllIntersections(double_arg eps)
if ((cnt = GetArcArcIntersection(arc1->num, arc2->num, &res1,
&res2, eps, &ident)) > 0){
if (AddArcIntersection(arc1, res1) ||
if (AddArcIntersection(arc1, res1) |
AddArcIntersection(arc2, res1))
intersections++;
if (cnt > 1) {
assert(cnt == 2);
if (AddArcIntersection(arc1, res2) ||
if (AddArcIntersection(arc1, res2) |
AddArcIntersection(arc2, res2))
intersections++;
}
vroni.vcxproj
+2
View File
@@ -153,6 +153,7 @@ copy $(TargetDir)$(TargetName).pdb \EgtDev\Extern\vroni\Lib\</Command>
<AdditionalIncludeDirectories>\EgtDev\Extern\vroni\Include</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
<SuppressStartupBanner>false</SuppressStartupBanner>
<AdditionalOptions>-Wno-bitwise-instead-of-logical </AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -179,6 +180,7 @@ copy $(TargetDir)$(TargetName).pdb \EgtDev\Extern\vroni\Lib\</Command>
<AdditionalIncludeDirectories>\EgtDev\Extern\vroni\Include</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<CompileAs>CompileAsCpp</CompileAs>
<AdditionalOptions>-Wno-bitwise-instead-of-logical </AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>