Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cleanup' to 'cleanup2'

Browse source
This commit is contained in:
Andrew Meadows 2014-03-04 11:20:42 -08:00
commit 427cf02d03
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/Hand.cpp
View file

@ -57,8 +57,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 // Check for palm collisions
glm::vec3 myPalmPosition = palm.getPosition(); glm::vec3 myPalmPosition = palm.getPosition();
float palmCollisionDistance = 0.1f; float palmCollisionDistance = 0.1f;

2
libraries/shared/src/CollisionInfo.cpp
View file

@ -16,7 +16,7 @@ CollisionList::CollisionList(int maxSize) :
CollisionInfo* CollisionList::getNewCollision() { CollisionInfo* CollisionList::getNewCollision() {
// return pointer to existing CollisionInfo, or NULL of list is full // 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) { CollisionInfo* CollisionList::getCollision(int index) {