diff --git a/lib/cyberarm_engine/lib/bounding_box.rb b/lib/cyberarm_engine/lib/bounding_box.rb index a848ccc..b93040b 100644 --- a/lib/cyberarm_engine/lib/bounding_box.rb +++ b/lib/cyberarm_engine/lib/bounding_box.rb @@ -68,11 +68,17 @@ module CyberarmEngine other.max.x <= max.x && other.max.y <= max.y && other.max.z <= max.z end - # returns whether the vector is inside of the bounding box + # returns whether the 3D vector is inside of the bounding box + def inside?(vector) + (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) && + (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y)) && + (vector.z.between?(@min.z, @max.z) || vector.z.between?(@max.z, @min.z)) + end + + # returns whether the 2D vector is inside of the bounding box def point?(vector) - vector.x.between?(@min.x, @max.x) && - vector.y.between?(@min.y, @max.y) && - vector.z.between?(@min.z, @max.z) + (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) && + (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y)) end def volume diff --git a/lib/cyberarm_engine/ui/theme.rb b/lib/cyberarm_engine/ui/theme.rb index eba3b1a..0fda161 100644 --- a/lib/cyberarm_engine/ui/theme.rb +++ b/lib/cyberarm_engine/ui/theme.rb @@ -65,7 +65,7 @@ module CyberarmEngine Button: { # < Label margin: 1, padding: 4, - border_thickness: 4, + border_thickness: 1, border_color: ["ffd59674".hex, "ffff8746".hex], border_radius: 0, background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],