FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Zone.lua
This commit is contained in:
Applevangelist 2025-03-06 12:27:08 +01:00
commit 3585208547
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Moose Development/Moose/Core/Zone.lua
View File

@ -2046,7 +2046,7 @@ function _ZONE_TRIANGLE:New(p1, p2, p3)
end end
self.SurfaceArea = math.abs((p2.x - p1.x) * (p3.y - p1.y) - (p3.x - p1.x) * (p2.y - p1.y)) * 0.5 self.SurfaceArea = math.abs((p2.x - p1.x) * (p3.y - p1.y) - (p3.x - p1.x) * (p2.y - p1.y)) * 0.5
return self return self
end end
@ -2563,7 +2563,7 @@ function ZONE_POLYGON_BASE:ReFill(Color,Alpha)
self.FillTriangles = {} self.FillTriangles = {}
end end
-- refill -- refill
for _, triangle in pairs(self._Triangles) do for _,triangle in pairs(self._Triangles) do
local draw_ids = triangle:Fill(coalition,color,alpha,nil) local draw_ids = triangle:Fill(coalition,color,alpha,nil)
self.FillTriangles = draw_ids self.FillTriangles = draw_ids
table.combine(self.DrawID, draw_ids) table.combine(self.DrawID, draw_ids)
@ -3574,7 +3574,7 @@ do -- ZONE_ELASTIC
-- Debug info. -- Debug info.
--self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName))) --self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
-- Copy all points. -- Copy all points.
local points=UTILS.DeepCopy(self.points or {}) local points=UTILS.DeepCopy(self.points or {})
@ -3592,6 +3592,9 @@ do -- ZONE_ELASTIC
-- Update polygon verticies from points. -- Update polygon verticies from points.
self._.Polygon=self:_ConvexHull(points) self._.Polygon=self:_ConvexHull(points)
self._Triangles = self:_Triangulate()
self.SurfaceArea = self:_CalculateSurfaceArea()
if Draw~=false then if Draw~=false then
if self.DrawID or Draw==true then if self.DrawID or Draw==true then