Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 09:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

expose MyAvatar::setSensorToWorldMatrix()

Browse source
This commit is contained in:
Andrew Meadows 2016-09-09 16:31:36 -07:00
parent 7e7803c648
commit 0f248c4540
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/MyAvatar.cpp
View file

@ -547,8 +547,12 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV
void MyAvatar::updateSensorToWorldMatrix() {
// update the sensor mat so that the body position will end up in the desired
// position when driven from the head.
glm::mat4 desiredMat = createMatFromQuatAndPos(getOrientation(), getPosition());
_sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix);
glm::mat4 bodyToWorld = createMatFromQuatAndPos(getOrientation(), getPosition());
setSensorToWorldMatrix(bodyToWorld * glm::inverse(_bodySensorMatrix));
}
void MyAvatar::setSensorToWorldMatrix(const glm::mat4& sensorToWorld) {
_sensorToWorldMatrix = sensorToWorld;
lateUpdatePalms();

2
interface/src/avatar/MyAvatar.h
View file

@ -126,6 +126,8 @@ public:
// This is so the correct camera can be used for rendering.
void updateSensorToWorldMatrix();
void setSensorToWorldMatrix(const glm::mat4& sensorToWorld);
void setRealWorldFieldOfView(float realWorldFov) { _realWorldFieldOfView.set(realWorldFov); }
Q_INVOKABLE glm::vec3 getDefaultEyePosition() const;