OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2506 Finally found the error with near vertical intersections

Browse Source
This commit is contained in:
Jacob Støren 2018-03-06 16:30:15 +01:00
parent 91daf49e8a
commit 0083ecdf6a
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
View File

@ -36,6 +36,7 @@
#include "cvfPrimitiveSetIndexedUInt.h" #include "cvfPrimitiveSetIndexedUInt.h"
#include "cvfScalarMapper.h" #include "cvfScalarMapper.h"
#include "cvfRay.h" #include "cvfRay.h"
//#include "cvfTrace.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -84,7 +85,9 @@ cvf::Mat4d calculateSectionLocalFlatteningCS(const cvf::Vec3d& p1, const cvf::Ve
sectionLineDir.normalize(); sectionLineDir.normalize();
Vec3d Ey = Ez ^ sectionLineDir; Vec3d Ey = Ez ^ sectionLineDir;
Ey.normalize();
Vec3d Ex = Ey ^ Ez; Vec3d Ex = Ey ^ Ez;
Ex.normalize();
Ray extrusionRay; Ray extrusionRay;
extrusionRay.setOrigin(p1); extrusionRay.setOrigin(p1);
@ -166,6 +169,27 @@ void RivIntersectionGeometryGenerator::calculateSegementTransformPrLinePoint()
lIdx = idxToNextP; lIdx = idxToNextP;
} }
} }
// for (auto mx: m_segementTransformPrLinePoint[0])
// {
// cvf::String text;
//
// for (int r = 0; r < 4; ++r)
// {
// for (int c = 0; c < 4; ++c)
// {
// text += cvf::String::number(mx(r, c));
//
// if (r * c < 9)
// {
// text += " ";
// }
// }
// text += "\n";
// }
//
// cvf::Trace::show( text );
// }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -212,9 +236,8 @@ void RivIntersectionGeometryGenerator::calculateArrays()
if (polyLine.size() < 2) continue; if (polyLine.size() < 2) continue;
size_t lineCount = polyLine.size(); size_t lineCount = polyLine.size();
//size_t lIdx = 0; size_t lIdx = 0;
//while ( lIdx < lineCount - 1) while ( lIdx < lineCount - 1)
for (size_t lIdx = 0; lIdx < lineCount - 1; ++lIdx)
{ {
size_t idxToNextP = indexToNextValidPoint(polyLine, m_extrusionDirection, lIdx); size_t idxToNextP = indexToNextValidPoint(polyLine, m_extrusionDirection, lIdx);
@ -406,7 +429,7 @@ void RivIntersectionGeometryGenerator::calculateArrays()
} }
} }
} }
// lIdx = idxToNextP; lIdx = idxToNextP;
} }
} }
m_triangleVxes->assign(triangleVertices); m_triangleVxes->assign(triangleVertices);