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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-08-02 09:39:34 -04:00
parent 7b9dfb9721 bd0592a54c
commit 2a76d25dfa
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/graphics/g3d/PlanetParams.java
View File

@@ -18,10 +18,11 @@ public class PlanetParams{
public Vec3 camUp = new Vec3(0f, 1f, 0f); public Vec3 camUp = new Vec3(0f, 1f, 0f);
/** the unit length direction vector of the camera **/ /** the unit length direction vector of the camera **/
public Vec3 camDir = new Vec3(0, 0, -1); public Vec3 camDir = new Vec3(0, 0, -1);
/** The sun/main planet of the solar system from which everything is rendered. */ /** The sun/main planet of the solar system from which everything is rendered. Deprecated use planet.solarSystem instead */
public Planet solarSystem = Planets.sun; public @Deprecated Planet solarSystem = Planets.sun;
/** Planet being looked at. */ /** Planet being looked at. */
public Planet planet = Planets.serpulo; public Planet planet = Planets.serpulo;
/** Zoom relative to planet. */ /** Zoom relative to planet. */
public float zoom = 1f; public float zoom = 1f;
/** Alpha of orbit rings and other UI elements. */ /** Alpha of orbit rings and other UI elements. */

5
core/src/mindustry/graphics/g3d/PlanetRenderer.java
View File

@@ -102,8 +102,9 @@ public class PlanetRenderer implements Disposable{
Events.fire(Trigger.universeDraw); Events.fire(Trigger.universeDraw);
renderPlanet(params.solarSystem, params); Planet solarSystem = params.planet.solarSystem;
renderTransparent(params.solarSystem, params); renderPlanet(solarSystem, params);
renderTransparent(solarSystem, params);
bloom.render(); bloom.render();

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

@@ -879,6 +879,17 @@ 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 "SunMesh" -> {
var cvals = data.get("colors").asStringArray();
var colors = new Color[cvals.length];
for(int i=0; i<cvals.length; i++){
colors[i] = Color.valueOf(cvals[i]);
}
yield new SunMesh(planet, data.getInt("divisions", 1), data.getInt("octaves", 1), data.getFloat("persistence", 0.5f),
data.getFloat("scl", 1f), data.getFloat("pow", 1f), data.getFloat("mag", 0.5f),
data.getFloat("colorScale", 1f), colors);
}
case "HexSkyMesh" -> new HexSkyMesh(planet, case "HexSkyMesh" -> new HexSkyMesh(planet,
data.getInt("seed", 0), data.getFloat("speed", 0), data.getFloat("radius", 1f), 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.getInt("divisions", 3), Color.valueOf(data.getString("color", "ffffff")), data.getInt("octaves", 1),