Merge remote-tracking branch 'origin/master' into CPArrow

2016-03-01 20:33:30 +01:00
parent 6281e20000 9747a201b7
commit a38c18fd3a
32 changed files with 552 additions and 268 deletions
@@ -42,9 +42,9 @@ private:
    int m_NumberOfCapturePoints = 0;
    std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;

-    //std::vector<ComponentWrapper>
-
    bool m_ResetTimers = false;
+    bool m_RecentlyCapturedNeedNextCapturePointNow = false;
+    Events::Captured m_CapturedEvent;

    //vectors which will keep track of enter/leave changes
    std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;