Merge pull request lizardqueenlexi#210 from LemonInTheDark/new-toys

New Tools! (Moves to the new cutter pattern)

code/__DEFINES/lighting.dm

@@ -38,7 +38,7 @@
 #define LIGHTING_ROUND_VALUE (1 / 64)
 
 /// icon used for lighting shading effects
-#define LIGHTING_ICON 'icons/effects/lighting_object.dmi'
+#define LIGHTING_ICON 'icons/effects/lighting_objects/lighting_object.dmi'
 
 /// If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting objects.
 /// Set to zero to disable soft lighting. Luminosity changes then work if it's lit at all.

code/datums/elements/split_visibility.dm

@@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(diagonal_junctions, generate_splitvis_lookup())
 		diagonal_to_junction[i] = NONE
 	diagonal_to_junction[NORTH|EAST] = dir_to_junction(NORTH|EAST)
 	diagonal_to_junction[SOUTH|EAST] = dir_to_junction(SOUTH|EAST)
-	diagonal_to_junction[SOUTH|WEST] = dir_to_junction(NORTH|WEST)
+	diagonal_to_junction[SOUTH|WEST] = dir_to_junction(SOUTH|WEST)
 	diagonal_to_junction[NORTH|WEST] = dir_to_junction(NORTH|WEST)
 	return diagonal_to_junction
 

cutter_templates/unimplemented/reconstruct_bitmask.toml

@@ -0,0 +1,6 @@
+# Uses a currently unimplemented (only on my copy of the cutter) template to reconstruct a template from a dmi
+mode = "BitmaskSliceReconstruct"
+extract = ["0", "3", "12", "15", "255"]
+
+[set]
+"template" = "\"bitmask/diagonal_32x32.toml\""

icons/effects/lighting_objects/README.MD

@@ -0,0 +1,21 @@
+## Lighting Objects
+
+This is a short aside about lighting objects
+See [the main visuals guide](/.github/guides/VISUALS.md#lighting) for more info, I just want to talk about how these work practically.
+
+Ok so each turf is split up into corners, bottom left, bottom right, top left, top right.
+Each corner gets its own color, and the intensity of that color determines how much each "corner" impacts each pixel (with all 4 colors summing to 255 on each pixel).
+
+What happens if we want to render tall walls though? we only want to show the sides you can see, and we want lighting to like "form" to the wall right?
+
+Well that's really not that hard. Instead of using the standard icon, we can use one generated for that wall. That's why you'll see 3 different splitvis cutter configs here. One is for black, one is for fullbright and the final is for anything in between.
+
+If you modify them, remember to insert their output into lighting_object.dmi (this is an optimization lighting code is slow can't afford to change icon constantly)
+
+It's a bit hard to tell what's going on just looking straight at it since alpha is a component, and that makes things hard to see.
+Opening the png in byond and setting things to not show alpha helps a lot.
+
+The main idea is rather then just a flat square, we shape our gradients to match the shape of the wall, and how light would interact with it.
+
+This was done using a python script to generate the gradients for each "bit". The script is adapted from work done by Mister-Moriarty for goonstation, can find the original [here](https://github.com/goonstation/goonstation/pull/14322) and the version we use [here](./light_gen.py)
+

icons/effects/lighting_objects/light_gen.py

@@ -0,0 +1,37 @@
+# Based off the script found in https://github.com/goonstation/goonstation/pull/14322 by Mister-Moriarty
+# Modified by LemonInTheDark to make copy pasting segments easier
+import matplotlib.pyplot as plt
+import numpy as np
+from PIL import Image, ImageOps
+
+# Modify this to create slices that you can stitch together later
+array_width = 32
+array_height = 32
+
+def create_array(upperleft, upperright, lowerleft, lowerright):
+    array = np.linspace(
+        np.linspace(upperleft, upperright, array_width),
+        np.linspace(lowerleft, lowerright, array_width),
+        array_height, dtype = np.uint8)
+
+    return array[:, :, None]
+
+r = create_array(0, 0, 255, 0)
+g = create_array(0, 0, 0, 255)
+b = create_array(255, 0, 0, 0)
+# Needs 1 so byond doesn't yeet it
+a = create_array(1, 255, 1, 1)
+
+image = np.concatenate([r, g, b, a], axis=2)
+
+plt.imshow(image)
+plt.axis("off")
+# we're doing a bunch of bullshit here to try to get a clean drop in image we can stitch together
+# it sometimes has alpha artifacting issues depending on how it's copied, I'm sorry IDK how else to deal w it
+fig = plt.figure(frameon=False)
+fig.set_size_inches(array_width / 100, array_height / 100)
+ax = plt.Axes(fig, [0., 0., 1., 1.])
+ax.set_axis_off()
+fig.add_axes(ax)
+ax.imshow(image, aspect='auto')
+fig.savefig("output.png", transparent = True)

icons/obj/smooth_structures/alien/resin_wall.png.toml

@@ -0,0 +1,2 @@
+template = "bitmask/walls"
+

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_bamboo"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 33
+
+[output_icon_size]
+x = 32
+y = 33
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_bronze"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_cult"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_gold"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_hotel"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_iron"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_material"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_normal"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_plastitanium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_shuttle"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_silver"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_uranium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml

@@ -0,0 +1,14 @@
+output_name = "window_frame_uranium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16

icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_bamboo"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_bronze"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_cult"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_gold"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_hotel"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_iron"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_material.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_material"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_normal"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_pizza"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_plastitanium"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_sandstone"
+template = "bitmask/diagonal_32x32.toml"

icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml

@@ -0,0 +1,2 @@
+output_name = "window_frame_shuttle"
+template = "bitmask/diagonal_32x32.toml"