From e3641872d0d38fd04e72b227e940d7838aab4bbb Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 5 Jan 2024 19:28:43 -0600 Subject: [PATCH] added COllisionManager --- .../{gameManager => CollisionEngine}/CollisionManager.java | 3 +-- src/engine/{collision => CollisionEngine}/Mesh.java | 2 +- src/engine/{collision => CollisionEngine}/Triangle.java | 2 +- src/engine/devcmd/cmds/RegionCmd.java | 4 +--- src/engine/gameManager/BuildingManager.java | 4 ++-- src/engine/net/client/handlers/MoveToPointHandler.java | 2 +- src/engine/objects/Building.java | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) rename src/engine/{gameManager => CollisionEngine}/CollisionManager.java (94%) rename src/engine/{collision => CollisionEngine}/Mesh.java (96%) rename src/engine/{collision => CollisionEngine}/Triangle.java (90%) diff --git a/src/engine/gameManager/CollisionManager.java b/src/engine/CollisionEngine/CollisionManager.java similarity index 94% rename from src/engine/gameManager/CollisionManager.java rename to src/engine/CollisionEngine/CollisionManager.java index ab6c30b2..9ec8c50c 100644 --- a/src/engine/gameManager/CollisionManager.java +++ b/src/engine/CollisionEngine/CollisionManager.java @@ -1,6 +1,5 @@ -package engine.gameManager; +package engine.CollisionEngine; -import engine.collision.Mesh; import engine.objects.Building; import java.awt.*; diff --git a/src/engine/collision/Mesh.java b/src/engine/CollisionEngine/Mesh.java similarity index 96% rename from src/engine/collision/Mesh.java rename to src/engine/CollisionEngine/Mesh.java index fd84424d..3438855a 100644 --- a/src/engine/collision/Mesh.java +++ b/src/engine/CollisionEngine/Mesh.java @@ -1,4 +1,4 @@ -package engine.collision; +package engine.CollisionEngine; import java.awt.geom.Line2D; diff --git a/src/engine/collision/Triangle.java b/src/engine/CollisionEngine/Triangle.java similarity index 90% rename from src/engine/collision/Triangle.java rename to src/engine/CollisionEngine/Triangle.java index e282feb0..0a36e03a 100644 --- a/src/engine/collision/Triangle.java +++ b/src/engine/CollisionEngine/Triangle.java @@ -1,4 +1,4 @@ -package engine.collision; +package engine.CollisionEngine; import java.awt.geom.Line2D; diff --git a/src/engine/devcmd/cmds/RegionCmd.java b/src/engine/devcmd/cmds/RegionCmd.java index 0fcc4e19..6cb556a3 100644 --- a/src/engine/devcmd/cmds/RegionCmd.java +++ b/src/engine/devcmd/cmds/RegionCmd.java @@ -9,14 +9,12 @@ package engine.devcmd.cmds; -import engine.Enum; -import engine.collision.Mesh; +import engine.CollisionEngine.Mesh; import engine.devcmd.AbstractDevCmd; import engine.gameManager.BuildingManager; import engine.objects.*; import java.awt.geom.Point2D; -import java.lang.reflect.Field; public class RegionCmd extends AbstractDevCmd { diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java index a339f36a..d7280e44 100644 --- a/src/engine/gameManager/BuildingManager.java +++ b/src/engine/gameManager/BuildingManager.java @@ -14,8 +14,8 @@ import engine.Enum.BuildingGroup; import engine.Enum.GameObjectType; import engine.InterestManagement.InterestManager; import engine.InterestManagement.WorldGrid; -import engine.collision.Mesh; -import engine.collision.Triangle; +import engine.CollisionEngine.Mesh; +import engine.CollisionEngine.Triangle; import engine.job.JobContainer; import engine.job.JobScheduler; import engine.jobs.UpgradeBuildingJob; diff --git a/src/engine/net/client/handlers/MoveToPointHandler.java b/src/engine/net/client/handlers/MoveToPointHandler.java index a1e45a68..896eb89f 100644 --- a/src/engine/net/client/handlers/MoveToPointHandler.java +++ b/src/engine/net/client/handlers/MoveToPointHandler.java @@ -12,7 +12,7 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; import engine.exception.MsgSendException; import engine.gameManager.ChatManager; -import engine.gameManager.CollisionManager; +import engine.CollisionEngine.CollisionManager; import engine.gameManager.MovementManager; import engine.math.Vector3fImmutable; import engine.net.client.ClientConnection; diff --git a/src/engine/objects/Building.java b/src/engine/objects/Building.java index 398aad3e..9b2fc9db 100644 --- a/src/engine/objects/Building.java +++ b/src/engine/objects/Building.java @@ -14,7 +14,7 @@ import engine.Enum.*; import engine.InterestManagement.RealmMap; import engine.InterestManagement.Terrain; import engine.InterestManagement.WorldGrid; -import engine.collision.Mesh; +import engine.CollisionEngine.Mesh; import engine.db.archive.CityRecord; import engine.db.archive.DataWarehouse; import engine.db.archive.MineRecord;