From 342c9fb3a8783357ad65a5eda32a8c7893b0c7d5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 19 Feb 2014 11:04:58 -0800 Subject: [PATCH 1/2] Fixing bad brace formatting. --- interface/src/avatar/Hand.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index efbdfa2438..00708c05d0 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -125,8 +125,7 @@ void Hand::simulate(float deltaTime, bool isMine) { } } -void Hand::playSlaps(PalmData& palm, Avatar* avatar) -{ +void Hand::playSlaps(PalmData& palm, Avatar* avatar) { // Check for palm collisions glm::vec3 myPalmPosition = palm.getPosition(); float palmCollisionDistance = 0.1f; From caba4f9b9b36a9ad2c315f5633a795ff6719fa3f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 20 Feb 2014 07:58:30 -0800 Subject: [PATCH 2/2] Fix for crash when CollisionList gets full. --- libraries/shared/src/CollisionInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/shared/src/CollisionInfo.cpp b/libraries/shared/src/CollisionInfo.cpp index 5d74d591c6..f20ffe83e0 100644 --- a/libraries/shared/src/CollisionInfo.cpp +++ b/libraries/shared/src/CollisionInfo.cpp @@ -16,7 +16,7 @@ CollisionList::CollisionList(int maxSize) : CollisionInfo* CollisionList::getNewCollision() { // return pointer to existing CollisionInfo, or NULL of list is full - return (_size < _maxSize) ? &(_collisions[++_size]) : NULL; + return (_size < _maxSize) ? &(_collisions[_size++]) : NULL; } CollisionInfo* CollisionList::getCollision(int index) {