Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Remove hardcoded shadows in Atlas UI

Browse Source 
Fixes c9a7aabbea
Patch by: @nwtour
Accepted by: @phosit
Tested by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4400
This was SVN commit r26730.
This commit is contained in:
Stan 2022-03-28 22:47:52 +00:00
parent ff7c5c7601
commit 3f8cbecd72
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2020 Wildfire Games.
/* Copyright (C) 2021 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -84,7 +84,6 @@ private:
bool m_ViewerMove;
bool m_ViewerGround;
bool m_ViewerWater;
bool m_ViewerShadows;
bool m_ViewerPolyCount;
bool m_ViewerBoundingBox;
bool m_ViewerAxesMarker;
@ -523,7 +522,6 @@ ObjectBottomBar::ObjectBottomBar(
m_ViewerMove = false;
m_ViewerGround = true;
m_ViewerWater = false;
m_ViewerShadows = true;
m_ViewerPolyCount = false;
m_ViewerBoundingBox = false;
m_ViewerAxesMarker = false;
@ -701,7 +699,6 @@ void ObjectBottomBar::OnFirstDisplay()
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"walk", m_ViewerMove));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"ground", m_ViewerGround));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"water", m_ViewerWater));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"shadows", m_ViewerShadows));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"stats", m_ViewerPolyCount));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"bounding_box", m_ViewerBoundingBox));
POST_MESSAGE(SetViewParamI, (AtlasMessage::eRenderView::ACTOR, L"prop_points", m_ViewerPropPointsMode));
@ -734,8 +731,7 @@ void ObjectBottomBar::OnViewerSetting(wxCommandEvent& evt)
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"water", m_ViewerWater));
break;
case ID_ViewerShadows:
m_ViewerShadows = !m_ViewerShadows;
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"shadows", m_ViewerShadows));
POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"shadows", true));
break;
case ID_ViewerPolyCount:
m_ViewerPolyCount = !m_ViewerPolyCount;

4
source/tools/atlas/GameInterface/ActorViewer.cpp
View File

@ -477,6 +477,10 @@ void ActorViewer::SetShadowsEnabled(bool enabled) {
g_RenderingOptions.SetShadows(enabled);
m.ShadowsEnabled = enabled;
}
void ActorViewer::ToggleShadows()
{
SetShadowsEnabled(!m.ShadowsEnabled);
}
void ActorViewer::SetBoundingBoxesEnabled(bool enabled) { m.SelectionBoxEnabled = enabled; }
void ActorViewer::SetAxesMarkerEnabled(bool enabled) { m.AxesMarkerEnabled = enabled; }
void ActorViewer::SetPropPointsMode(int mode) { m.PropPointsMode = mode; }

1
source/tools/atlas/GameInterface/ActorViewer.h
View File

@ -42,6 +42,7 @@ public:
void SetGroundEnabled(bool enabled);
void SetWaterEnabled(bool enabled);
void SetShadowsEnabled(bool enabled);
void ToggleShadows();
void SetStatsEnabled(bool enabled);
void SetBoundingBoxesEnabled(bool enabled);
void SetAxesMarkerEnabled(bool enabled);

2
source/tools/atlas/GameInterface/View.cpp
View File

@ -149,7 +149,7 @@ void AtlasViewActor::SetParam(const std::wstring& name, bool value)
//else if (name == L"water")
//m_ActorViewer->SetWaterEnabled(value);
else if (name == L"shadows")
m_ActorViewer->SetShadowsEnabled(value);
m_ActorViewer->ToggleShadows();
else if (name == L"stats")
m_ActorViewer->SetStatsEnabled(value);
else if (name == L"bounding_box")