OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#815 Reentered Whitespace

Browse Source
This commit is contained in:
Jacob Støren 2016-09-21 15:05:04 +02:00
parent e789694780
commit 8f501d96ea
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
View File

@ -198,11 +198,12 @@ bool HexGridIntersectionTools::planeTriangleIntersection(const cvf::Plane& plane
// The isTriangleEdgeCellContour bits refer to the edge after the corresponding triangle vertex.
//--------------------------------------------------------------------------------------------------
void HexGridIntersectionTools::clipTrianglesBetweenTwoParallelPlanes(const std::vector<ClipVx> &triangleVxes,
const std::vector<bool> &isTriangleEdgeCellContour,
const cvf::Plane& p1Plane, const cvf::Plane& p2Plane,
std::vector<ClipVx> *clippedTriangleVxes,
std::vector<bool> *isClippedTriEdgeCellContour)
void HexGridIntersectionTools::clipTrianglesBetweenTwoParallelPlanes(const std::vector<ClipVx>& triangleVxes,
const std::vector<bool>& isTriangleEdgeCellContour,
const cvf::Plane& p1Plane,
const cvf::Plane& p2Plane,
std::vector<ClipVx>* clippedTriangleVxes,
std::vector<bool>* isClippedTriEdgeCellContour)
{
size_t triangleCount = triangleVxes.size() / 3;
@ -217,6 +218,7 @@ void HexGridIntersectionTools::clipTrianglesBetweenTwoParallelPlanes(const std::
newVx2OnP1.isVxIdsNative = false;
bool isMostVxesOnPositiveSideOfP1 = false;
bool isIntersectingP1 = planeTriangleIntersection(p1Plane,
triangleVxes[triVxIdx + 0].vx, triVxIdx + 0,
triangleVxes[triVxIdx + 1].vx, triVxIdx + 1,
@ -233,7 +235,9 @@ void HexGridIntersectionTools::clipTrianglesBetweenTwoParallelPlanes(const std::
newVx1OnP2.isVxIdsNative = false;
ClipVx newVx2OnP2;
newVx2OnP2.isVxIdsNative = false;
bool isMostVxesOnPositiveSideOfP2 = false;
bool isIntersectingP2 = planeTriangleIntersection(p2Plane,
triangleVxes[triVxIdx + 0].vx, triVxIdx + 0,
triangleVxes[triVxIdx + 1].vx, triVxIdx + 1,
@ -247,10 +251,10 @@ void HexGridIntersectionTools::clipTrianglesBetweenTwoParallelPlanes(const std::
bool p1KeepAll = (!isIntersectingP1 && isMostVxesOnPositiveSideOfP1);
bool p2KeepAll = (!isIntersectingP2 && isMostVxesOnPositiveSideOfP2);
bool p1KeepQuad = (isIntersectingP1 && isMostVxesOnPositiveSideOfP1);
bool p2KeepQuad = (isIntersectingP2 && isMostVxesOnPositiveSideOfP2);
bool p1KeepTop = (isIntersectingP1 && !isMostVxesOnPositiveSideOfP1);
bool p2KeepTop = (isIntersectingP2 && !isMostVxesOnPositiveSideOfP2);
bool p1KeepQuad = ( isIntersectingP1 && isMostVxesOnPositiveSideOfP1);
bool p2KeepQuad = ( isIntersectingP2 && isMostVxesOnPositiveSideOfP2);
bool p1KeepTop = ( isIntersectingP1 && !isMostVxesOnPositiveSideOfP1);
bool p2KeepTop = ( isIntersectingP2 && !isMostVxesOnPositiveSideOfP2);
if (p1KeepAll && p2KeepAll)
{