Triangle check

src/engine/CollisionEngine/CollisionManager.java

@@ -14,8 +14,8 @@ public class CollisionManager {
        boundsRect.setRect(topLeft.x, topLeft.z, building.getBounds().getHalfExtents().x * 2,building.getBounds().getHalfExtents().y * 2);
         if(travelLine.intersects(boundsRect)){
             //collided with building
-            for(Mesh mesh : building.buildingMeshes) {
-                if (mesh.MeshCollides(travelLine,charHeight, charY)) {
+            for(Triangle tri : building.buildingTriangles) {
+                if (tri.collides(travelLine)) {
                     //ChatManager.chatSystemInfo(pc, "Collision Detected");
                     //MovementManager.movement(msg, pc);
                     return true;

src/engine/CollisionEngine/Mesh.java

@@ -23,15 +23,15 @@ public class Mesh {
     public boolean MeshCollides(Line2D line, float charHeight, float charY){
 
         //check if movement path intersects this mesh
-        if(!this.BoundsCollides(line))
-            return false;
+        //if(!this.BoundsCollides(line))
+        //    return false;
 
-        boolean feetcollides = (charY + charHeight) < this.minY;
-        boolean headcollides = charY > this.maxY;
+        //boolean feetcollides = (charY + charHeight) < this.minY;
+        //boolean headcollides = charY > this.maxY;
         //check to see if the mesh collides between the characters feet and head locations
-        if(feetcollides && headcollides){
-            return false;
-        }
+        //if(feetcollides && headcollides){
+        //    return false;
+        //}
 
         //check if any triangles intersect the movement path
         for(Triangle tri : triangles)

src/engine/db/handlers/dbBuildingHandler.java

@@ -896,18 +896,18 @@ public class dbBuildingHandler extends dbHandlerBase {
                     triPoints.add(new Vector3f(floatPoints.get(i),floatPoints.get(i+1),floatPoints.get(i+2)));
                 }
 
-                if(BuildingManager.mesh_triangle_points.containsKey(rs.getInt("meshID")) == false){
+                if(BuildingManager.mesh_triangle_points.containsKey(rs.getInt("propId")) == false){
                     ArrayList<ArrayList<Vector3f>> newPoints = new ArrayList<>();
                     newPoints.add(triPoints);
-                    BuildingManager.mesh_triangle_points.put(rs.getInt("meshID"),newPoints);
+                    BuildingManager.mesh_triangle_points.put(rs.getInt("propId"),newPoints);
                 }
                 else
                 {
-                    BuildingManager.mesh_triangle_points.get(rs.getInt("meshID")).add(triPoints);
+                    BuildingManager.mesh_triangle_points.get(rs.getInt("propId")).add(triPoints);
                 }
-                if(BuildingManager.mesh_heights.containsKey(rs.getInt("meshID")) == false){
+                if(BuildingManager.mesh_heights.containsKey(rs.getInt("propId")) == false){
                     Vector2f heights = new Vector2f(rs.getFloat("maxY"),rs.getFloat("minY"));
-                    BuildingManager.mesh_heights.put(rs.getInt("meshID"),heights);
+                    BuildingManager.mesh_heights.put(rs.getInt("propId"),heights);
                 }
             }
 

src/engine/devcmd/cmds/InfoCmd.java

@@ -244,7 +244,7 @@ public class InfoCmd extends AbstractDevCmd {
                 for (Regions regions : targetBuilding.getBounds().getRegions()) {
                     //TODO ADD REGION INFO
                 }
-                output += "Mesh Count: " + targetBuilding.buildingMeshes.size();
+                output += "Triangle Count: " + targetBuilding.buildingTriangles.size();
                 break;
             case PlayerCharacter:
                 output += newline;

src/engine/devcmd/cmds/RegionCmd.java

@@ -47,17 +47,6 @@ public class RegionCmd extends AbstractDevCmd {
             output += "is Outside: " + region.isOutside();
             this.throwbackInfo(pc, output);
         }
-        if(building != null){
-            for(Mesh mesh : building.buildingMeshes){
-                if(mesh.boundsRect.contains(new Point2D.Float(((AbstractCharacter) target).loc.x,((AbstractCharacter) target).loc.z))){
-                    if(((AbstractCharacter) target).loc.y < mesh.maxY) {
-                        this.throwbackInfo(pc, "Inside Mesh Bounds");
-                        return;
-                    }
-                }
-            }
-            this.throwbackInfo(pc, "Outside Mesh Bounds");
-        }
     }
 
     @Override

src/engine/gameManager/BuildingManager.java

@@ -982,7 +982,7 @@ public enum BuildingManager {
             if (building == null)
                 return;
 
-            building.buildingMeshes = new ArrayList<>();
+            building.buildingTriangles = new ArrayList<>();
             float rotation = building.getRot().getRotation();
             Vector3f buildingLoc = new Vector3f(building.loc.x, building.loc.y, building.loc.z);
             if (!prop_meshes.containsKey(building.meshUUID))
@@ -1040,9 +1040,10 @@ public enum BuildingManager {
                     tri.sides.add(new Line2D.Float(p1, p2));
                     tri.sides.add(new Line2D.Float(p2, p3));
                     tri.sides.add(new Line2D.Float(p3, p1));
-                    generatedMesh.triangles.add(tri);
+                    //generatedMesh.triangles.add(tri);
+                    building.buildingTriangles.add(tri);
                 }
-                building.buildingMeshes.add(generatedMesh);
+                //building.buildingTriangles.add(generatedMesh);
             }
         }
         catch(Exception e){

src/engine/objects/Building.java

@@ -9,6 +9,7 @@
 
 package engine.objects;
 
+import engine.CollisionEngine.Triangle;
 import engine.Enum;
 import engine.Enum.*;
 import engine.InterestManagement.RealmMap;
@@ -100,7 +101,7 @@ public class Building extends AbstractWorldObject {
     private ConcurrentHashMap<Integer, Condemned> condemned;
     private ArrayList<Building> children = null;
 
-    public ArrayList<Mesh> buildingMeshes;
+    public ArrayList<Triangle> buildingTriangles;
 
     /**
      * ResultSet Constructor