MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

load mesh data and structure meshes

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-01-15 19:47:33 -06:00
parent 840dc83987
commit a52f0941b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/CollisionEngine/CollisionManager.java
+1 -1
View File
@@ -10,7 +10,7 @@ import java.awt.geom.Rectangle2D;
public class CollisionManager { public class CollisionManager {
public static boolean CollisionDetected(Building building, Line2D travelLine, float charHeight, float charY){ public static boolean CollisionDetected(Building building, Line2D travelLine, float charHeight, float charY){
if(!travelLine.intersects(building.buildingRect) && !building.buildingRect.contains(travelLine.getP1()) && !building.buildingRect.contains(travelLine.getP2())) if(building.buildingRect != null && !travelLine.intersects(building.buildingRect) && !building.buildingRect.contains(travelLine.getP1()) && !building.buildingRect.contains(travelLine.getP2()))
return false; return false;
for (Mesh mesh : building.buildingMeshes) for (Mesh mesh : building.buildingMeshes)
src/engine/gameManager/BuildingManager.java
+1 -1
View File
@@ -1045,7 +1045,7 @@ public enum BuildingManager {
} }
building.buildingMeshes.add(generatedMesh); building.buildingMeshes.add(generatedMesh);
} }
Rectangle2D.Float buildingBound = new Rectangle2D.Float(); Rectangle2D.Float buildingBound = new Rectangle2D.Float();
float xLoc = building.loc.x - building.getBounds().getHalfExtents().x; float xLoc = building.loc.x - building.getBounds().getHalfExtents().x;
float zLoc = building.loc.z - building.getBounds().getHalfExtents().y; float zLoc = building.loc.z - building.getBounds().getHalfExtents().y;