From 76a71b5984ca64957f67b82afe19de5d301a7a04 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Thu, 18 Jan 2024 19:12:52 -0600 Subject: [PATCH] load mesh data and structure meshes --- src/engine/CollisionEngine/Mesh.java | 34 +++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/engine/CollisionEngine/Mesh.java b/src/engine/CollisionEngine/Mesh.java index e62e4388..99845816 100644 --- a/src/engine/CollisionEngine/Mesh.java +++ b/src/engine/CollisionEngine/Mesh.java @@ -9,6 +9,7 @@ import org.pmw.tinylog.Logger; import java.awt.geom.Line2D; +import java.awt.geom.Path2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; @@ -62,27 +63,24 @@ public class Mesh { public void MakeBounds(){ - float minX = 0; - float minZ = 0; - + ArrayList rects = new ArrayList<>(); for(Triangle tri : this.triangles){ - if(tri.point1.x < minX) - minX = tri.point1.x; - if(tri.point2.x < minX) - minX = tri.point1.x; - if(tri.point3.x < minX) - minX = tri.point1.x; - if(tri.point1.y < minZ) - minZ = tri.point1.x; - if(tri.point2.y < minZ) - minZ = tri.point1.x; - if(tri.point3.y < minZ) - minZ = tri.point1.x; + Path2D.Float path = new Path2D.Float(); + path.lineTo(tri.point1.x,tri.point1.y); + path.lineTo(tri.point2.x,tri.point2.y); + path.lineTo(tri.point3.x,tri.point3.y); + path.closePath(); + rects.add(path.getBounds()); + } + Rectangle2D.Float boundsRect = new Rectangle2D.Float(); + boundsRect.setRect(rects.get(0)); + for(Rectangle2D rectangle : rects){ + boundsRect.add(rectangle); } this.mesh_bounds = new Rectangle2D.Float(); - float width = (this.mesh_location.x) - minX * 2; - float height = Math.abs((this.mesh_location.z) + minZ) * 2; - this.mesh_bounds.setRect(minX,minZ,width, height); + float width = (float)boundsRect.getWidth(); + float height = (float)boundsRect.getHeight(); + this.mesh_bounds.setRect(boundsRect); } }