Skip to content
Snippets Groups Projects
Commit ced2eeec authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

STYLE: Enforce style whereever missing

parent 6e4431e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Base/Collision/CollisionDetection/imstkCollisionDetectionUtils.h
+ 46
− 35
View file @ ced2eeec
......@@ -40,7 +40,7 @@ isIntersect(const double& a, const double& b, const double& c, const double& d)
/// \brief Check if two AABBs are intersecting
///
inline bool
testAabbToAabb(const double& min1_x, const double& max1_x,
testAABBToAABB(const double& min1_x, const double& max1_x,
const double& min1_y, const double& max1_y,
const double& min1_z, const double& max1_z,
const double& min2_x, const double& max2_x,
......@@ -48,104 +48,115 @@ testAabbToAabb(const double& min1_x, const double& max1_x,
const double& min2_z, const double& max2_z)
{
return (isIntersect(min1_x, max1_x, min2_x, max2_x) &&
isIntersect(min1_y, max1_y, min2_y, max2_y) &&
isIntersect(min1_z, max1_z, min2_z, max2_z));
isIntersect(min1_y, max1_y, min2_y, max2_y) &&
isIntersect(min1_z, max1_z, min2_z, max2_z));
}
///
/// \brief Check if two lines are intersecting with AABB intersection test
///
inline bool
testLineToLineAabb(const double& x1, const double& y1, const double& z1,
const double& x2, const double& y2, const double& z2,
const double& x3, const double& y3, const double& z3,
const double& x4, const double& y4, const double& z4,
const double& prox1, const double& prox2)
testLineToLineAABB(const double& x1, const double& y1, const double& z1,
const double& x2, const double& y2, const double& z2,
const double& x3, const double& y3, const double& z3,
const double& x4, const double& y4, const double& z4,
const double& prox1, const double& prox2)
{
double min1_x, max1_x, min1_y, max1_y, min1_z, max1_z;
if (x1 < x2)
{
min1_x = x1; max1_x = x2;
min1_x = x1;
max1_x = x2;
}
else
{
min1_x = x2; max1_x = x1;
min1_x = x2;
max1_x = x1;
}
if (y1 < y2)
{
min1_y = y1; max1_y = y2;
min1_y = y1;
max1_y = y2;
}
else
{
min1_y = y2; max1_y = y1;
min1_y = y2;
max1_y = y1;
}
if (z1 < z2)
{
min1_z = z1; max1_z = z2;
min1_z = z1;
max1_z = z2;
}
else
{
min1_z = z2; max1_z = z1;
min1_z = z2;
max1_z = z1;
}
double min2_x, max2_x, min2_y, max2_y, min2_z, max2_z;
if (x3 < x4)
{
min2_x = x3; max2_x = x4;
min2_x = x3;
max2_x = x4;
}
else
{
min2_x = x4; max2_x = x3;
min2_x = x4;
max2_x = x3;
}
if (y3 < y4)
{
min2_y = y3; max2_y = y4;
min2_y = y3;
max2_y = y4;
}
else
{
min2_y = y4; max2_y = y3;
min2_y = y4;
max2_y = y3;
}
if (z3 < z4)
{
min2_z = z3; max2_z = z4;
min2_z = z3;
max2_z = z4;
}
else
{
min2_z = z4; max2_z = z3;
min2_z = z4;
max2_z = z3;
}
return testAabbToAabb(min1_x - prox1, max1_x + prox1, min1_y - prox1, max1_y + prox1,
min1_z - prox1, max1_z + prox1, min2_x - prox2, max2_x + prox2,
min2_y - prox2, max2_y + prox2, min2_z - prox2, max2_z + prox2);
return testAABBToAABB(min1_x - prox1, max1_x + prox1, min1_y - prox1, max1_y + prox1,
min1_z - prox1, max1_z + prox1, min2_x - prox2, max2_x + prox2,
min2_y - prox2, max2_y + prox2, min2_z - prox2, max2_z + prox2);
}
///
/// \brief Check if triangle and point are intersecting with AABB test
///
inline bool
testPointToTriAabb(const double& x1, const double& y1, const double& z1,
testPointToTriAABB(const double& x1, const double& y1, const double& z1,
const double& x2, const double& y2, const double& z2,
const double& x3, const double& y3, const double& z3,
const double& x4, const double& y4, const double& z4,
const double& prox1, const double& prox2)
{
double min_x, max_x, min_y, max_y, min_z, max_z;
min_x = std::min(x2, std::min(x3, x4));
max_x = std::max(x2, std::max(x3, x4));
min_y = std::min(y2, std::min(y3, y4));
max_y = std::max(y2, std::max(y3, y4));
min_z = std::min(z2, std::min(z3, z4));
max_z = std::max(z2, std::max(z3, z4));
return testAabbToAabb(x1 - prox1, x1 + prox1, y1 - prox1, y1 + prox1,
z1 - prox1, z1 + prox1, min_x - prox2, max_x + prox2,
min_y - prox2, max_y + prox2, min_z - prox2, max_z + prox2);
auto min_x = std::min(x2, std::min(x3, x4));
auto max_x = std::max(x2, std::max(x3, x4));
auto min_y = std::min(y2, std::min(y3, y4));
auto max_y = std::max(y2, std::max(y3, y4));
auto min_z = std::min(z2, std::min(z3, z4));
auto max_z = std::max(z2, std::max(z3, z4));
return testAABBToAABB(x1 - prox1, x1 + prox1, y1 - prox1, y1 + prox1,
z1 - prox1, z1 + prox1, min_x - prox2, max_x + prox2,
min_y - prox2, max_y + prox2, min_z - prox2, max_z + prox2);
}
}
......
Base/Collision/imstkPbdInteractionPair.cpp
+ 15
− 15
View file @ ced2eeec
......@@ -48,7 +48,7 @@ PbdInteractionPair::doBroadPhaseCollision()
auto prox1 = dynaModel1->getProximity();
auto prox2 = dynaModel2->getProximity();
return testAabbToAabb(min1[0] - prox1, max1[0] + prox1, min1[1] - prox1, max1[1] + prox1,
return testAABBToAABB(min1[0] - prox1, max1[0] + prox1, min1[1] - prox1, max1[1] + prox1,
min1[2] - prox1, max1[2] + prox1, min2[0] - prox2, max2[0] + prox2,
min2[1] - prox2, max2[1] + prox2, min2[2] - prox2, max2[2] + prox2);
}
......@@ -88,7 +88,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
const Vec3d p1 = mesh2->getVertexPosition(e[1]);
const Vec3d p2 = mesh2->getVertexPosition(e[2]);
if (testPointToTriAabb(p[0], p[1], p[2],
if (testPointToTriAABB(p[0], p[1], p[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -124,7 +124,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
if (E2[e[0]][e[1]] && E2[e[1]][e[0]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2], prox1, prox2))
......@@ -138,7 +138,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[1]][e[2]] && E2[e[2]][e[1]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -152,7 +152,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[2]][e[0]] && E2[e[0]][e[2]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p2[0], p2[1], p2[2],
p0[0], p0[1], p0[2], prox1, prox2))
......@@ -185,7 +185,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
const Vec3d p1 = mesh2->getVertexPosition(e[1]);
const Vec3d p2 = mesh2->getVertexPosition(e[2]);
if (testPointToTriAabb(p[0], p[1], p[2],
if (testPointToTriAABB(p[0], p[1], p[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -226,7 +226,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
const Vec3d p2 = mesh2->getVertexPosition(e[2]);
if (E2[e[0]][e[1]] && E2[e[1]][e[0]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2], prox1, prox2))
......@@ -240,7 +240,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[1]][e[2]] && E2[e[2]][e[1]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -254,7 +254,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[2]][e[0]] && E2[e[0]][e[2]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p2[0], p2[1], p2[2],
p0[0], p0[1], p0[2], prox1, prox2))
......@@ -286,7 +286,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
const Vec3d p2 = mesh2->getVertexPosition(e[2]);
if (E2[e[0]][e[1]] && E2[e[1]][e[0]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2], prox1, prox2))
......@@ -300,7 +300,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[1]][e[2]] && E2[e[2]][e[1]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -314,7 +314,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[2]][e[0]] && E2[e[0]][e[2]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p2[0], p2[1], p2[2],
p0[0], p0[1], p0[2], prox1, prox2))
......@@ -345,7 +345,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
const Vec3d p2 = mesh2->getVertexPosition(e[2]);
if (E2[e[0]][e[1]] && E2[e[1]][e[0]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p0[0], p0[1], p0[2],
p1[0], p1[1], p1[2], prox1, prox2))
......@@ -359,7 +359,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[1]][e[2]] && E2[e[2]][e[1]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p1[0], p1[1], p1[2],
p2[0], p2[1], p2[2], prox1, prox2))
......@@ -373,7 +373,7 @@ PbdInteractionPair::doNarrowPhaseCollision()
}
if (E2[e[2]][e[0]] && E2[e[0]][e[2]])
{
if (testLineToLineAabb(P[0], P[1], P[2],
if (testLineToLineAABB(P[0], P[1], P[2],
Q[0], Q[1], Q[2],
p2[0], p2[1], p2[2],
p0[0], p0[1], p0[2], prox1, prox2))
......
Base/Constraint/PbdConstraints/imstkPbdConstraint.h
+ 3
− 3
View file @ ced2eeec
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef IMSTK_PBD_CONSTRAINT_H
#define IMSTK_PBD_CONSTRAINT_H
#ifndef imstkPbdConstraint_h
#define imstkPbdConstraint_h
#include "imstkMath.h"
......@@ -98,4 +98,4 @@ public:
}
#endif // IMSTK_PBD_CONSTRAINT_H
\ No newline at end of file
#endif // imstkPbdConstraint_h
\ No newline at end of file
Base/Constraint/PbdConstraints/imstkPbdFEMConstraint.h
+ 3
− 3
View file @ ced2eeec
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef IMSTK_PBD_FEM_CONSTRAINT_H
#define IMSTK_PBD_FEM_CONSTRAINT_H
#ifndef imstkPbdFEMConstraint_h
#define imstkPbdFEMConstraint_h
#include "imstkPbdConstraint.h"
......@@ -61,4 +61,4 @@ public:
}
#endif // IMSTK_PBD_FEM_CONSTRAINT_H
\ No newline at end of file
#endif // imstkPbdFEMConstraint_h
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment