FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-19 07:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(zones): centroid -> coords

Browse Source 
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.
This commit is contained in:
Linden
2022-05-07 11:19:27 +10:00
parent 91f52d12c1
commit ce3f916c42
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
imports/zones/client.lua
View File

@@ -314,14 +314,14 @@ end
local function getBoxVertices(self) local function getBoxVertices(self)
return { return {
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.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.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.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.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.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.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.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,
} }
end end
@@ -330,7 +330,7 @@ return {
data.id = #zones + 1 data.id = #zones + 1
data.thickness = data.thickness or 2 data.thickness = data.thickness or 2
data.polygon = glm.polygon.new(data.points) data.polygon = glm.polygon.new(data.points)
data.centroid = data.polygon:centroid() data.coords = data.polygon:centroid()
data.remove = removeZone data.remove = removeZone
data.contains = contains 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), 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.remove = removeZone
data.contains = contains data.contains = contains