mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Move virtual_floor_paint to own file / add edge highlighting

Browse Source
This commit is contained in:
Jeroen D Stout
2017-09-30 21:28:44 +02:00
committed by Aaron van Geffen
parent d67aba09ad
commit 79fa16138a
3 changed files with 211 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/openrct2/paint/tile_element/TileElement.cpp
View File

@@ -358,64 +358,6 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y)
}
}
void virtual_floor_paint(paint_session * session)
{
if (!input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z | PLACE_OBJECT_MODIFIER_SHIFT_Z))
{
return;
}
bool showFade = false;
bool showLit = false;
if ((gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) &&
session->MapPosition.x >= gMapSelectPositionA.x - gMapVirtualFloorBaseSize &&
session->MapPosition.y >= gMapSelectPositionA.y - gMapVirtualFloorBaseSize &&
session->MapPosition.x <= gMapSelectPositionB.x + gMapVirtualFloorBaseSize &&
session->MapPosition.y <= gMapSelectPositionB.y + gMapVirtualFloorBaseSize)
{
showFade = true;
}
if (!showFade && !(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT))
{
return;
}
LocationXY16 * tile;
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {
if (session->MapPosition.x >= tile->x - gMapVirtualFloorBaseSize &&
session->MapPosition.y >= tile->y - gMapVirtualFloorBaseSize &&
session->MapPosition.x <= tile->x + gMapVirtualFloorBaseSize &&
session->MapPosition.y <= tile->y + gMapVirtualFloorBaseSize)
{
showFade = true;
}
}
if (!showFade)
{
return;
}
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {
if (session->MapPosition.x == tile->x &&
session->MapPosition.y == tile->y)
{
showLit = true;
break;
}
}
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
uint32 image_id = SPR_TERRAIN_SELECTION_SQUARE | COLOUR_GREY << 24 | COLOUR_DARK_PURPLE << 19 | IMAGE_TYPE_REMAP;
if (showLit)
{
image_id = SPR_TERRAIN_SELECTION_PATROL_AREA | COLOUR_YELLOW << 19 | IMAGE_TYPE_REMAP;
}
sub_98196C(session, image_id, 0, 0, 10, 10, -1, gMapVirtualFloorHeight, get_current_rotation());
}
void paint_util_push_tunnel_left(paint_session * session, uint16 height, uint8 type)
{
session->LeftTunnels[session->LeftTunnelCount] = {static_cast<uint8>((height / 16)), type};

204
src/openrct2/paint/tile_element/virtual_floor.c Normal file
View File

@@ -0,0 +1,204 @@
#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 "TileElement.h"
#include "../Paint.h"
#include "../../Input.h"
#include "../../interface/Viewport.h"
#include "../../sprites.h"
#include "../../world/Map.h"
static const rct_xy_element offsets[4] =
{
{ -32, 0 },
{ 0, 32 },
{ 32, 0 },
{ 0, -32 }
};
void virtual_floor_paint(paint_session * session)
{
if (!input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z | PLACE_OBJECT_MODIFIER_SHIFT_Z))
{
return;
}
bool showFade = false;
bool showLit = false;
if ((gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) &&
session->MapPosition.x >= gMapSelectPositionA.x - gMapVirtualFloorBaseSize &&
session->MapPosition.y >= gMapSelectPositionA.y - gMapVirtualFloorBaseSize &&
session->MapPosition.x <= gMapSelectPositionB.x + gMapVirtualFloorBaseSize &&
session->MapPosition.y <= gMapSelectPositionB.y + gMapVirtualFloorBaseSize)
{
showFade = true;
if (session->MapPosition.x >= gMapSelectPositionA.x &&
session->MapPosition.y >= gMapSelectPositionA.y &&
session->MapPosition.x <= gMapSelectPositionB.x &&
session->MapPosition.y <= gMapSelectPositionB.y)
{
showLit = true;
}
}
if (!showFade && !(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT))
{
return;
}
LocationXY16 * tile;
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {
if (session->MapPosition.x >= tile->x - gMapVirtualFloorBaseSize &&
session->MapPosition.y >= tile->y - gMapVirtualFloorBaseSize &&
session->MapPosition.x <= tile->x + gMapVirtualFloorBaseSize &&
session->MapPosition.y <= tile->y + gMapVirtualFloorBaseSize)
{
showFade = true;
}
}
if (!showFade)
{
return;
}
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
sint16 virtualFloorClipHeight = gMapVirtualFloorHeight / 8;
uint8 occupiedEdges = 0;
// Check for occupation and walls
bool weAreOccupied = false;
bool weAreBelowGround = false;
rct_tile_element * tileElement = map_get_first_element_at(session->MapPosition.x >> 5, session->MapPosition.y >> 5);
do
{
sint32 elementType = tile_element_get_type(tileElement);
if (tileElement->flags & TILE_ELEMENT_FLAG_GHOST)
{
continue;
}
if (elementType == TILE_ELEMENT_TYPE_SURFACE)
{
if (virtualFloorClipHeight < tileElement->base_height)
{
weAreBelowGround = true;
}
continue;
}
if (virtualFloorClipHeight >= tileElement->clearance_height ||
virtualFloorClipHeight < tileElement->base_height)
{
continue;
}
if (elementType == TILE_ELEMENT_TYPE_WALL ||
elementType == TILE_ELEMENT_TYPE_BANNER)
{
sint32 direction = tile_element_get_direction(tileElement);
occupiedEdges |= 1 << ((direction + get_current_rotation()) % 4);
continue;
}
weAreOccupied = true;
}
while (!tile_element_is_last_for_tile(tileElement++));
for (uint8 i = 0; i < 4; i++)
{
uint8 effectiveRotation = (4 + i - get_current_rotation()) % 4;
sint16 theirLocationX = session->MapPosition.x + offsets[effectiveRotation].x;
sint16 theirLocationY = session->MapPosition.y + offsets[effectiveRotation].y;
bool theyAreOccupied = false;
bool theyAreBelowGround = false;
tileElement = map_get_first_element_at(theirLocationX >> 5, theirLocationY >> 5);
do
{
if (tileElement->flags & TILE_ELEMENT_FLAG_GHOST)
{
continue;
}
sint32 elementType = tile_element_get_type(tileElement);
if (elementType == TILE_ELEMENT_TYPE_SURFACE)
{
if (virtualFloorClipHeight < tileElement->base_height)
{
theyAreBelowGround = true;
}
continue;
}
if (virtualFloorClipHeight >= tileElement->clearance_height ||
virtualFloorClipHeight < tileElement->base_height)
{
continue;
}
if (elementType == TILE_ELEMENT_TYPE_WALL ||
elementType == TILE_ELEMENT_TYPE_BANNER)
{
sint32 direction = tile_element_get_direction(tileElement);
if (direction == (effectiveRotation + 2) % 4)
{
occupiedEdges |= 1 << i;
break;
}
continue;
}
theyAreOccupied = true;
}
while (!tile_element_is_last_for_tile(tileElement++));
if (weAreOccupied != theyAreOccupied ||
weAreBelowGround != theyAreBelowGround)
{
occupiedEdges |= 1 << i;
continue;
}
}
uint32 remap_base = COLOUR_DARK_PURPLE << 19 | IMAGE_TYPE_REMAP;
uint32 remap_edge = COLOUR_WHITE << 19 | IMAGE_TYPE_REMAP;
if (weAreOccupied)
{
remap_base = COLOUR_BLACK << 19 | IMAGE_TYPE_REMAP;
}
if (showLit)
{
remap_base = COLOUR_YELLOW << 19 | IMAGE_TYPE_REMAP;
if (weAreOccupied)
{
remap_base = COLOUR_DARK_YELLOW << 19 | IMAGE_TYPE_REMAP;
}
}
sub_98197C(session, SPR_G2_SELECTION_EDGE_NW | ((occupiedEdges & 0x8)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 5, 16, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SW | ((occupiedEdges & 0x4)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 27, 16, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_NE | ((occupiedEdges & 0x1)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 5, gMapVirtualFloorHeight + 1, get_current_rotation());
sub_98197C(session, SPR_G2_SELECTION_EDGE_SE | ((occupiedEdges & 0x2)? remap_edge : remap_base), 0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 27, gMapVirtualFloorHeight + 1, get_current_rotation());
}

9
src/openrct2/sprites.h
View File

@@ -804,9 +804,9 @@ enum {
SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 91,
SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 92,
SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_BEGIN + 93,
SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 94,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 0,
SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 1,
@@ -824,6 +824,11 @@ enum {
SPR_G2_SEARCH = SPR_G2_BEGIN + 106,
SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 107,
SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 108,
SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 109,
SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 110,
// 0x60000, chosen because it's a round hex number
// of the last possible range of image ID values that is large enough to fit all csg1 sprites.
SPR_CSG_BEGIN = 393216,