From 54b4612ee3cf267f6edb386b49c4280d1f4d1e26 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 23 Dec 2016 10:36:13 -0800
Subject: [PATCH] fix for missed START collision events

---
 libraries/physics/src/ContactInfo.cpp | 10 +++++-----
 libraries/physics/src/ContactInfo.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/physics/src/ContactInfo.cpp b/libraries/physics/src/ContactInfo.cpp
index c2ea6e8671..59948db671 100644
--- a/libraries/physics/src/ContactInfo.cpp
+++ b/libraries/physics/src/ContactInfo.cpp
@@ -13,15 +13,15 @@
 
 void ContactInfo::update(uint32_t currentStep, const btManifoldPoint& p) {
     _lastStep = currentStep;
-    ++_numSteps;
     positionWorldOnB = p.m_positionWorldOnB;
     normalWorldOnB = p.m_normalWorldOnB;
     distance = p.m_distance1;
-}   
+}
 
 ContactEventType ContactInfo::computeType(uint32_t thisStep) {
-    if (_lastStep != thisStep) {
-        return CONTACT_EVENT_TYPE_END;
+    ++_numChecks;
+    if (_numChecks == 1) {
+        return CONTACT_EVENT_TYPE_START;
     }
-    return (_numSteps == 1) ? CONTACT_EVENT_TYPE_START : CONTACT_EVENT_TYPE_CONTINUE;
+    return (_lastStep == thisStep) ? CONTACT_EVENT_TYPE_CONTINUE : CONTACT_EVENT_TYPE_END;
 }
diff --git a/libraries/physics/src/ContactInfo.h b/libraries/physics/src/ContactInfo.h
index 11c908a414..17356969d1 100644
--- a/libraries/physics/src/ContactInfo.h
+++ b/libraries/physics/src/ContactInfo.h
@@ -19,7 +19,7 @@
 
 
 class ContactInfo {
-public: 
+public:
     void update(uint32_t currentStep, const btManifoldPoint& p);
     ContactEventType computeType(uint32_t thisStep);
 
@@ -30,9 +30,9 @@ public:
     btVector3 normalWorldOnB;
     btScalar distance;
 private:
-    uint32_t _lastStep = 0;
-    uint32_t _numSteps = 0;
-};  
+    uint32_t _lastStep { 0 };
+    uint32_t _numChecks { 0 };
+};
 
 
 #endif // hifi_ContactEvent_h