aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2026-07-26 18:36:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add AABB.size (#445)

Browse Source
This commit is contained in:
Cooldude2606
2026-06-27 14:02:49 +01:00
committed by GitHub
parent 27b1a34a83
commit 4fe0e9c0a6
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exp_scenario/module/commands/lawnmower.lua
+1 -1
View File
@@ -28,8 +28,8 @@ commands.lawnmower = Commands.new("lawnmower", { "exp-commands_lawnmower.descrip
SelectArea:on_selection(function(event) SelectArea:on_selection(function(event)
local player = assert(game.get_player(event.player_index)) local player = assert(game.get_player(event.player_index))
local area = AABB.expand(event.area) local area = AABB.expand(event.area)
local area_size = AABB.size(area)
local surface = event.surface local surface = event.surface
local area_size = (area.right_bottom.x - area.left_top.x) * (area.right_bottom.y - area.left_top.y)
if area_size > 1000 then if area_size > 1000 then
player.print({ "exp-commands_lawnmower.area-too-large", 1000, area_size }, Commands.print_settings.error) player.print({ "exp-commands_lawnmower.area-too-large", 1000, area_size }, Commands.print_settings.error)
exp_scenario/module/commands/surface.lua
+1 -1
View File
@@ -75,8 +75,8 @@ commands.clear_blueprints = Commands.new("clear-blueprints", { "exp-commands_sur
SelectArea:on_selection(function(event) SelectArea:on_selection(function(event)
local player = assert(game.get_player(event.player_index)) local player = assert(game.get_player(event.player_index))
local area = AABB.expand(event.area) local area = AABB.expand(event.area)
local area_size = AABB.size(area)
local surface = event.surface local surface = event.surface
local area_size = (area.right_bottom.x - area.left_top.x) * (area.right_bottom.y - area.left_top.y)
if area_size > 1000 then if area_size > 1000 then
player.print({ "exp-commands_surface.area-too-large", 1000, area_size }, Commands.print_settings.error) player.print({ "exp-commands_surface.area-too-large", 1000, area_size }, Commands.print_settings.error)
exp_scenario/module/commands/waterfill.lua
+1 -2
View File
@@ -41,6 +41,7 @@ commands.waterfill = Commands.new("waterfill", { "exp-commands_waterfill.descrip
--- When an area is selected to be converted to water --- When an area is selected to be converted to water
SelectArea:on_selection(function(event) SelectArea:on_selection(function(event)
local area = AABB.expand(event.area) local area = AABB.expand(event.area)
local area_size = AABB.size(area)
local player = game.players[event.player_index] local player = game.players[event.player_index]
local surface = event.surface local surface = event.surface
@@ -51,8 +52,6 @@ SelectArea:on_selection(function(event)
end end
]] ]]
local area_size = (area.right_bottom.x - area.left_top.x) * (area.right_bottom.y - area.left_top.y)
if area_size > 1000 then if area_size > 1000 then
player.print({ "exp-commands_waterfill.area-too-large", 1000, area_size }, Commands.print_settings.error) player.print({ "exp-commands_waterfill.area-too-large", 1000, area_size }, Commands.print_settings.error)
return return
exp_util/module/aabb.lua
+7
View File
@@ -17,6 +17,13 @@ function AABB.valid(aabb)
return aabb.left_top.x < aabb.right_bottom.x and aabb.left_top.y < aabb.right_bottom.y return aabb.left_top.x < aabb.right_bottom.x and aabb.left_top.y < aabb.right_bottom.y
end end
--- Returns the size of the area contained within an AABB
--- @param aabb BoundingBox
--- @return number
function AABB.size(aabb)
return (aabb.right_bottom.x - aabb.left_top.x) * (aabb.right_bottom.y - aabb.left_top.y)
end
--- Clone an area, allows for safe mutation of an input value --- Clone an area, allows for safe mutation of an input value
--- @param aabb BoundingBox --- @param aabb BoundingBox
--- @return BoundingBox --- @return BoundingBox