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

Start terrain refactor

Browse Source
This commit is contained in:
MagicBot
2023-10-08 09:18:43 -04:00
parent ffb541a12e
commit 0d75e6db9b
12 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/HeightMap.java → src/engine/InterestManagement/Terrain.java
+18 -18
View File
@@ -30,17 +30,17 @@ import java.sql.SQLException;
import java.util.HashMap;
import java.util.stream.Stream;
public class HeightMap {
public class Terrain {
// Class variables
public static final HashMap<Integer, HeightMap> heightmapByLoadNum = new HashMap<>();
public static final HashMap<Integer, Terrain> heightmapByLoadNum = new HashMap<>();
public static final HashMap<Integer, short[][]> _pixelData = new HashMap<>();
// Bootstrap Tracking
public static int heightMapsCreated = 0;
public static HeightMap PlayerCityHeightMap;
public static Terrain playerCityTerrain;
// Heightmap data for this heightmap
public final int heightMapID;
@@ -60,7 +60,7 @@ public class HeightMap {
public float terrain_scale;
public HeightMap(ResultSet rs) throws SQLException {
public Terrain(ResultSet rs) throws SQLException {
this.heightMapID = rs.getInt("heightMapID");
this.maxHeight = rs.getInt("maxHeight");
@@ -107,13 +107,13 @@ public class HeightMap {
generatePixelData(this);
HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
Terrain.heightmapByLoadNum.put(this.zoneLoadID, this);
heightMapsCreated++;
}
//Created for PlayerCities
public HeightMap() {
public Terrain() {
this.heightMapID = 999999;
this.maxHeight = 5; // for real...
@@ -149,7 +149,7 @@ public class HeightMap {
this.terrain_scale = this.maxHeight / 255f;
}
public HeightMap(Zone zone) {
public Terrain(Zone zone) {
this.heightMapID = 999999;
this.maxHeight = 0;
@@ -185,15 +185,15 @@ public class HeightMap {
public static void GeneratePlayerCityHeightMap() {
HeightMap.PlayerCityHeightMap = new HeightMap();
Terrain.playerCityTerrain = new Terrain();
}
public static void GenerateCustomHeightMap(Zone zone) {
HeightMap heightMap = new HeightMap(zone);
Terrain heightMap = new Terrain(zone);
HeightMap.heightmapByLoadNum.put(zone.template, heightMap);
Terrain.heightmapByLoadNum.put(zone.template, heightMap);
}
@@ -260,9 +260,9 @@ public class HeightMap {
//generate static player city heightmap.
HeightMap.GeneratePlayerCityHeightMap();
Terrain.GeneratePlayerCityHeightMap();
Logger.info(HeightMap.heightmapByLoadNum.size() + " Heightmaps cached.");
Logger.info(Terrain.heightmapByLoadNum.size() + " Heightmaps cached.");
// Load pixel data for heightmaps
@@ -305,19 +305,19 @@ public class HeightMap {
}
private static void generatePixelData(HeightMap heightMap) {
private static void generatePixelData(Terrain terrain) {
Color color;
// Generate altitude lookup table for this heightmap
heightMap.pixelColorValues = new short[heightMap.heightmapImage.getWidth()][heightMap.heightmapImage.getHeight()];
terrain.pixelColorValues = new short[terrain.heightmapImage.getWidth()][terrain.heightmapImage.getHeight()];
for (int y = 0; y < heightMap.heightmapImage.getHeight(); y++) {
for (int x = 0; x < heightMap.heightmapImage.getWidth(); x++) {
for (int y = 0; y < terrain.heightmapImage.getHeight(); y++) {
for (int x = 0; x < terrain.heightmapImage.getWidth(); x++) {
color = new Color(heightMap.heightmapImage.getRGB(x, y));
heightMap.pixelColorValues[x][y] = (short) color.getRed();
color = new Color(terrain.heightmapImage.getRGB(x, y));
terrain.pixelColorValues[x][y] = (short) color.getRed();
}
}