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

Improve floor visuals with glassy transparent surface

Browse Source
This commit is contained in:
Jeroen D Stout
2017-10-04 00:41:48 +02:00
committed by Aaron van Geffen
parent b9faed7437
commit 8e8dc89068
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/g2/sprites.json
View File

@@ -354,6 +354,12 @@
{
"path": "icons/search.png"
},
{
"path": "surface/glassy_recolourable.png",
"x_offset": -32,
"y_offset": -1,
"palette": "keep"
},
{
"path": "surface/selection_edge_nw.png",
"x_offset": -32,

BIN
resources/g2/surface/blank_recolourable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/g2/surface/glassy_recolourable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

10
src/openrct2/paint/tile_element/virtual_floor.c
View File

@@ -271,7 +271,7 @@ void virtual_floor_paint(paint_session * session)
if (paintEdges & 0x8)
{
sub_98197C(session, SPR_G2_SELECTION_EDGE_NW | (!(occupiedEdges & 0x8)? ((litEdges & 0x8)? remap_lit : remap_base) : remap_edge),
0, 0, 1, 1, 1, gMapVirtualFloorHeight, 5, 5, gMapVirtualFloorHeight + ((dullEdges & 0x8)? -2 : 0), get_current_rotation());
0, 0, 0, 0, 1, gMapVirtualFloorHeight, 5, 5, gMapVirtualFloorHeight + ((dullEdges & 0x8)? -2 : 0), get_current_rotation());
}
if (paintEdges & 0x4)
{
@@ -281,11 +281,17 @@ void virtual_floor_paint(paint_session * session)
if (paintEdges & 0x1)
{
sub_98197C(session, SPR_G2_SELECTION_EDGE_NE | (!(occupiedEdges & 0x1)? ((litEdges & 0x1)? remap_lit : remap_base) : remap_edge),
0, 0, 1, 1, 1, gMapVirtualFloorHeight, 5, 5, gMapVirtualFloorHeight + ((dullEdges & 0x1)? -2 : 0), get_current_rotation());
0, 0, 0, 0, 1, gMapVirtualFloorHeight, 5, 5, gMapVirtualFloorHeight + ((dullEdges & 0x1)? -2 : 0), get_current_rotation());
}
if (paintEdges & 0x2)
{
sub_98197C(session, SPR_G2_SELECTION_EDGE_SE | (!(occupiedEdges & 0x2)? ((litEdges & 0x2)? remap_lit : remap_base) : remap_edge),
0, 0, 1, 1, 1, gMapVirtualFloorHeight, 16, 27, gMapVirtualFloorHeight + ((dullEdges & 0x2)? -2 : 0), get_current_rotation());
}
if (!weAreOccupied && !weAreLit)
{
sint32 imageColourFlats = SPR_G2_SURFACE_GLASSY_RECOLOURABLE | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | PALETTE_WATER << 19;
sub_98197C(session, imageColourFlats, 0, 0, 30, 30, 0, gMapVirtualFloorHeight, 2, 2, gMapVirtualFloorHeight - 3, get_current_rotation());
}
}

10
src/openrct2/sprites.h
View File

@@ -824,10 +824,12 @@ 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,
SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 107,
SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 108,
SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 109,
SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 110,
SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 111,
// 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.