From 673afecc8e7b595ebe06270acb9641d354a00a9a Mon Sep 17 00:00:00 2001
From: Remie Richards <toiletbrush95@gmail.com>
Date: Fri, 18 Dec 2015 19:32:20 +0000
Subject: [PATCH] get_turf_pixel() is now more accurate: * returns a turf
 closer to the center in even multiples of world.icon_size (64,128, etc.) *
 Handles irregular (non-world.icon_size sized objects) better * Now handles
 Matrix X/Y shifts

---
 code/__HELPERS/matrices.dm | 37 ++++++++++++++++++
 code/__HELPERS/unsorted.dm | 78 ++++++++++++++++----------------------
 2 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm
index 17228a32fe4..3ce3fa3e981 100644
--- a/code/__HELPERS/matrices.dm
+++ b/code/__HELPERS/matrices.dm
@@ -24,3 +24,40 @@
 		animate(transform = matrices[i], time = speed)
 		//doesn't have an object argument because this is "Stacking" with the animate call above
 		//3 billion% intentional
+
+
+//Dumps the matrix data in format a-f
+/matrix/proc/tolist()
+	. = list()
+	. += a
+	. += b
+	. += c
+	. += d
+	. += e
+	. += f
+
+//Dumps the matrix data in a matrix-grid format
+/*
+  a d 0
+  b e 0
+  c f 1
+*/
+/matrix/proc/togrid()
+	. = list()
+	. += a
+	. += d
+	. += 0
+	. += b
+	. += e
+	. += 0
+	. += c
+	. += f
+	. += 1
+
+//The X pixel offset of this matrix
+/matrix/proc/get_x_shift()
+	. = c
+
+//The Y pixel offset of this matrix
+/matrix/proc/get_y_shift()
+	. = f
\ No newline at end of file
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 8e6afc688e3..b08de905109 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -874,63 +874,49 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	return A
 
 
-//Gets the turf this atom's *ICON* appears to inhabit
-//Uses half the width/height respectively to work out
-//A minimum pixel amt this icon needs to be pixel'd by
-//to be considered to be in another turf
+/*
 
-//division = world.icon_size - icon-width/2; DX = pixel_x/division
-//division = world.icon_size - icon-height/2; DY = pixel_y/division
+ Gets the turf this atom's *ICON* appears to inhabit
+ It takes into account:
+ * Pixel_x/y
+ * Matrix x/y
 
-//Eg: Humans
-//32 - 16; 16/16 = 1, DX = 1
-//32 - 16; 15/16 = 0.9375 = 0 when round()'d, DX = 0
+ NOTE: if your atom has non-standard bounds then this proc
+ will handle it, but:
+ * if the bounds are even, then there are an even amount of "middle" turfs, the one to the EAST, NORTH, or BOTH is picked
+ (this may seem bad, but you're atleast as close to the center of the atom as possible, better than byond's default loc being all the way off)
+ * if the bounds are odd, the true middle turf of the atom is returned
 
-//NOTE: if your atom has non-standard bounds then this proc
-//will handle it, but it'll be a bit slower.
+*/
 
 /proc/get_turf_pixel(atom/movable/AM)
-	if(istype(AM))
-		var/rough_x = 0
-		var/rough_y = 0
-		var/final_x = 0
-		var/final_y = 0
-		var/final_z = 0
+	if(!istype(AM))
+		return
 
-		//Assume standards
-		var/i_width = world.icon_size
-		var/i_height = world.icon_size
+	//Find AM's matrix so we can use it's X/Y pixel shifts
+	var/matrix/M = matrix(AM.transform)
 
-		//Handle snowflake objects only if necessary
-		if(AM.bound_height != world.icon_size || AM.bound_width != world.icon_size)
-			var/icon/AMicon = icon(AM.icon, AM.icon_state)
-			i_width = AMicon.Width()
-			i_height = AMicon.Height()
-			qdel(AMicon)
+	var/pixel_x_offset = AM.pixel_x + M.get_x_shift()
+	var/pixel_y_offset = AM.pixel_y + M.get_y_shift()
 
-		//Find a value to divide pixel_ by
-		var/n_width = (world.icon_size - (i_width/2))
-		var/n_height = (world.icon_size - (i_height/2))
+	//Irregular objects
+	if(AM.bound_height != world.icon_size || AM.bound_width != world.icon_size)
+		var/icon/AMicon = icon(AM.icon, AM.icon_state)
+		pixel_x_offset += ((AMicon.Width()/world.icon_size)-1)*(world.icon_size*0.5)
+		pixel_y_offset += ((AMicon.Height()/world.icon_size)-1)*(world.icon_size*0.5)
+		qdel(AMicon)
 
-		//DY and DX
-		if(n_width)
-			rough_x = round(AM.pixel_x/n_width)
-		if(n_height)
-			rough_y = round(AM.pixel_y/n_height)
+	//DY and DX
+	var/rough_x = round(round(pixel_x_offset,world.icon_size)/world.icon_size)
+	var/rough_y = round(round(pixel_y_offset,world.icon_size)/world.icon_size)
 
-		//Find coordinates
-		if(!isturf(AM.loc))
-			var/turf/T = get_turf(AM)
-			final_x = T.x + rough_x
-			final_y = T.y + rough_y
-			final_z = T.z
-		else
-			final_x = AM.x + rough_x
-			final_y = AM.y + rough_y
-			final_z = AM.z
+	//Find coordinates
+	var/turf/T = get_turf(AM) //use AM's turfs, as it's coords are the same as AM's AND AM's coords are lost if it is inside another atom
+	var/final_x = T.x + rough_x
+	var/final_y = T.y + rough_y
 
-		if(final_x || final_y)
-			return locate(final_x, final_y, final_z)
+	if(final_x || final_y)
+		return locate(final_x, final_y, T.z)
 
 //Finds the distance between two atoms, in pixels
 //centered = 0 counts from turf edge to edge