cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts Strongdmm Visual Patch (#84705)

Browse Source 
## About The Pull Request

I got a fix merged to the tool (and _spair cut a new release), so
there's no reason to shim around it not working anymore.

In context of #84659 reverts #84659
This commit is contained in:
LemonInTheDark
2024-07-07 08:00:13 -07:00
committed by GitHub
parent 880a552d43
commit d2bc92a88e
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
code/__DEFINES/layers.dm
View File

@@ -119,11 +119,6 @@
/// Try and keep this to a nice whole number, so it's easy to look at a plane var and know what's going on /// Try and keep this to a nice whole number, so it's easy to look at a plane var and know what's going on
#define PLANE_RANGE (HIGHEST_EVER_PLANE - LOWEST_EVER_PLANE) #define PLANE_RANGE (HIGHEST_EVER_PLANE - LOWEST_EVER_PLANE)
// Layer helper macros
/// Gives us a way to hook into topdown layers so we can make stupid DUMBASS MAP EDITOR RENDERING happy
#define MARK_TOPDOWN(layer, FLOOR, NORMALIZED, MAX) MAP_SWITCH(layer, ( ( (NORMALIZED) - (FLOOR) ) * ( ( (layer) - TOPDOWN_LAYER ) / (MAX) ) ) + (FLOOR))
// PLANE_SPACE layer(s) // PLANE_SPACE layer(s)
#define SPACE_LAYER 1.8 #define SPACE_LAYER 1.8
@@ -137,30 +132,22 @@
// this allows larger then bound floors to layer as we'd expect // this allows larger then bound floors to layer as we'd expect
// ANYTHING on the floor plane needs TOPDOWN_LAYER, and nothing that isn't on the floor plane can have it // ANYTHING on the floor plane needs TOPDOWN_LAYER, and nothing that isn't on the floor plane can have it
/// Max floor plane layer value (ignoring topdown)
#define MAX_FLOOR_LAYER 13
/// The minimum layer floor plane should have normalized to match up with its position in the plane stack
#define MAPPING_FLOOR_LAYER_NORMALIZED_MIN 1.81
/// The max layer floor plane should have normalized to match up with its position in the plane stack
#define MAPPING_FLOOR_LAYER_NORMALIZED_MAX 2
#define MARK_FLOOR_LAYER(layer) MARK_TOPDOWN(layer, MAPPING_FLOOR_LAYER_NORMALIZED_MIN, MAPPING_FLOOR_LAYER_NORMALIZED_MAX, MAX_FLOOR_LAYER)
// NOTICE: we break from the pattern of increasing in steps of like 0.01 here // NOTICE: we break from the pattern of increasing in steps of like 0.01 here
// Because TOPDOWN_LAYER is 10000 and that's enough to floating point our modifications away // Because TOPDOWN_LAYER is 10000 and that's enough to floating point our modifications away
#define LOW_FLOOR_LAYER MARK_FLOOR_LAYER(1 + TOPDOWN_LAYER) #define LOW_FLOOR_LAYER (1 + TOPDOWN_LAYER)
#define TURF_PLATING_DECAL_LAYER MARK_FLOOR_LAYER(2 + TOPDOWN_LAYER) #define TURF_PLATING_DECAL_LAYER (2 + TOPDOWN_LAYER)
#define TURF_DECAL_LAYER MARK_FLOOR_LAYER(3 + TOPDOWN_LAYER) //Makes turf decals appear in DM how they will look inworld. #define TURF_DECAL_LAYER (3 + TOPDOWN_LAYER) //Makes turf decals appear in DM how they will look inworld.
#define CULT_OVERLAY_LAYER MARK_FLOOR_LAYER(4 + TOPDOWN_LAYER) #define CULT_OVERLAY_LAYER (4 + TOPDOWN_LAYER)
#define MID_TURF_LAYER MARK_FLOOR_LAYER(5 + TOPDOWN_LAYER) #define MID_TURF_LAYER (5 + TOPDOWN_LAYER)
#define HIGH_TURF_LAYER MARK_FLOOR_LAYER(6 + TOPDOWN_LAYER) #define HIGH_TURF_LAYER (6 + TOPDOWN_LAYER)
#define LATTICE_LAYER MARK_FLOOR_LAYER(7 + TOPDOWN_LAYER) #define LATTICE_LAYER (7 + TOPDOWN_LAYER)
#define DISPOSAL_PIPE_LAYER MARK_FLOOR_LAYER(8 + TOPDOWN_LAYER) #define DISPOSAL_PIPE_LAYER (8 + TOPDOWN_LAYER)
#define WIRE_LAYER MARK_FLOOR_LAYER(9 + TOPDOWN_LAYER) #define WIRE_LAYER (9 + TOPDOWN_LAYER)
#define GLASS_FLOOR_LAYER MARK_FLOOR_LAYER(10 + TOPDOWN_LAYER) #define GLASS_FLOOR_LAYER (10 + TOPDOWN_LAYER)
#define TRAM_RAIL_LAYER MARK_FLOOR_LAYER(11 + TOPDOWN_LAYER) #define TRAM_RAIL_LAYER (11 + TOPDOWN_LAYER)
///catwalk overlay of /turf/open/floor/plating/catwalk_floor ///catwalk overlay of /turf/open/floor/plating/catwalk_floor
#define CATWALK_LAYER MARK_FLOOR_LAYER(12 + TOPDOWN_LAYER) #define CATWALK_LAYER (12 + TOPDOWN_LAYER)
#define ABOVE_OPEN_TURF_LAYER MARK_FLOOR_LAYER(13 + TOPDOWN_LAYER) #define ABOVE_OPEN_TURF_LAYER (13 + TOPDOWN_LAYER)
//WALL_PLANE layers //WALL_PLANE layers
#define BELOW_CLOSED_TURF_LAYER 2.053 #define BELOW_CLOSED_TURF_LAYER 2.053