birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update camera naming and behavior after the merge in

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
rhhong
2021-10-05 13:03:22 -07:00
parent 10febe2a4b
commit 646369c1b5
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportSettings.cpp
+1 -3
View File
@@ -66,8 +66,6 @@ namespace EMStudio::ViewportUtil
AzFramework::InputChannelId BuildRotateCameraInputId()
{
AzFramework::InputChannelId inputChannelId(
EMStudio::ViewportUtil::GetRegistry(CameraOrbitLookIdSetting, AZStd::string("mouse_button_left")).c_str());
return inputChannelId;
return AzFramework::InputChannelId(GetRegistry(CameraOrbitLookIdSetting, AZStd::string("mouse_button_left")).c_str());
}
}
Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
+12 -7
View File
@@ -38,12 +38,17 @@ namespace EMStudio
void AnimViewportWidget::SetupCameras()
{
m_orbitRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(EMStudio::ViewportUtil::BuildRotateCameraInputId());
m_pivotRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(EMStudio::ViewportUtil::BuildRotateCameraInputId());
const auto translateCameraInputChannelIds = EMStudio::ViewportUtil::BuildTranslateCameraInputChannelIds();
m_orbitTranslateCamera =
AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::OrbitTranslation, translateCameraInputChannelIds);
m_orbitDollyScrollCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();
m_pivotTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslatePivot);
m_pivotTranslateCamera.get()->m_translateSpeedFn = []
{
return 3.0f;
};
m_pivotDollyScrollCamera = AZStd::make_shared<AzFramework::PivotDollyScrollCameraInput>();
}
void AnimViewportWidget::SetupCameraController()
@@ -89,9 +94,9 @@ namespace EMStudio
controller->SetCameraListBuilderCallback(
[this](AzFramework::Cameras& cameras)
{
cameras.AddCamera(m_orbitRotateCamera);
cameras.AddCamera(m_orbitTranslateCamera);
cameras.AddCamera(m_orbitDollyScrollCamera);
cameras.AddCamera(m_pivotRotateCamera);
cameras.AddCamera(m_pivotTranslateCamera);
cameras.AddCamera(m_pivotDollyScrollCamera);
});
GetControllerList()->Add(controller);
}
Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
+3 -3
View File
@@ -26,8 +26,8 @@ namespace EMStudio
void SetupCameraController();
AZStd::unique_ptr<AnimViewportRenderer> m_renderer;
AZStd::shared_ptr<AzFramework::RotateCameraInput> m_orbitRotateCamera;
AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_orbitTranslateCamera;
AZStd::shared_ptr<AzFramework::OrbitDollyScrollCameraInput> m_orbitDollyScrollCamera;
AZStd::shared_ptr<AzFramework::RotateCameraInput> m_pivotRotateCamera;
AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_pivotTranslateCamera;
AZStd::shared_ptr<AzFramework::PivotDollyScrollCameraInput> m_pivotDollyScrollCamera;
};
}
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.cpp
+2 -2
View File
@@ -155,12 +155,12 @@ namespace EMStudio
cameraMenu->addAction("Reset Camera", [this]() { this->OnResetCamera(); });
QAction* showSelectedAction = cameraMenu->addAction("Show Selected", this, &RenderViewWidget::OnShowSelected);
showSelectedAction->setShortcut(Qt::Key_S);
showSelectedAction->setShortcut(QKeySequence(Qt::Key_S + Qt::SHIFT));
GetMainWindow()->GetShortcutManager()->RegisterKeyboardShortcut(showSelectedAction, RenderPlugin::s_renderWindowShortcutGroupName, true);
addAction(showSelectedAction);
QAction* showEntireSceneAction = cameraMenu->addAction("Show Entire Scene", this, &RenderViewWidget::OnShowEntireScene);
showEntireSceneAction->setShortcut(Qt::Key_A);
showEntireSceneAction->setShortcut(QKeySequence(Qt::Key_A + Qt::SHIFT));
GetMainWindow()->GetShortcutManager()->RegisterKeyboardShortcut(showEntireSceneAction, RenderPlugin::s_renderWindowShortcutGroupName, true);
addAction(showEntireSceneAction);