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

data load fixes

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-01-03 20:39:18 -06:00
parent e330f190fe
commit c92316f03e
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/db/handlers/dbBuildingHandler.java
+1 -1
View File
@@ -920,7 +920,7 @@ public class dbBuildingHandler extends dbHandlerBase {
public void LOAD_MESH_BOUNDING_BOXES() { public void LOAD_MESH_BOUNDING_BOXES() {
try (Connection connection = DbManager.getConnection(); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_mesh_triangles`")) { PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_mesh_bounding_boxes`")) {
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
BuildingManager.mesh_bounding_boxes = new HashMap<>(); BuildingManager.mesh_bounding_boxes = new HashMap<>();
src/engine/gameManager/BuildingManager.java
+3 -2
View File
@@ -1004,7 +1004,7 @@ public enum BuildingManager {
float minX = building.loc.x + (float) boundingBox.getMinX(); float minX = building.loc.x + (float) boundingBox.getMinX();
float maxY = building.loc.z + (float) boundingBox.getMaxY(); float maxY = building.loc.z + (float) boundingBox.getMaxY();
float minY = building.loc.z + (float) boundingBox.getMinY(); float minY = building.loc.z + (float) boundingBox.getMinY();
boundingBox.setRect(buildingLoc.x + boundingBox.getCenterX(),buildingLoc.z + boundingBox.getCenterY(),boundingBox.getMaxX(), boundingBox.getMaxY());
Point2D.Float p1 = new Point2D.Float(minX, maxY); Point2D.Float p1 = new Point2D.Float(minX, maxY);
Point2D.Float p2 = new Point2D.Float(maxX, maxY); Point2D.Float p2 = new Point2D.Float(maxX, maxY);
Point2D.Float p3 = new Point2D.Float(maxX, minY); Point2D.Float p3 = new Point2D.Float(maxX, minY);
@@ -1013,13 +1013,14 @@ public enum BuildingManager {
generatedMesh.BoundingLines.add(new Line2D.Float(p2, p3)); generatedMesh.BoundingLines.add(new Line2D.Float(p2, p3));
generatedMesh.BoundingLines.add(new Line2D.Float(p3, p4)); generatedMesh.BoundingLines.add(new Line2D.Float(p3, p4));
generatedMesh.BoundingLines.add(new Line2D.Float(p4, p1)); generatedMesh.BoundingLines.add(new Line2D.Float(p4, p1));
generatedMesh.boundsRect = boundingBox;
} }
generatedMesh.triangles = new ArrayList<>(); generatedMesh.triangles = new ArrayList<>();
for (ArrayList<Vector3f> pointList : triPoints) { for (ArrayList<Vector3f> pointList : triPoints) {
ArrayList<Vector3f> rotatedPoints = new ArrayList<>(); ArrayList<Vector3f> rotatedPoints = new ArrayList<>();
for (Vector3f point : pointList) for (Vector3f point : pointList)
rotatedPoints.add(Vector3f.rotateAroundPoint(buildingLoc, point, rotation)); rotatedPoints.add(Vector3f.rotateAroundPoint(buildingLoc, buildingLoc.add(point), rotation));
Point2D.Float p1 = new Point2D.Float(rotatedPoints.get(0).x, rotatedPoints.get(0).z); Point2D.Float p1 = new Point2D.Float(rotatedPoints.get(0).x, rotatedPoints.get(0).z);
Point2D.Float p2 = new Point2D.Float(rotatedPoints.get(1).x, rotatedPoints.get(1).z); Point2D.Float p2 = new Point2D.Float(rotatedPoints.get(1).x, rotatedPoints.get(1).z);
src/engine/net/client/handlers/MoveToPointHandler.java
+15 -9
View File
@@ -28,6 +28,8 @@ import engine.server.MBServerStatics;
import java.awt.*; import java.awt.*;
import java.awt.geom.Line2D; import java.awt.geom.Line2D;
import java.util.HashSet;
public class MoveToPointHandler extends AbstractClientMsgHandler { public class MoveToPointHandler extends AbstractClientMsgHandler {
public MoveToPointHandler() { public MoveToPointHandler() {
@@ -46,24 +48,28 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
Line2D travelLine = new Line2D.Float(); Line2D travelLine = new Line2D.Float();
Vector3fImmutable endLoc = new Vector3fImmutable(msg.getEndLat(),msg.getEndAlt(),msg.getEndLon()); Vector3fImmutable endLoc = new Vector3fImmutable(msg.getEndLat(),msg.getEndAlt(),msg.getEndLon());
travelLine.setLine(pc.loc.x,pc.loc.z,endLoc.x,endLoc.z); travelLine.setLine(pc.loc.x,pc.loc.z,endLoc.x,endLoc.z);
for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc, pc.loc.distance(endLoc), MBServerStatics.MASK_BUILDING)){ float movementDistance = 185 + pc.loc.distance(endLoc);
HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(pc.loc, movementDistance, MBServerStatics.MASK_BUILDING);
for(AbstractWorldObject awo : awoList){
Building building = (Building)awo; Building building = (Building)awo;
Rectangle.Float boundsRect = new Rectangle.Float(); Rectangle.Float boundsRect = new Rectangle.Float();
boundsRect.setRect(building.getBounds().getHalfExtents().x, building.getBounds().getHalfExtents().y, building.getBounds().getHalfExtents().x * 2,building.getBounds().getHalfExtents().y * 2); boundsRect.setRect(building.loc.x + building.getBounds().getHalfExtents().x, building.loc.z + building.getBounds().getHalfExtents().y, building.getBounds().getHalfExtents().x * 2,building.getBounds().getHalfExtents().y * 2);
if(travelLine.intersects(boundsRect)){ //if(travelLine.intersects(boundsRect)){
//collided with building //collided with building
for(Mesh mesh : building.buildingMeshes) for(Mesh mesh : building.buildingMeshes) {
if(mesh.MeshCollides(travelLine,pc.getCharacterHeight())){ float height = pc.getCharacterHeight();
for(Triangle tri : mesh.triangles){ if (height < mesh.meshHeight) {
if(tri.collides(travelLine)){ for (Triangle tri : mesh.triangles) {
if (tri.collides(travelLine)) {
ChatManager.chatSystemInfo(pc, "Collision Detected"); ChatManager.chatSystemInfo(pc, "Collision Detected");
return true; return true;
} }
} }
} }
}
} //}
} }
ChatManager.chatSystemInfo(pc, "No Collision Detected");
MovementManager.movement(msg, pc); MovementManager.movement(msg, pc);