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

adding target scale and default avatar to login state

Browse source
This commit is contained in:
Wayne Chen 2018-12-17 13:37:28 -08:00
parent 711457b2d7
commit 28fd1380df
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Application.cpp
View file

@ -5176,7 +5176,13 @@ void Application::pauseUntilLoginDetermined() {
return; return;
} }
getMyAvatar()->setEnableMeshVisible(false); auto myAvatar = getMyAvatar();
_previousAvatarTargetScale = myAvatar->getTargetScale();
_previousAvatarSkeletonModel = myAvatar->getSkeletonModelURL().toString();
myAvatar->setTargetScale(1.0f);
myAvatar->setSkeletonModelURLFromScript(myAvatar->defaultFullAvatarModelUrl().toString());
myAvatar->setEnableMeshVisible(false);
_controllerScriptingInterface->disableMapping(STANDARD_TO_ACTION_MAPPING_NAME); _controllerScriptingInterface->disableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
{ {
@ -5231,7 +5237,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
userInputMapper->unloadMapping(NO_MOVEMENT_MAPPING_JSON); userInputMapper->unloadMapping(NO_MOVEMENT_MAPPING_JSON);
_controllerScriptingInterface->disableMapping(NO_MOVEMENT_MAPPING_NAME); _controllerScriptingInterface->disableMapping(NO_MOVEMENT_MAPPING_NAME);
} }
getMyAvatar()->setEnableMeshVisible(true);
auto myAvatar = getMyAvatar();
myAvatar->setTargetScale(_previousAvatarTargetScale);
myAvatar->setSkeletonModelURLFromScript(_previousAvatarSkeletonModel);
myAvatar->setEnableMeshVisible(true);
_controllerScriptingInterface->enableMapping(STANDARD_TO_ACTION_MAPPING_NAME); _controllerScriptingInterface->enableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
const auto& nodeList = DependencyManager::get<NodeList>(); const auto& nodeList = DependencyManager::get<NodeList>();

2
interface/src/Application.h
View file

@ -691,6 +691,8 @@ private:
bool _loginDialogPoppedUp = false; bool _loginDialogPoppedUp = false;
bool _developerMenuVisible{ false }; bool _developerMenuVisible{ false };
QString _previousAvatarSkeletonModel;
float _previousAvatarTargetScale;
CameraMode _previousCameraMode; CameraMode _previousCameraMode;
OverlayID _loginDialogOverlayID; OverlayID _loginDialogOverlayID;
LoginStateManager _loginStateManager; LoginStateManager _loginStateManager;

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

@ -1479,6 +1479,7 @@ void MyAvatar::loadData() {
setSnapTurn(_useSnapTurnSetting.get()); setSnapTurn(_useSnapTurnSetting.get());
setDominantHand(_dominantHandSetting.get(DOMINANT_RIGHT_HAND).toLower()); setDominantHand(_dominantHandSetting.get(DOMINANT_RIGHT_HAND).toLower());
setUserHeight(_userHeightSetting.get(DEFAULT_AVATAR_HEIGHT)); setUserHeight(_userHeightSetting.get(DEFAULT_AVATAR_HEIGHT));
setTargetScale(_scaleSetting.get());
setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible));
_follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing));