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

Updated to version 0.8.0

Browse Source
This commit is contained in:
unknown
2012-06-26 16:10:41 +02:00
parent 80dbfbaf1f
commit 2c9695e594
327 changed files with 15604 additions and 21837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
VisualizationModules/LibGeometry/cvfRay.cpp
View File

@@ -181,13 +181,13 @@ bool Ray::quadIntersect(const Vec3d& v1, const Vec3d& v2, const Vec3d& v3, const
Vec3d v12 = v2 - v1;
Vec3d v13 = v3 - v1;
Vec3d n = (v12 ^ v13).getNormalized();
Vec3d n = (v12 ^ v13).getNormalized(); // Quad Average normal
double det = n * direction();
double det = n * direction(); // Length of projection of Quad normal to ray direction
if (det == 0.0f)
{
return false;
return false; // Ray parallel to average quad plane. Not quite accurate if origin is close to quad
}
double t = n * ((v1 - origin()) / det);
@@ -203,9 +203,9 @@ bool Ray::quadIntersect(const Vec3d& v1, const Vec3d& v2, const Vec3d& v3, const
int i;
for(i = 0; i < 4; i++)
{
Vec3d bi_norm = -((pts[i+1]-pts[i]) ^ n).getNormalized();
Vec3d bi_norm = -((pts[i+1] - pts[i]) ^ n).getNormalized(); // - (Edge x Quad normal) : Unit Vector in quad plane from edge into the quad
if (((fp-pts[i]) * bi_norm) < 0)
if (((fp - pts[i]) * bi_norm) < 0)
{
return false;
}