mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-23 02:41:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Convert scenery window to class (#16729)

Browse source 
* Convert scenery window to class

Close #13799

* Move static's into class

* Simplify eyedropper setting code
This commit is contained in:
Duncan 2022-03-04 07:17:20 +00:00 committed by GitHub
parent 323138ebd6
commit d219a99b56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1207 additions and 1271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1728
src/openrct2-ui/windows/Scenery.cpp
View file

File diff suppressed because it is too large Load diff

44
src/openrct2-ui/windows/TopToolbar.cpp
View file

@ -1103,13 +1103,10 @@ static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widge
auto* sceneryEntry = get_small_scenery_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_SMALL, entryIndex }))
{
gWindowSceneryRotation = sceneryElement->GetDirectionWithOffset(get_current_rotation());
gWindowSceneryPrimaryColour = sceneryElement->GetPrimaryColour();
gWindowScenerySecondaryColour = sceneryElement->GetSecondaryColour();
gWindowSceneryEyedropperEnabled = false;
}
WindowScenerySetSelectedItem(
{ SCENERY_TYPE_SMALL, entryIndex }, sceneryElement->GetPrimaryColour(),
sceneryElement->GetSecondaryColour(), std::nullopt,
sceneryElement->GetDirectionWithOffset(get_current_rotation()));
}
break;
}
@ -1119,13 +1116,9 @@ static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widge
auto* sceneryEntry = get_wall_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_WALL, entryIndex }))
{
gWindowSceneryPrimaryColour = info.Element->AsWall()->GetPrimaryColour();
gWindowScenerySecondaryColour = info.Element->AsWall()->GetSecondaryColour();
gWindowSceneryTertiaryColour = info.Element->AsWall()->GetTertiaryColour();
gWindowSceneryEyedropperEnabled = false;
}
WindowScenerySetSelectedItem(
{ SCENERY_TYPE_WALL, entryIndex }, info.Element->AsWall()->GetPrimaryColour(),
info.Element->AsWall()->GetSecondaryColour(), info.Element->AsWall()->GetTertiaryColour(), std::nullopt);
}
break;
}
@ -1135,13 +1128,10 @@ static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widge
auto* sceneryEntry = get_large_scenery_entry(entryIndex);
if (sceneryEntry != nullptr)
{
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_LARGE, entryIndex }))
{
gWindowSceneryRotation = (get_current_rotation() + info.Element->GetDirection()) & 3;
gWindowSceneryPrimaryColour = info.Element->AsLargeScenery()->GetPrimaryColour();
gWindowScenerySecondaryColour = info.Element->AsLargeScenery()->GetSecondaryColour();
gWindowSceneryEyedropperEnabled = false;
}
WindowScenerySetSelectedItem(
{ SCENERY_TYPE_LARGE, entryIndex }, info.Element->AsLargeScenery()->GetPrimaryColour(),
info.Element->AsLargeScenery()->GetSecondaryColour(), std::nullopt,
(get_current_rotation() + info.Element->GetDirection()) & 3);
}
break;
}
@ -1153,10 +1143,8 @@ static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widge
auto sceneryEntry = get_banner_entry(banner->type);
if (sceneryEntry != nullptr)
{
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_BANNER, banner->type }))
{
gWindowSceneryEyedropperEnabled = false;
}
WindowScenerySetSelectedItem(
{ SCENERY_TYPE_BANNER, banner->type }, std::nullopt, std::nullopt, std::nullopt, std::nullopt);
}
}
break;
@ -1167,10 +1155,8 @@ static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widge
auto* pathBitEntry = get_footpath_item_entry(entryIndex);
if (pathBitEntry != nullptr)
{
if (WindowScenerySetSelectedItem({ SCENERY_TYPE_PATH_ITEM, entryIndex }))
{
gWindowSceneryEyedropperEnabled = false;
}
WindowScenerySetSelectedItem(
{ SCENERY_TYPE_PATH_ITEM, entryIndex }, std::nullopt, std::nullopt, std::nullopt, std::nullopt);
}
break;
}

4
src/openrct2-ui/windows/Window.h
View file

@ -175,7 +175,9 @@ bool ClearSceneryToolIsActive();
bool WaterToolIsActive();
rct_window* WindowSceneryOpen();
bool WindowScenerySetSelectedItem(const ScenerySelection& scenery);
void WindowScenerySetSelectedItem(
const ScenerySelection& sceneryconst, std::optional<colour_t> primary, const std::optional<colour_t> secondary,
const std::optional<colour_t> tertiary, const std::optional<colour_t> rotation);
void WindowScenerySetSelectedTab(const ObjectEntryIndex sceneryGroupIndex);
void WindowScenerySetDefaultPlacementConfiguration();
void WindowSceneryInit();