From 9414b7a2758fedeb62ec78e7d659f67e899d78ed Mon Sep 17 00:00:00 2001 From: Irlan Date: Mon, 17 Jun 2019 14:27:22 -0300 Subject: [PATCH] Put a member variable prefix --- include/bounce/cloth/cloth_contact.h | 2 +- src/bounce/cloth/cloth_contact.cpp | 6 +++--- src/bounce/cloth/cloth_contact_solver.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/bounce/cloth/cloth_contact.h b/include/bounce/cloth/cloth_contact.h index d2760a8..86646b0 100644 --- a/include/bounce/cloth/cloth_contact.h +++ b/include/bounce/cloth/cloth_contact.h @@ -53,7 +53,7 @@ private: float32 m_normalImpulse; - float32 w2, w3, w4; + float32 m_w2, m_w3, m_w4; bool m_active; diff --git a/src/bounce/cloth/cloth_contact.cpp b/src/bounce/cloth/cloth_contact.cpp index 7fafa9e..814a728 100644 --- a/src/bounce/cloth/cloth_contact.cpp +++ b/src/bounce/cloth/cloth_contact.cpp @@ -172,7 +172,7 @@ void b3ParticleTriangleContact::Update() m_active = true; // Store Barycentric coordinates for P1 - w2 = wABC[0]; - w3 = wABC[1]; - w4 = wABC[2]; + m_w2 = wABC[0]; + m_w3 = wABC[1]; + m_w4 = wABC[2]; } \ No newline at end of file diff --git a/src/bounce/cloth/cloth_contact_solver.cpp b/src/bounce/cloth/cloth_contact_solver.cpp index cf30a5d..b713c4f 100644 --- a/src/bounce/cloth/cloth_contact_solver.cpp +++ b/src/bounce/cloth/cloth_contact_solver.cpp @@ -216,9 +216,9 @@ void b3ClothContactSolver::InitializeTriangleContactConstraints() pc->triangleRadius = 0.0f; - pc->wB = c->w2; - pc->wC = c->w3; - pc->wD = c->w4; + pc->wB = c->m_w2; + pc->wC = c->m_w3; + pc->wD = c->m_w4; u32 indexA = pc->indexA; float32 mA = pc->invMassA;