Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JSON planet cloudMesh/HexSkyMesh support

Browse Source
This commit is contained in:
Anuken
2023-03-31 23:04:55 -04:00
parent 43424547f2
commit 36e5522694
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/mindustry/mod/ContentParser.java
View File

@@ -599,6 +599,21 @@ public class ContentParser{
}; };
} }
if(value.has("cloudMesh")){
var mesh = value.get("cloudMesh");
if(!mesh.isObject()) throw new RuntimeException("Meshes must be objects.");
value.remove("cloudMesh");
planet.cloudMeshLoader = () -> {
//don't crash, just log an error
try{
return parseMesh(planet, mesh);
}catch(Exception e){
Log.err(e);
return null;
}
};
}
//always one sector right now... //always one sector right now...
planet.sectors.add(new Sector(planet, Ptile.empty)); planet.sectors.add(new Sector(planet, Ptile.empty));
@@ -835,6 +850,10 @@ public class ContentParser{
Color.valueOf(data.getString("color2", data.getString("color", "ffffff"))), Color.valueOf(data.getString("color2", data.getString("color", "ffffff"))),
data.getInt("colorOct", 1), data.getFloat("colorPersistence", 0.5f), data.getFloat("colorScale", 1f), data.getInt("colorOct", 1), data.getFloat("colorPersistence", 0.5f), data.getFloat("colorScale", 1f),
data.getFloat("colorThreshold", 0.5f)); data.getFloat("colorThreshold", 0.5f));
case "HexSkyMesh" -> new HexSkyMesh(planet,
data.getInt("seed", 0), data.getFloat("speed", 0), data.getFloat("radius", 1f),
data.getInt("divisions", 3), Color.valueOf(data.getString("color", "ffffff")), data.getInt("octaves", 1),
data.getFloat("persistence", 0.5f), data.getFloat("scale", 1f), data.getFloat("thresh", 0.5f));
case "MultiMesh" -> new MultiMesh(parser.readValue(GenericMesh[].class, data.get("meshes"))); case "MultiMesh" -> new MultiMesh(parser.readValue(GenericMesh[].class, data.get("meshes")));
case "MatMesh" -> new MatMesh(parser.readValue(GenericMesh.class, data.get("mesh")), parser.readValue(Mat3D.class, data.get("mat"))); case "MatMesh" -> new MatMesh(parser.readValue(GenericMesh.class, data.get("mesh")), parser.readValue(Mat3D.class, data.get("mat")));
default -> throw new RuntimeException("Unknown mesh type: " + tname); default -> throw new RuntimeException("Unknown mesh type: " + tname);