diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 8abd77e0ba..8cec0fb816 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -37,6 +37,7 @@ C606CCD51DB4DD6C00FE4015 /* VerticalTunnelCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCD31DB4DD6C00FE4015 /* VerticalTunnelCall.cpp */; }; C606CD261DB5120C00FE4015 /* TestPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CD231DB5120900FE4015 /* TestPaint.cpp */; }; C612A8991D64825300B634CA /* vehicle_data.c in Sources */ = {isa = PBXBuildFile; fileRef = C612A8971D64825300B634CA /* vehicle_data.c */; }; + C6136C551E21893500F3ED2B /* view_clipping.c in Sources */ = {isa = PBXBuildFile; fileRef = C6136C541E21893500F3ED2B /* view_clipping.c */; }; C61FB7241CF86356004CE991 /* NetworkUser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61FB7221CF86356004CE991 /* NetworkUser.cpp */; }; C647C6911E1D0CA000C7FB21 /* AudioMixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C647C68F1E1D0CA000C7FB21 /* AudioMixer.cpp */; }; C649B3D41DF04ED2008AC826 /* format_codes.c in Sources */ = {isa = PBXBuildFile; fileRef = C649B3D31DF04ED2008AC826 /* format_codes.c */; }; @@ -550,6 +551,7 @@ C606CD241DB5120900FE4015 /* TestPaint.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TestPaint.hpp; sourceTree = ""; }; C612A8971D64825300B634CA /* vehicle_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vehicle_data.c; sourceTree = ""; }; C612A8981D64825300B634CA /* vehicle_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vehicle_data.h; sourceTree = ""; }; + C6136C541E21893500F3ED2B /* view_clipping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = view_clipping.c; sourceTree = ""; }; C61FB7221CF86356004CE991 /* NetworkUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkUser.cpp; sourceTree = ""; usesTabs = 0; }; C61FB7231CF86356004CE991 /* NetworkUser.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = NetworkUser.h; sourceTree = ""; usesTabs = 0; }; C647C68F1E1D0CA000C7FB21 /* AudioMixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioMixer.cpp; sourceTree = ""; }; @@ -1955,6 +1957,7 @@ D44271D31CC81B3200D84D28 /* track_list.c */, D44271D41CC81B3200D84D28 /* track_manage.c */, D44271D51CC81B3200D84D28 /* track_place.c */, + C6136C541E21893500F3ED2B /* view_clipping.c */, D44271D61CC81B3200D84D28 /* viewport.c */, D44271D71CC81B3200D84D28 /* water.c */, ); @@ -2719,6 +2722,7 @@ C61FB7241CF86356004CE991 /* NetworkUser.cpp in Sources */, D44272191CC81B3200D84D28 /* colour.c in Sources */, D442724C1CC81B3200D84D28 /* vehicle.c in Sources */, + C6136C551E21893500F3ED2B /* view_clipping.c in Sources */, D464FEED1D31A6AA00CBABAC /* ObjectManager.cpp in Sources */, D44272261CC81B3200D84D28 /* currency.c in Sources */, C65A88931E1B1148000368D7 /* FileAudioSource.cpp in Sources */, diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index e86a089d54..786722a52c 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4311,6 +4311,15 @@ STR_5999 :Set money STR_6000 :Enter new value STR_6001 :Enable lighting effects (experimental) STR_6002 :{SMALLFONT}{BLACK}Lamps and rides will be lit up at night.{NEWLINE}Requires rendering engine to be set to hardware display. +STR_6003 :Cut-away View +STR_6004 :Cut-away View +STR_6005 :Enable cut-away view +STR_6006 :{SMALLFONT}{BLACK}Cut-away view only displays map elements at or below the cut height +STR_6007 :Cut height +STR_6008 :{SMALLFONT}{BLACK}Click to toggle raw value<->value in measurement units +STR_6009 :{SMALLFONT}{BLACK}Select cut height +STR_6010 :{COMMA2DP32}m +STR_6011 :{COMMA1DP16}ft ############# # Scenarios # diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index f244850360..4c419ce5f8 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -167,6 +167,7 @@ WindowThemeDesc WindowThemeDescriptors[] = { THEME_WC(WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_SCENARIO_EDITOR, COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_MOSS_GREEN) ) }, { THEME_WC(WC_TITLE_EDITOR), STR_TITLE_EDITOR_TITLE, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, { THEME_WC(WC_TILE_INSPECTOR), STR_TILE_INSPECTOR_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_VIEW_CLIPPING), STR_VIEW_CLIPPING_TITLE, COLOURS_1(COLOUR_DARK_GREEN ) }, { THEME_WC(WC_CHANGELOG), STR_CHANGELOG_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, { THEME_WC(WC_MULTIPLAYER), STR_MULTIPLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, { THEME_WC(WC_PLAYER), STR_THEMES_WINDOW_PLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 60cd632756..5f5e226709 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -730,7 +730,7 @@ static void viewport_paint_column(rct_drawpixelinfo * dpi, uint32 viewFlags) { gCurrentViewportFlags = viewFlags; - if (viewFlags & (VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE)) { + if (viewFlags & (VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT)) { uint8 colour = 10; if (viewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES) { colour = 0; diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h index a4dd45702f..1aa293f887 100644 --- a/src/openrct2/interface/viewport.h +++ b/src/openrct2/interface/viewport.h @@ -39,7 +39,8 @@ enum { VIEWPORT_FLAG_HIDE_VERTICAL = (1 << 13), VIEWPORT_FLAG_INVISIBLE_SPRITES = (1 << 14), VIEWPORT_FLAG_15 = (1 << 15), - VIEWPORT_FLAG_SEETHROUGH_PATHS = (1 << 16) + VIEWPORT_FLAG_SEETHROUGH_PATHS = (1 << 16), + VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT = (1 << 17), }; enum { diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index e3931fef1e..cdffc5e4bb 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -471,6 +471,7 @@ enum { WC_SERVER_START = 128, WC_CUSTOM_CURRENCY_CONFIG = 129, WC_DEBUG_PAINT = 130, + WC_VIEW_CLIPPING = 131, // Only used for colour schemes WC_STAFF = 220, @@ -726,6 +727,9 @@ void window_editor_inventions_list_open(); void window_editor_scenario_options_open(); void window_editor_objective_options_open(); +void window_view_clipping_open(); +void window_view_clipping_close(); + void window_guest_list_init_vars_a(); void window_guest_list_init_vars_b(); void window_bubble_list_item(rct_window* w, sint32 item_position); diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index fce1fa922d..f83b8ea4a0 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -391,6 +391,7 @@ + @@ -595,4 +596,4 @@ - \ No newline at end of file + diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index fbfcc60200..3e693925e3 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -3654,6 +3654,16 @@ enum { STR_ENABLE_LIGHTING_EFFECTS = 6001, STR_ENABLE_LIGHTING_EFFECTS_TIP = 6002, + STR_VIEW_CLIPPING_MENU = 6003, + STR_VIEW_CLIPPING_TITLE = 6004, + STR_VIEW_CLIPPING_HEIGHT_ENABLE = 6005, + STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP = 6006, + STR_VIEW_CLIPPING_HEIGHT_VALUE = 6007, + STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE = 6008, + STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP = 6009, + STR_UNIT2DP_SUFFIX_METRES = 6010, + STR_UNIT1DP_SUFFIX_FEET = 6011, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c index 4c8d0b4685..1b0e748d1e 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/map_element/map_element.c @@ -167,6 +167,13 @@ static void sub_68B3FB(sint32 x, sint32 y) rct_map_element* map_element = map_get_first_element_at(x >> 5, y >> 5); uint8 rotation = get_current_rotation(); + /* Check if the first (lowest) map_element is below the clip + * height. */ + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (map_element->base_height > gClipHeight)) { + blank_tiles_paint(x, y); + return; + } + sint32 dx = 0; switch (rotation) { case 0: @@ -240,6 +247,9 @@ static void sub_68B3FB(sint32 x, sint32 y) gUnk9DE56C = y; gDidPassSurface = false; do { + // Only paint map_elements below the clip height. + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (map_element->base_height > gClipHeight)) break; + sint32 direction = (map_element->type + rotation) & MAP_ELEMENT_DIRECTION_MASK; sint32 height = map_element->base_height * 8; @@ -309,6 +319,9 @@ static void sub_68B3FB(sint32 x, sint32 y) imageColourFlats = 0b111011 << 19 | 0x40000000; } + // Only draw supports below the clipping height. + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (segmentHeight > gClipHeight)) continue; + sint32 xOffset = sy * 10; sint32 yOffset = -22 + sx * 10; paint_struct * ps = sub_98197C(5504 | imageColourFlats, xOffset, yOffset, 10, 10, 1, segmentHeight, xOffset + 1, yOffset + 16, segmentHeight, get_current_rotation()); diff --git a/src/openrct2/paint/paint.c b/src/openrct2/paint/paint.c index b058051cdd..95121d63ca 100644 --- a/src/openrct2/paint/paint.c +++ b/src/openrct2/paint/paint.c @@ -23,6 +23,9 @@ #include "sprite/sprite.h" #include "supports.h" +// Global for paint clipping height +uint8 gClipHeight = 128; // Default to middle value + const uint32 construction_markers[] = { COLOUR_DARK_GREEN << 19 | COLOUR_GREY << 24 | IMAGE_TYPE_REMAP, // White PALETTE_DARKEN_2 << 19 | IMAGE_TYPE_TRANSPARENT, // Translucent @@ -199,6 +202,7 @@ static paint_struct * sub_9819_c(uint32 image_id, rct_xyz16 offset, rct_xyz16 bo ps->map_x = gPaintMapPosition.x; ps->map_y = gPaintMapPosition.y; ps->mapElement = g_currently_drawn_item; + return ps; } @@ -366,7 +370,6 @@ paint_struct * sub_98197C( sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z, uint32 rotation ) { - g_ps_F1AD28 = 0; g_aps_F1AD2C = NULL; diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h index 0ff5d71246..2defef1976 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/paint.h @@ -23,6 +23,10 @@ #include "../interface/colour.h" #include "../drawing/drawing.h" +// Global for paint clipping height. +extern uint8 gClipHeight; + + typedef struct attached_paint_struct attached_paint_struct; typedef struct paint_struct paint_struct; typedef union paint_entry paint_entry; diff --git a/src/openrct2/paint/sprite/sprite.c b/src/openrct2/paint/sprite/sprite.c index 4269b18eb5..3bbf720dba 100644 --- a/src/openrct2/paint/sprite/sprite.c +++ b/src/openrct2/paint/sprite/sprite.c @@ -45,6 +45,13 @@ void sprite_paint_setup(const uint16 eax, const uint16 ecx) { for (rct_sprite* spr = get_sprite(sprite_idx); sprite_idx != SPRITE_INDEX_NULL; sprite_idx = spr->unknown.next_in_quadrant) { spr = get_sprite(sprite_idx); + + // Only paint sprites that are below the clip height. + // Here converting from land/path/etc height scale to pixel height scale. + // Note: peeps/scenery on slopes will be above the base + // height of the slope element, and consequently clipped. + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (spr->unknown.z > (gClipHeight * 8) )) continue; + dpi = unk_140E9A8; if (dpi->y + dpi->height <= spr->unknown.sprite_top) continue; diff --git a/src/openrct2/windows/themes.c b/src/openrct2/windows/themes.c index 9c206d6f13..70467d57fb 100644 --- a/src/openrct2/windows/themes.c +++ b/src/openrct2/windows/themes.c @@ -234,6 +234,7 @@ static rct_windowclass window_themes_tab_5_classes[] = { static rct_windowclass window_themes_tab_6_classes[] = { WC_CHEATS, WC_TILE_INSPECTOR, + WC_VIEW_CLIPPING, WC_THEMES, WC_TITLE_EDITOR, WC_OPTIONS, diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c index 4843cc1b5b..3feb68b2e2 100644 --- a/src/openrct2/windows/top_toolbar.c +++ b/src/openrct2/windows/top_toolbar.c @@ -98,6 +98,10 @@ typedef enum { DDIDX_LAND_HEIGHTS = 10, DDIDX_TRACK_HEIGHTS = 11, DDIDX_PATH_HEIGHTS = 12, + // 13 is a separator + DDIDX_VIEW_CLIPPING = 14, + + TOP_TOOLBAR_VIEW_MENU_COUNT } TOP_TOOLBAR_VIEW_MENU_DDIDX; typedef enum { @@ -3044,6 +3048,8 @@ void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { gDropdownItemsFormat[10] = STR_TOGGLE_OPTION; gDropdownItemsFormat[11] = STR_TOGGLE_OPTION; gDropdownItemsFormat[12] = STR_TOGGLE_OPTION; + gDropdownItemsFormat[13] = DROPDOWN_SEPARATOR; + gDropdownItemsFormat[DDIDX_VIEW_CLIPPING] = STR_TOGGLE_OPTION; gDropdownItemsArgs[0] = STR_UNDERGROUND_VIEW; gDropdownItemsArgs[1] = STR_REMOVE_BASE_LAND; @@ -3056,6 +3062,7 @@ void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { gDropdownItemsArgs[10] = STR_HEIGHT_MARKS_ON_LAND; gDropdownItemsArgs[11] = STR_HEIGHT_MARKS_ON_RIDE_TRACKS; gDropdownItemsArgs[12] = STR_HEIGHT_MARKS_ON_PATHS; + gDropdownItemsArgs[DDIDX_VIEW_CLIPPING] = STR_VIEW_CLIPPING_MENU; window_dropdown_show_text( w->x + widget->left, @@ -3063,7 +3070,7 @@ void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { widget->bottom - widget->top + 1, w->colours[1] | 0x80, 0, - 13 + TOP_TOOLBAR_VIEW_MENU_COUNT ); // Set checkmarks @@ -3090,6 +3097,8 @@ void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { dropdown_set_checked(11, true); if (mainViewport->flags & VIEWPORT_FLAG_PATH_HEIGHTS) dropdown_set_checked(12, true); + if (mainViewport->flags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) + dropdown_set_checked(DDIDX_VIEW_CLIPPING, true); gDropdownDefaultIndex = DDIDX_UNDERGROUND_INSIDE; } @@ -3136,6 +3145,9 @@ void top_toolbar_view_menu_dropdown(sint16 dropdownIndex) case DDIDX_PATH_HEIGHTS: w->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS; break; + case DDIDX_VIEW_CLIPPING: + window_view_clipping_open(); + break; default: return; } diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c new file mode 100644 index 0000000000..c11d127e96 --- /dev/null +++ b/src/openrct2/windows/view_clipping.c @@ -0,0 +1,286 @@ +#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#include "../config.h" +#include "../interface/themes.h" +#include "../interface/widget.h" +#include "../interface/window.h" +#include "../interface/viewport.h" +#include "../localisation/localisation.h" +#include "../paint/paint.h" +#include "../rct2.h" + +enum WINDOW_VIEW_CLIPPING_WIDGET_IDX { + WIDX_BACKGROUND, + WIDX_TITLE, + WIDX_CLOSE, + WIDX_CLIP_HEIGHT_CHECKBOX, + WIDX_CLIP_HEIGHT_VALUE, + WIDX_CLIP_HEIGHT_INCREASE, + WIDX_CLIP_HEIGHT_DECREASE, + WIDX_CLIP_HEIGHT_SLIDER +}; + +typedef enum DISPLAY_TYPE { + DISPLAY_RAW, + DISPLAY_UNITS +} clip_value_display_type; + +clip_value_display_type gClipHeightDisplayType = DISPLAY_UNITS; + +#pragma region Widgets + +#define WW 160 +#define WH 70 + +rct_widget window_view_clipping_widgets[] = { + { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, // panel / background + { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_VIEW_CLIPPING_TITLE, STR_WINDOW_TITLE_TIP }, // title bar + { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_CHECKBOX, 0, 11, 149, 19, 29, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP }, // clip height enable/disable check box + { WWT_SPINNER, 0, 90, 149, 34, 45, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE }, // clip height value + { WWT_DROPDOWN_BUTTON, 0, 138, 148, 35, 39, STR_NUMERIC_UP, STR_NONE }, // clip height increase + { WWT_DROPDOWN_BUTTON, 0, 138, 148, 40, 44, STR_NUMERIC_DOWN, STR_NONE }, // clip height decrease + { WWT_SCROLL, 0, 11, 149, 49, 61, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP }, // clip height scrollbar + { WIDGETS_END } +}; + +#pragma endregion + +#pragma region Events + +static void window_view_clipping_close_button(rct_window *w); +static void window_view_clipping_mouseup(rct_window *w, int widgetIndex); +static void window_view_clipping_update(rct_window *w); +static void window_view_clipping_invalidate(rct_window *w); +static void window_view_clipping_paint(rct_window *w, rct_drawpixelinfo *dpi); +static void window_view_clipping_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); + +static rct_window_event_list window_view_clipping_events = { + window_view_clipping_close_button, + window_view_clipping_mouseup, + NULL, + NULL, + NULL, + NULL, + window_view_clipping_update, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + window_view_clipping_scrollgetsize, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + window_view_clipping_invalidate, + window_view_clipping_paint, + NULL +}; + +#pragma endregion + +static void window_view_clipping_set_clipheight(rct_window *w, const uint8 clipheight) +{ + gClipHeight = clipheight; + rct_widget* widget = &window_view_clipping_widgets[WIDX_CLIP_HEIGHT_SLIDER]; + const float clip_height_ratio = (float)gClipHeight / 255; + w->scrolls[0].h_left = (sint16)ceil(clip_height_ratio * (w->scrolls[0].h_right - ((widget->right - widget->left) - 1))); +} + +void window_view_clipping_open() +{ + rct_window* window; + + // Get the main viewport to set the view clipping flag. + rct_window *mainWindow = window_get_main(); + + // Check if window is already open + if (window_find_by_class(WC_VIEW_CLIPPING) != NULL) { + // If window is already open, toggle the view clipping on/off + if (mainWindow != NULL) { + mainWindow->viewport->flags ^= VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT; + window_invalidate(mainWindow); + } + + return; + } + + // Window is not open - create it. + window = window_create(32, 32, WW, WH, &window_view_clipping_events, WC_VIEW_CLIPPING, 0); + window->widgets = window_view_clipping_widgets; + window->enabled_widgets = (1ULL << WIDX_CLOSE) | + (1ULL << WIDX_CLIP_HEIGHT_CHECKBOX) | + (1ULL << WIDX_CLIP_HEIGHT_VALUE) | + (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | + (1ULL << WIDX_CLIP_HEIGHT_DECREASE) | + (1ULL << WIDX_CLIP_HEIGHT_SLIDER); + + window_init_scroll_widgets(window); + + // Initialise the clip height slider from the current clip height value. + window_view_clipping_set_clipheight(window, gClipHeight); + + window_push_others_below(window); + + colour_scheme_update(window); + + // Turn on view clipping when the window is opened. + if (mainWindow != NULL) { + mainWindow->viewport->flags |= VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT; + window_invalidate(mainWindow); + } + + window_invalidate(window); +} + +void window_view_clipping_close() +{ + // Turn off view clipping when the window is closed. + rct_window *mainWindow = window_get_main(); + if (mainWindow != NULL) { + mainWindow->viewport->flags &= ~VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT; + window_invalidate(mainWindow); + } + +} + +static void window_view_clipping_close_button(rct_window *w) +{ + window_view_clipping_close(); +} + +static void window_view_clipping_mouseup(rct_window *w, int widgetIndex) +{ + rct_window *mainWindow; + + // mouseup appears to be used for buttons, checkboxes + switch (widgetIndex) { + case WIDX_CLOSE: + window_close(w); + break; + case WIDX_CLIP_HEIGHT_CHECKBOX: + // Toggle height clipping. + mainWindow = window_get_main(); + if (mainWindow != NULL) { + mainWindow->viewport->flags ^= VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT; + window_invalidate(mainWindow); + } + window_invalidate(w); + break; + case WIDX_CLIP_HEIGHT_INCREASE: + if (gClipHeight < 255) + window_view_clipping_set_clipheight(w, gClipHeight + 1); + mainWindow = window_get_main(); + if (mainWindow != NULL) + window_invalidate(mainWindow); + break; + case WIDX_CLIP_HEIGHT_DECREASE: + if (gClipHeight > 0) + window_view_clipping_set_clipheight(w, gClipHeight - 1); + mainWindow = window_get_main(); + if (mainWindow != NULL) + window_invalidate(mainWindow); + break; + case WIDX_CLIP_HEIGHT_VALUE: + // Toggle display of the cut height value in RAW vs UNITS + gClipHeightDisplayType = !gClipHeightDisplayType; + window_invalidate(w); + break; + } +} + +static void window_view_clipping_update(rct_window *w) +{ + const rct_widget *const widget = &window_view_clipping_widgets[WIDX_CLIP_HEIGHT_SLIDER]; + const rct_scroll *const scroll = &w->scrolls[0]; + const sint16 scroll_width = widget->right - widget->left - 1; + const uint8 clip_height = (uint8)(((float)scroll->h_left / (scroll->h_right - scroll_width)) * 255); + if (clip_height != gClipHeight) { + gClipHeight = clip_height; + + // Update the main window accordingly. + rct_window *mainWindow = window_get_main(); + if (mainWindow != NULL) { + window_invalidate(mainWindow); + } + } + widget_invalidate(w, WIDX_CLIP_HEIGHT_SLIDER); +} + +static void window_view_clipping_invalidate(rct_window *w) +{ + colour_scheme_update(w); + + widget_scroll_update_thumbs(w, WIDX_CLIP_HEIGHT_SLIDER); + + rct_window *mainWindow = window_get_main(); + if (mainWindow != NULL) { + widget_set_checkbox_value(w, WIDX_CLIP_HEIGHT_CHECKBOX, mainWindow->viewport->flags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT); + } +} + +static void window_view_clipping_paint(rct_window *w, rct_drawpixelinfo *dpi) +{ + window_draw_widgets(w, dpi); + + // Clip height value + sint32 x = w->x + 8; + sint32 y = w->y + w->widgets[WIDX_CLIP_HEIGHT_VALUE].top; + gfx_draw_string_left(dpi, STR_VIEW_CLIPPING_HEIGHT_VALUE, NULL, w->colours[0], x, y); + + x = w->x + w->widgets[WIDX_CLIP_HEIGHT_VALUE].left + 1; + y = w->y + w->widgets[WIDX_CLIP_HEIGHT_VALUE].top; + + fixed32_2dp clipHeightValueInMeters; + fixed16_1dp clipHeightValueInFeet; + sint32 clipHeightRawValue = (sint32)gClipHeight; + switch (gClipHeightDisplayType) { + case DISPLAY_RAW: + default: + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &clipHeightRawValue, w->colours[0], x, y); //Printing the raw value. + break; + + case DISPLAY_UNITS: + // Print the value in the configured measurement units. + switch (gConfigGeneral.measurement_format) { + case MEASUREMENT_FORMAT_METRIC: + case MEASUREMENT_FORMAT_SI: + clipHeightValueInMeters = (fixed32_2dp)(FIXED_2DP(gClipHeight, 0) / 2 * 1.5f - FIXED_2DP(10, 50)); + gfx_draw_string_left(dpi, STR_UNIT2DP_SUFFIX_METRES, &clipHeightValueInMeters, w->colours[0], x, y); + break; + case MEASUREMENT_FORMAT_IMPERIAL: + default: + clipHeightValueInFeet = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2.0f * 5 - FIXED_1DP(35, 0)); + gfx_draw_string_left(dpi, STR_UNIT1DP_SUFFIX_FEET, &clipHeightValueInFeet, w->colours[0], x, y); + break; + } + } +} + +static void window_view_clipping_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +{ + *width = 1000; +} diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index 1ca8ff1752..7b8a1a671e 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -36,6 +36,7 @@ sint16 gMapSizeUnits; sint16 gMapBaseZ; bool gTrackDesignSaveMode = false; uint8 gTrackDesignSaveRideIndex = 255; +uint8 gClipHeight = 255; const rct_xy16 TileDirectionDelta[] = { {-32, 0},