From ce3f916c42293e7a0f617706006d04b9831879e5 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sat, 7 May 2022 11:19:27 +1000 Subject: [PATCH] refactor(zones): centroid -> coords While centroid is a more accurate term, coords is a little simpler when writing it a million times. Prefer to use a single term (sphere was using coords) to simplify API. --- imports/zones/client.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/imports/zones/client.lua b/imports/zones/client.lua index a3ec2c8..aa63292 100644 --- a/imports/zones/client.lua +++ b/imports/zones/client.lua @@ -314,14 +314,14 @@ end local function getBoxVertices(self) return { - self.centroid + vec3(self.size.x, self.size.y, self.thickness) * self.rotation, - self.centroid + vec3(-self.size.x, self.size.y, self.thickness) * self.rotation, - self.centroid + vec3(-self.size.x, -self.size.y, self.thickness) * self.rotation, - self.centroid + vec3(self.size.x, -self.size.y, self.thickness) * self.rotation, - self.centroid - vec3(self.size.x, self.size.y, self.thickness) * self.rotation, - self.centroid - vec3(-self.size.x, self.size.y, self.thickness) * self.rotation, - self.centroid - vec3(-self.size.x, -self.size.y, self.thickness) * self.rotation, - self.centroid - vec3(self.size.x, -self.size.y, self.thickness) * self.rotation, + self.coords + vec3(self.size.x, self.size.y, self.thickness) * self.rotation, + self.coords + vec3(-self.size.x, self.size.y, self.thickness) * self.rotation, + self.coords + vec3(-self.size.x, -self.size.y, self.thickness) * self.rotation, + self.coords + vec3(self.size.x, -self.size.y, self.thickness) * self.rotation, + self.coords - vec3(self.size.x, self.size.y, self.thickness) * self.rotation, + self.coords - vec3(-self.size.x, self.size.y, self.thickness) * self.rotation, + self.coords - vec3(-self.size.x, -self.size.y, self.thickness) * self.rotation, + self.coords - vec3(self.size.x, -self.size.y, self.thickness) * self.rotation, } end @@ -330,7 +330,7 @@ return { data.id = #zones + 1 data.thickness = data.thickness or 2 data.polygon = glm.polygon.new(data.points) - data.centroid = data.polygon:centroid() + data.coords = data.polygon:centroid() data.remove = removeZone data.contains = contains @@ -352,7 +352,7 @@ return { vec3(-data.size.x, data.size.y, 0), vec3(-data.size.x, -data.size.y, 0), vec3(data.size.x, -data.size.y, 0), - }) + data.centroid) + }) + data.coords) data.remove = removeZone data.contains = contains