Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

helper methods to rotate/translate CollisionInfo

Browse source
This commit is contained in:
Andrew Meadows 2014-02-21 16:24:40 -08:00
parent 8ede0ed32b
commit ef6d2a624b
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,18 @@
#include "CollisionInfo.h" #include "CollisionInfo.h"
void CollisionInfo::rotateThenTranslate(const glm::quat& rotation, const glm::vec3& translation) {
_contactPoint = translation + rotation * _contactPoint;
_penetration = rotation * _penetration;
_addedVelocity = rotation * _addedVelocity;
}
void CollisionInfo::translateThenRotate(const glm::vec3& translation, const glm::quat& rotation) {
_contactPoint = rotation * (_contactPoint + translation);
_penetration = rotation * _penetration;
_addedVelocity = rotation * _addedVelocity;
}
CollisionList::CollisionList(int maxSize) : CollisionList::CollisionList(int maxSize) :
_maxSize(maxSize), _maxSize(maxSize),
_size(0) { _size(0) {

7
libraries/shared/src/CollisionInfo.h
View file

@ -10,6 +10,7 @@
#define __hifi__CollisionInfo__ #define __hifi__CollisionInfo__
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
#include <QVector> #include <QVector>
@ -55,6 +56,12 @@ public:
~CollisionInfo() {} ~CollisionInfo() {}
/// Rotate and translate the details.
void rotateThenTranslate(const glm::quat& rotation, const glm::vec3& translation);
/// Translate then rotate the details
void translateThenRotate(const glm::vec3& translation, const glm::quat& rotation);
qint32 _type; // type of Collision (will determine what is supposed to be in _data and _flags) qint32 _type; // type of Collision (will determine what is supposed to be in _data and _flags)
void* _data; // pointer to user supplied data void* _data; // pointer to user supplied data
quint32 _flags; // 32 bits for whatever quint32 _flags; // 32 bits for whatever