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

made the changes as suggested by @hyperlogic

Browse source
This commit is contained in:
Thijs Wenker 2015-10-06 20:48:51 +02:00
parent 3c6e9378c3
commit 4e8fc08458
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/scripting/HMDScriptingInterface.cpp
View file

@ -58,16 +58,21 @@ float HMDScriptingInterface::getIPD() const {
return Application::getInstance()->getActiveDisplayPlugin()->getIPD(); return Application::getInstance()->getActiveDisplayPlugin()->getIPD();
} }
glm::mat4 HMDScriptingInterface::getWorldHMDMatrix() const {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
return myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
}
glm::vec3 HMDScriptingInterface::getPosition() const { glm::vec3 HMDScriptingInterface::getPosition() const {
if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) { if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) {
return glm::vec3(Application::getInstance()->getActiveDisplayPlugin()->getHeadPose()[3]); return extractTranslation(getWorldHMDMatrix());
} }
return glm::vec3(); return glm::vec3();
} }
glm::quat HMDScriptingInterface::getOrientation() const { glm::quat HMDScriptingInterface::getOrientation() const {
if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) { if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) {
return glm::quat_cast(Application::getInstance()->getActiveDisplayPlugin()->getHeadPose()); return glm::normalize(glm::quat_cast(getWorldHMDMatrix()));
} }
return glm::quat(); return glm::quat();
} }

1
interface/src/scripting/HMDScriptingInterface.h
View file

@ -46,6 +46,7 @@ private:
bool getHUDLookAtPosition3D(glm::vec3& result) const; bool getHUDLookAtPosition3D(glm::vec3& result) const;
glm::mat4 getWorldHMDMatrix() const;
}; };
#endif // hifi_HMDScriptingInterface_h #endif // hifi_HMDScriptingInterface_h