AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restruct

Browse Source
This commit is contained in:
Irlan 2018-06-29 23:44:19 -03:00
parent 2af8cff389
commit bbad09ae3e
5 changed files with 69 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/testbed/framework/test.cpp
View File

@ -115,6 +115,11 @@ void Test::Step()
g_draw->DrawString(b3Color_white, "Convex Cache Hits %d (%f)", b3_convexCacheHits, convexCacheHitRatio); g_draw->DrawString(b3Color_white, "Convex Cache Hits %d (%f)", b3_convexCacheHits, convexCacheHitRatio);
g_draw->DrawString(b3Color_white, "Frame Allocations %d (%d)", b3_allocCalls, b3_maxAllocCalls); g_draw->DrawString(b3Color_white, "Frame Allocations %d (%d)", b3_allocCalls, b3_maxAllocCalls);
} }
if (m_clothDragger.IsDragging() == true)
{
g_draw->DrawSegment(m_clothDragger.GetPointA(), m_clothDragger.GetPointB(), b3Color_white);
}
} }
void Test::MouseMove(const b3Ray3& pw) void Test::MouseMove(const b3Ray3& pw)

5
examples/testbed/tests/cloth_test.h
View File

@ -41,11 +41,6 @@ public:
float32 E = m_cloth->GetEnergy(); float32 E = m_cloth->GetEnergy();
g_draw->DrawString(b3Color_white, "E = %f", E); g_draw->DrawString(b3Color_white, "E = %f", E);
if (m_clothDragger.IsDragging() == true)
{
g_draw->DrawSegment(m_clothDragger.GetPointA(), m_clothDragger.GetPointB(), b3Color_white);
}
} }
b3Cloth* m_cloth; b3Cloth* m_cloth;

23
include/bounce/dynamics/cloth/cloth.h
View File

@ -37,7 +37,14 @@ struct b3ClothMesh;
class b3RayCastListener; class b3RayCastListener;
struct b3RayCastInput; struct b3RayCastInput;
struct b3RayCastSingleClothOutput; struct b3RayCastOutput;
struct b3ClothRayCastSingleOutput
{
u32 triangle;
float32 fraction;
b3Vec3 normal;
};
// Cloth definition // Cloth definition
// This requires defining a cloth mesh which is typically bound to a render mesh // This requires defining a cloth mesh which is typically bound to a render mesh
@ -89,14 +96,14 @@ public:
// Destroy a given force. // Destroy a given force.
void DestroyForce(b3Force* force); void DestroyForce(b3Force* force);
// Perform a ray cast with the cloth.
void RayCast(b3RayCastListener* listener, const b3Vec3& p1, const b3Vec3& p2);
// Perform a ray cast with the cloth.
bool RayCastSingle(b3ClothRayCastSingleOutput* output, const b3Vec3& p1, const b3Vec3& p2) const;
// Perform a ray cast with a given cloth mesh triangle. // Perform a ray cast with a given cloth mesh triangle.
bool RayCast(b3RayCastSingleClothOutput* output, const b3RayCastInput* input, u32 triangleIndex) const; bool RayCast(b3RayCastOutput* output, const b3RayCastInput* input, u32 triangleIndex) const;
// Perform a ray cast with the cloth.
void RayCast(b3RayCastListener* listener, const b3RayCastInput* input) const;
// Perform a ray cast with the cloth.
bool RayCastSingle(b3RayCastSingleClothOutput* output, const b3Vec3& p1, const b3Vec3& p2) const;
// Return the cloth mesh proxy. // Return the cloth mesh proxy.
b3ClothMesh* GetMesh() const; b3ClothMesh* GetMesh() const;

42
src/bounce/dynamics/cloth/cloth.cpp
View File

@ -348,14 +348,23 @@ void b3Cloth::ComputeMass()
} }
} }
void b3Cloth::RayCast(b3RayCastListener* listener, const b3RayCastInput* input) const void b3Cloth::RayCast(b3RayCastListener* listener, const b3Vec3& p1, const b3Vec3& p2)
{ {
b3RayCastInput input;
input.p1 = p1;
input.p2 = p2;
input.maxFraction = 1.0f;
for (u32 i = 0; i < m_mesh->triangleCount; ++i) for (u32 i = 0; i < m_mesh->triangleCount; ++i)
{ {
b3RayCastSingleClothOutput subOutput; b3RayCastOutput subOutput;
if (RayCast(&subOutput, input, i)) if (RayCast(&subOutput, &input, i))
{ {
float32 newFraction = listener->ReportCloth(subOutput.cloth, subOutput.point, subOutput.normal, subOutput.fraction, subOutput.triangle); float32 fraction = subOutput.fraction;
b3Vec3 point = (1.0f - fraction) * input.p1 + fraction * input.p2;
b3Vec3 normal = subOutput.normal;
float32 newFraction = listener->ReportCloth(this, point, normal, fraction, i);
if (newFraction == 0.0f) if (newFraction == 0.0f)
{ {
@ -366,37 +375,44 @@ void b3Cloth::RayCast(b3RayCastListener* listener, const b3RayCastInput* input)
} }
} }
bool b3Cloth::RayCastSingle(b3RayCastSingleClothOutput* output, const b3Vec3& p1, const b3Vec3& p2) const bool b3Cloth::RayCastSingle(b3ClothRayCastSingleOutput* output, const b3Vec3& p1, const b3Vec3& p2) const
{ {
b3RayCastInput input; b3RayCastInput input;
input.p1 = p1; input.p1 = p1;
input.p2 = p2; input.p2 = p2;
input.maxFraction = 1.0f; input.maxFraction = 1.0f;
output->triangle = ~0; u32 triangle0 = ~0;
output->fraction = B3_MAX_FLOAT; b3RayCastOutput output0;
output0.fraction = B3_MAX_FLOAT;
for (u32 i = 0; i < m_mesh->triangleCount; ++i) for (u32 i = 0; i < m_mesh->triangleCount; ++i)
{ {
b3RayCastSingleClothOutput subOutput; b3RayCastOutput subOutput;
if (RayCast(&subOutput, &input, i)) if (RayCast(&subOutput, &input, i))
{ {
if (subOutput.fraction < output->fraction) if (subOutput.fraction < output0.fraction)
{ {
*output = subOutput; triangle0 = i;
output0.fraction = subOutput.fraction;
output0.normal = subOutput.normal;
} }
} }
} }
if (output->triangle != ~0) if (triangle0 != ~0)
{ {
output->triangle = triangle0;
output->fraction = output0.fraction;
output->normal = output0.normal;
return true; return true;
} }
return false; return false;
} }
bool b3Cloth::RayCast(b3RayCastSingleClothOutput* output, const b3RayCastInput* input, u32 triangleIndex) const bool b3Cloth::RayCast(b3RayCastOutput* output, const b3RayCastInput* input, u32 triangleIndex) const
{ {
B3_ASSERT(triangleIndex < m_mesh->triangleCount); B3_ASSERT(triangleIndex < m_mesh->triangleCount);
b3ClothMeshTriangle* triangle = m_mesh->triangles + triangleIndex; b3ClothMeshTriangle* triangle = m_mesh->triangles + triangleIndex;
@ -468,9 +484,7 @@ bool b3Cloth::RayCast(b3RayCastSingleClothOutput* output, const b3RayCastInput*
// Is the intersection on the triangle? // Is the intersection on the triangle?
if (u > kTol && v > kTol && w > kTol) if (u > kTol && v > kTol && w > kTol)
{ {
output->triangle = triangleIndex;
output->fraction = fraction; output->fraction = fraction;
output->point = Q;
// Does the ray start from below or above the triangle? // Does the ray start from below or above the triangle?
if (numerator > 0.0f) if (numerator > 0.0f)

36
src/bounce/dynamics/world.cpp
View File

@ -493,38 +493,44 @@ bool b3World::RayCastSingleShape(b3RayCastSingleShapeOutput* output, const b3Vec
void b3World::RayCastCloth(b3RayCastListener* listener, const b3Vec3& p1, const b3Vec3& p2) const void b3World::RayCastCloth(b3RayCastListener* listener, const b3Vec3& p1, const b3Vec3& p2) const
{ {
b3RayCastInput input;
input.p1 = p1;
input.p2 = p2;
input.maxFraction = B3_MAX_FLOAT;
for (b3Cloth* c = m_clothList.m_head; c; c = c->m_next) for (b3Cloth* c = m_clothList.m_head; c; c = c->m_next)
{ {
c->RayCast(listener, &input); c->RayCast(listener, p1, p2);
} }
} }
bool b3World::RayCastSingleCloth(b3RayCastSingleClothOutput* output, const b3Vec3& p1, const b3Vec3& p2) const bool b3World::RayCastSingleCloth(b3RayCastSingleClothOutput* output, const b3Vec3& p1, const b3Vec3& p2) const
{ {
output->cloth = NULL; b3Cloth* cloth0 = NULL;
output->triangle = ~0; b3ClothRayCastSingleOutput output0;
output->fraction = B3_MAX_FLOAT; output0.fraction = B3_MAX_FLOAT;
for (b3Cloth* c = m_clothList.m_head; c; c = c->m_next) for (b3Cloth* c = m_clothList.m_head; c; c = c->m_next)
{ {
b3RayCastSingleClothOutput subOutput; b3ClothRayCastSingleOutput subOutput;
if (c->RayCastSingle(&subOutput, p1, p2)) if (c->RayCastSingle(&subOutput, p1, p2))
{ {
if (subOutput.fraction < output->fraction) if (subOutput.fraction < output0.fraction)
{ {
subOutput.cloth = c; cloth0 = c;
*output = subOutput; output0 = subOutput;
} }
} }
} }
if (output->cloth != NULL) if (cloth0 != NULL)
{ {
u32 triangle = output0.triangle;
float32 fraction = output0.fraction;
b3Vec3 point = (1.0f - fraction) * p1 + fraction * p2;
b3Vec3 normal = output0.normal;
output->triangle = triangle;
output->cloth = cloth0;
output->point = point;
output->normal = normal;
output->fraction = fraction;
return true; return true;
} }