|
|
@ -20,6 +20,7 @@ import engine.job.JobContainer; |
|
|
|
import engine.job.JobScheduler; |
|
|
|
import engine.job.JobScheduler; |
|
|
|
import engine.jobs.UpgradeBuildingJob; |
|
|
|
import engine.jobs.UpgradeBuildingJob; |
|
|
|
import engine.math.Bounds; |
|
|
|
import engine.math.Bounds; |
|
|
|
|
|
|
|
import engine.math.Vector2f; |
|
|
|
import engine.math.Vector3f; |
|
|
|
import engine.math.Vector3f; |
|
|
|
import engine.math.Vector3fImmutable; |
|
|
|
import engine.math.Vector3fImmutable; |
|
|
|
import engine.net.client.ClientConnection; |
|
|
|
import engine.net.client.ClientConnection; |
|
|
@ -45,7 +46,7 @@ public enum BuildingManager { |
|
|
|
BUILDINGMANAGER; |
|
|
|
BUILDINGMANAGER; |
|
|
|
|
|
|
|
|
|
|
|
public static HashMap<Integer,ArrayList<Integer>> prop_meshes = new HashMap<>(); |
|
|
|
public static HashMap<Integer,ArrayList<Integer>> prop_meshes = new HashMap<>(); |
|
|
|
public static HashMap<Integer,Float> mesh_heights = new HashMap<>(); |
|
|
|
public static HashMap<Integer, Vector2f> mesh_heights = new HashMap<>(); |
|
|
|
public static HashMap<Integer,ArrayList<ArrayList<Vector3f>>> mesh_triangle_points = new HashMap<>(); |
|
|
|
public static HashMap<Integer,ArrayList<ArrayList<Vector3f>>> mesh_triangle_points = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
|
|
public static HashMap<Integer, Rectangle2D> mesh_bounding_boxes = new HashMap<>(); |
|
|
|
public static HashMap<Integer, Rectangle2D> mesh_bounding_boxes = new HashMap<>(); |
|
|
@ -993,7 +994,8 @@ public enum BuildingManager { |
|
|
|
return; //no data for this mesh
|
|
|
|
return; //no data for this mesh
|
|
|
|
|
|
|
|
|
|
|
|
Mesh generatedMesh = new Mesh(); |
|
|
|
Mesh generatedMesh = new Mesh(); |
|
|
|
generatedMesh.meshHeight = building.loc.y + mesh_heights.get(mesh); |
|
|
|
generatedMesh.maxY = building.loc.y + mesh_heights.get(mesh).x; |
|
|
|
|
|
|
|
generatedMesh.minY = building.loc.y + mesh_heights.get(mesh).y; |
|
|
|
ArrayList<ArrayList<Vector3f>> triPoints = mesh_triangle_points.get(mesh); |
|
|
|
ArrayList<ArrayList<Vector3f>> triPoints = mesh_triangle_points.get(mesh); |
|
|
|
|
|
|
|
|
|
|
|
if (mesh_bounding_boxes.containsKey(mesh)) { |
|
|
|
if (mesh_bounding_boxes.containsKey(mesh)) { |
|
|
|