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

Build fixes for change in getMyAvatar() from DepenencyManager

Browse source 
It now returns a smart_ptr, not a raw pointer.
This commit is contained in:
Anthony J. Thibault 2016-10-05 17:57:48 -07:00
parent cc7a6ada38
commit 2fdd5e4368
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Menu.cpp
View file

@ -517,9 +517,9 @@ Menu::Menu() {
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderOtherLookAtVectors, 0, false);
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayLeftFootTrace, 0, false,
avatar, SLOT(setEnableDebugDrawLeftFootTrace(bool)));
avatar.get(), SLOT(setEnableDebugDrawLeftFootTrace(bool)));
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayRightFootTrace, 0, false,
avatar, SLOT(setEnableDebugDrawRightFootTrace(bool)));
avatar.get(), SLOT(setEnableDebugDrawRightFootTrace(bool)));
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,
avatar.get(), SLOT(setEnableDebugDrawDefaultPose(bool)));
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawAnimPose, 0, false,
@ -553,11 +553,11 @@ Menu::Menu() {
// KINEMATIC_CONTROLLER_HACK
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::MoveKinematically, 0, false,
avatar, SLOT(updateMotionBehaviorFromMenu()),
avatar.get(), SLOT(updateMotionBehaviorFromMenu()),
UNSPECIFIED_POSITION, "Developer");
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableVerticalComfortMode, 0, false,
avatar, SLOT(setEnableVerticalComfortMode(bool)));
avatar.get(), SLOT(setEnableVerticalComfortMode(bool)));
// Developer > Hands >>>
MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");

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

@ -95,7 +95,7 @@ void HMDScriptingInterface::setPosition(const glm::vec3& position) {
QMetaObject::invokeMethod(this, "setPosition", Qt::QueuedConnection, Q_ARG(const glm::vec3&, position));
return;
} else {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
glm::mat4 hmdToSensor = myAvatar->getHMDSensorMatrix();
glm::mat4 sensorToWorld = myAvatar->getSensorToWorldMatrix();
glm::mat4 hmdToWorld = sensorToWorld * hmdToSensor;
@ -156,6 +156,6 @@ void HMDScriptingInterface::centerUI() {
}
void HMDScriptingInterface::snapToAvatar() {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
myAvatar->updateSensorToWorldMatrix();
}