diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2018-06-14 09:51:59 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2018-08-01 05:54:01 +0000 |
| commit | 4a01cf373171853126e39502e13ec645964d4110 (patch) | |
| tree | 029172399d20efc5628005743a16e62af753b2e9 /src/Authoring/Studio/MainFrm.cpp | |
| parent | 825651b6e975ffbc1069c0d747018fff2f232cb7 (diff) | |
Implement scene lighting toggle
Task-number: QT3DS-1653
Change-Id: I6b9f4c2461ae7371603d3e721a965f9c9cb520f0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
| -rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index fc994e99..d25c02d6 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -177,6 +177,8 @@ CMainFrame::CMainFrame() connect(m_ui->actionWireframe, &QAction::triggered, this, &CMainFrame::OnViewWireframe); connect(m_ui->actionTooltips, &QAction::triggered, this, &CMainFrame::OnViewTooltips); connect(m_ui->actionCamera_Preview, &QAction::triggered, this, &CMainFrame::OnShowEditPreview); + connect(m_ui->actionEdit_Lighting, &QAction::triggered, this, + &CMainFrame::OnEditViewLightingEnabled); // connect(m_ui->actionFind, &QAction::triggered, this, &CMainFrame::onViewFind); // TODO: Implement // Timeline Menu @@ -296,6 +298,7 @@ CMainFrame::CMainFrame() OnUpdateClearGuides(); OnUpdateLockGuides(); OnUpdateCameraPreview(); + OnUpdateEditViewLightingEnabled(); }); m_playbackTimer->setInterval(PLAYBACK_TIMER_TIMEOUT); @@ -1436,7 +1439,7 @@ void CMainFrame::HandleEditViewFillModeKey() { if (m_sceneView.data() == GetActiveView() && !m_sceneView->isDeploymentView()) { OnEditViewFillMode(); - bool theEditViewFillMode = g_StudioApp.getRenderer().IsEditLightEnabled(); + bool theEditViewFillMode = g_StudioApp.getRenderer().IsPolygonFillModeEnabled(); m_ui->actionShading_Mode->setChecked(theEditViewFillMode); } } @@ -1449,8 +1452,8 @@ void CMainFrame::HandleEditViewFillModeKey() //============================================================================== void CMainFrame::OnEditViewFillMode() { - bool theEditViewFillMode = !g_StudioApp.getRenderer().IsEditLightEnabled(); - g_StudioApp.getRenderer().SetEnableEditLight(theEditViewFillMode); + bool theEditViewFillMode = !g_StudioApp.getRenderer().IsPolygonFillModeEnabled(); + g_StudioApp.getRenderer().SetPolygonFillModeEnabled(theEditViewFillMode); } //============================================================================== @@ -1467,7 +1470,7 @@ void CMainFrame::OnUpdateEditViewFillMode() { if (m_sceneView.data() == GetActiveView() && !m_sceneView->isDeploymentView()) { m_ui->actionShading_Mode->setEnabled(true); - m_ui->actionShading_Mode->setChecked(g_StudioApp.getRenderer().IsEditLightEnabled()); + m_ui->actionShading_Mode->setChecked(g_StudioApp.getRenderer().IsPolygonFillModeEnabled()); } else { m_ui->actionShading_Mode->setEnabled(false); m_ui->actionShading_Mode->setChecked(false); @@ -1519,6 +1522,12 @@ void CMainFrame::OnUpdateCameraPreview() g_StudioApp.getRenderer().RequestRender(); } +void CMainFrame::OnUpdateEditViewLightingEnabled() +{ + m_ui->actionEdit_Lighting->setChecked(CStudioPreferences::editModeLightingEnabled()); + g_StudioApp.getRenderer().RequestRender(); +} + void CMainFrame::timerEvent(QTimerEvent *event) { if (event->timerId() == WM_STUDIO_TIMER) @@ -1880,6 +1889,12 @@ void CMainFrame::OnShowEditPreview() CStudioPreferences::setShowEditModePreview(!show); } +void CMainFrame::OnEditViewLightingEnabled() +{ + bool enabled = CStudioPreferences::editModeLightingEnabled(); + CStudioPreferences::setEditModeLightingEnabled(!enabled); +} + void CMainFrame::OnConnectionChanged(bool connected) { g_StudioApp.GetCore()->GetDispatch()->FireOnProgressEnd(); |