History

changed HMDScriptingInterface MyAvatar to new way of retrieving this object

Thijs Wenker committed 11 years ago

Commit 0e663051 parent e3ca1ef1 file · +3 −1Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+3−1
@@ -11,6 +11,8 @@ · 10 unmodified lines
11 11
12#include "HMDScriptingInterface.h"12#include "HMDScriptingInterface.h"
13 13
14#include <avatar/AvatarManager.h>
15
14HMDScriptingInterface& HMDScriptingInterface::getInstance() {16HMDScriptingInterface& HMDScriptingInterface::getInstance() {
15 static HMDScriptingInterface sharedInstance;17 static HMDScriptingInterface sharedInstance;
16 return sharedInstance;18 return sharedInstance;
@@ -31,7 +33,7 @@ glm::vec3 HMDScriptingInterface::getHUDLookAtPosition3D() const { · 14 unmodified lines
31}33}
32 34
33glm::vec2 HMDScriptingInterface::getHUDLookAtPosition2D() const {35glm::vec2 HMDScriptingInterface::getHUDLookAtPosition2D() const {
34 MyAvatar* myAvatar = Application::getInstance()->getAvatar();36 MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
35 glm::vec3 sphereCenter = myAvatar->getDefaultEyePosition();37 glm::vec3 sphereCenter = myAvatar->getDefaultEyePosition();
36 38
37 glm::vec3 hudIntersection = getHUDLookAtPosition3D();39 glm::vec3 hudIntersection = getHUDLookAtPosition3D();