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

Planet rendering refactoring

Browse Source
This commit is contained in:
Anuken
2021-09-16 14:18:17 -04:00
parent c9fa7356c2
commit ed911d87a3
14 changed files with 172 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/core/Renderer.java
View File

@@ -322,10 +322,8 @@ public class Renderer implements ApplicationListener{
} }
var desc = assets.load(state.rules.backgroundTexture, Texture.class, new TextureParameter(){{ var desc = assets.load(state.rules.backgroundTexture, Texture.class, new TextureParameter(){{
wrapU = TextureWrap.mirroredRepeat; wrapU = wrapV = TextureWrap.mirroredRepeat;
wrapV = TextureWrap.mirroredRepeat; magFilter = minFilter = TextureFilter.linear;
magFilter = TextureFilter.linear;
minFilter = TextureFilter.linear;
}}); }});
assets.finishLoadingAsset(desc); assets.finishLoadingAsset(desc);

6
core/src/mindustry/graphics/Shaders.java
View File

@@ -95,6 +95,7 @@ public class Shaders{
public Vec3 lightDir = new Vec3(1, 1, 1).nor(); public Vec3 lightDir = new Vec3(1, 1, 1).nor();
public Color ambientColor = Color.white.cpy(); public Color ambientColor = Color.white.cpy();
public Vec3 camDir = new Vec3(); public Vec3 camDir = new Vec3();
public Planet planet;
public PlanetShader(){ public PlanetShader(){
super("planet", "planet"); super("planet", "planet");
@@ -102,7 +103,7 @@ public class Shaders{
@Override @Override
public void apply(){ public void apply(){
camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, renderer.planets.planet.getRotation()); camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, planet.getRotation());
setUniformf("u_lightdir", lightDir); setUniformf("u_lightdir", lightDir);
setUniformf("u_ambientColor", ambientColor.r, ambientColor.g, ambientColor.b); setUniformf("u_ambientColor", ambientColor.r, ambientColor.g, ambientColor.b);
@@ -115,6 +116,7 @@ public class Shaders{
public Color ambientColor = Color.white.cpy(); public Color ambientColor = Color.white.cpy();
public Vec3 camDir = new Vec3(); public Vec3 camDir = new Vec3();
public float alpha = 1f; public float alpha = 1f;
public Planet planet;
public CloudShader(){ public CloudShader(){
super("planet", "clouds"); super("planet", "clouds");
@@ -122,7 +124,7 @@ public class Shaders{
@Override @Override
public void apply(){ public void apply(){
camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, renderer.planets.planet.getRotation()); camDir.set(renderer.planets.cam.direction).rotate(Vec3.Y, planet.getRotation());
setUniformf("u_alpha", alpha); setUniformf("u_alpha", alpha);
setUniformf("u_lightdir", lightDir); setUniformf("u_lightdir", lightDir);

2
core/src/mindustry/graphics/g3d/GenericMesh.java
View File

@@ -3,5 +3,5 @@ package mindustry.graphics.g3d;
import arc.math.geom.*; import arc.math.geom.*;
public interface GenericMesh{ public interface GenericMesh{
void render(Mat3D projection, Mat3D transform); void render(PlanetParams params, Mat3D projection, Mat3D transform);
} }

3
core/src/mindustry/graphics/g3d/HexMesh.java
View File

@@ -19,7 +19,8 @@ public class HexMesh extends PlanetMesh{
} }
@Override @Override
public void preRender(){ public void preRender(PlanetParams params){
Shaders.planet.planet = planet;
Shaders.planet.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation()).nor(); Shaders.planet.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation()).nor();
Shaders.planet.ambientColor.set(planet.solarSystem.lightColor); Shaders.planet.ambientColor.set(planet.solarSystem.lightColor);
} }

10
core/src/mindustry/graphics/g3d/HexSkyMesh.java
View File

@@ -4,7 +4,6 @@ import arc.graphics.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*; import arc.util.*;
import arc.util.noise.*; import arc.util.noise.*;
import mindustry.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
@@ -42,8 +41,8 @@ public class HexSkyMesh extends PlanetMesh{
} }
@Override @Override
public void render(Mat3D projection, Mat3D transform){ public void render(PlanetParams params, Mat3D projection, Mat3D transform){
preRender(); preRender(params);
shader.bind(); shader.bind();
shader.setUniformMatrix4("u_proj", projection.val); shader.setUniformMatrix4("u_proj", projection.val);
shader.setUniformMatrix4("u_trans", mat.setToTranslation(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).val); shader.setUniformMatrix4("u_trans", mat.setToTranslation(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).val);
@@ -52,9 +51,10 @@ public class HexSkyMesh extends PlanetMesh{
} }
@Override @Override
public void preRender(){ public void preRender(PlanetParams params){
Shaders.clouds.planet = planet;
Shaders.clouds.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).nor(); Shaders.clouds.lightDir.set(planet.solarSystem.position).sub(planet.position).rotate(Vec3.Y, planet.getRotation() + relRot()).nor();
Shaders.clouds.ambientColor.set(planet.solarSystem.lightColor); Shaders.clouds.ambientColor.set(planet.solarSystem.lightColor);
Shaders.clouds.alpha = 1f - Vars.ui.planet.planets.orbitAlpha; Shaders.clouds.alpha = 1f - params.uiAlpha;
} }
} }

4
core/src/mindustry/graphics/g3d/MatMesh.java
View File

@@ -16,7 +16,7 @@ public class MatMesh implements GenericMesh{
} }
@Override @Override
public void render(Mat3D projection, Mat3D transform){ public void render(PlanetParams params, Mat3D projection, Mat3D transform){
mesh.render(projection, tmp.set(transform).mul(mat)); mesh.render(params, projection, tmp.set(transform).mul(mat));
} }
} }

4
core/src/mindustry/graphics/g3d/MultiMesh.java
View File

@@ -10,9 +10,9 @@ public class MultiMesh implements GenericMesh{
} }
@Override @Override
public void render(Mat3D projection, Mat3D transform){ public void render(PlanetParams params, Mat3D projection, Mat3D transform){
for(var v : meshes){ for(var v : meshes){
v.render(projection, transform); v.render(params, projection, transform);
} }
} }
} }

11
core/src/mindustry/graphics/g3d/PlanetMesh.java
View File

@@ -19,12 +19,15 @@ public abstract class PlanetMesh implements GenericMesh{
public PlanetMesh(){} public PlanetMesh(){}
/** Should be overridden to set up any shader parameters such as planet position, normals, etc. */ /** Should be overridden to set up any shader parameters such as planet position, normals, etc.
public abstract void preRender(); * @param params*/
public void preRender(PlanetParams params){
}
@Override @Override
public void render(Mat3D projection, Mat3D transform){ public void render(PlanetParams params, Mat3D projection, Mat3D transform){
preRender(); preRender(params);
shader.bind(); shader.bind();
shader.setUniformMatrix4("u_proj", projection.val); shader.setUniformMatrix4("u_proj", projection.val);
shader.setUniformMatrix4("u_trans", transform.val); shader.setUniformMatrix4("u_trans", transform.val);

35
core/src/mindustry/graphics/g3d/PlanetParams.java Normal file
View File

@@ -0,0 +1,35 @@
package mindustry.graphics.g3d;
import arc.math.geom.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.graphics.g3d.PlanetRenderer.*;
import mindustry.type.*;
/** Parameters for rendering a solar system. */
public class PlanetParams{
/** Camera direction relative to the planet. Length is determined by zoom. */
public Vec3 camPos = new Vec3(0f, 0f, 4f);
/** Camera up vector. */
public Vec3 camUp = new Vec3(0f, 1f, 0f);
/** the unit length direction vector of the camera **/
public Vec3 camDir = new Vec3(0, 0, -1);
/** The sun/main planet of the solar system from which everything is rendered. */
public Planet solarSystem = Planets.sun;
/** Planet being looked at. */
public Planet planet = Planets.serpulo;
/** Zoom relative to planet. */
public float zoom = 1f;
/** Alpha of orbit rings and other UI elements. */
public float uiAlpha = 1f;
/** If false, orbit and sector grid are not drawn. */
public boolean drawUi = false;
/** If true, a space skybox is drawn. */
public boolean drawSkybox = true;
/** Handles drawing details. */
public @Nullable transient PlanetInterfaceRenderer renderer;
//TODO:
//- blur
//- transparent background
}

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

@@ -9,7 +9,6 @@ import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.content.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.graphics.g3d.PlanetGrid.*;
@@ -25,25 +24,15 @@ public class PlanetRenderer implements Disposable{
private static final Seq<Vec3> points = new Seq<>(); private static final Seq<Vec3> points = new Seq<>();
/** Camera direction relative to the planet. Length is determined by zoom. */
public final Vec3 camPos = new Vec3();
/** The sun/main planet of the solar system from which everything is rendered. */
public final Planet solarSystem = Planets.sun;
/** Planet being looked at. */
public Planet planet = Planets.serpulo;
/** Camera used for rendering. */ /** Camera used for rendering. */
public Camera3D cam = new Camera3D(); public final Camera3D cam = new Camera3D();
/** Raw vertex batch. */ /** Raw vertex batch. */
public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0); public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0);
public float zoom = 1f;
public float orbitAlpha = 1f;
private final Mesh[] outlines = new Mesh[10]; private final Mesh[] outlines = new Mesh[10];
public final PlaneBatch3D projector = new PlaneBatch3D(); public final PlaneBatch3D projector = new PlaneBatch3D();
public final Mat3D mat = new Mat3D(); public final Mat3D mat = new Mat3D();
public final FrameBuffer buffer = new FrameBuffer(2, 2, true); public final FrameBuffer buffer = new FrameBuffer(2, 2, true);
public PlanetInterfaceRenderer irenderer;
public final Bloom bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false){{ public final Bloom bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false){{
setThreshold(0.8f); setThreshold(0.8f);
@@ -55,16 +44,13 @@ public class PlanetRenderer implements Disposable{
public final CubemapMesh skybox = new CubemapMesh(new Cubemap("cubemaps/stars/")); public final CubemapMesh skybox = new CubemapMesh(new Cubemap("cubemaps/stars/"));
public PlanetRenderer(){ public PlanetRenderer(){
camPos.set(0, 0f, camLength);
projector.setScaling(1f / 150f); projector.setScaling(1f / 150f);
cam.fov = 60f; cam.fov = 60f;
cam.far = 150f; cam.far = 150f;
} }
/** Render the entire planet scene to the screen. */ /** Render the entire planet scene to the screen. */
public void render(PlanetInterfaceRenderer irenderer){ public void render(PlanetParams params){
this.irenderer = irenderer;
Draw.flush(); Draw.flush();
Gl.clear(Gl.depthBufferBit); Gl.clear(Gl.depthBufferBit);
Gl.enable(Gl.depthTest); Gl.enable(Gl.depthTest);
@@ -73,14 +59,20 @@ public class PlanetRenderer implements Disposable{
Gl.enable(Gl.cullFace); Gl.enable(Gl.cullFace);
Gl.cullFace(Gl.back); Gl.cullFace(Gl.back);
bloom.blending = !params.drawSkybox;
//lock to up vector so it doesn't get confusing //lock to up vector so it doesn't get confusing
cam.up.set(Vec3.Y); cam.up.set(Vec3.Y);
cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight()); cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
camPos.setLength((planet.radius + planet.camRadius) * camLength + (zoom-1f) * (planet.radius + planet.camRadius) * 2); params.camPos.setLength((params.planet.radius + params.planet.camRadius) * camLength + (params.zoom-1f) * (params.planet.radius + params.planet.camRadius) * 2);
cam.position.set(planet.position).add(camPos); cam.position.set(params.planet.position).add(params.camPos);
cam.lookAt(planet.position); //cam.up.set(params.camUp); //TODO broken
cam.lookAt(params.planet.position);
cam.update(); cam.update();
//write back once it changes.
params.camUp.set(cam.up);
params.camDir.set(cam.direction);
projector.proj(cam.combined); projector.proj(cam.combined);
batch.proj(cam.combined); batch.proj(cam.combined);
@@ -89,25 +81,26 @@ public class PlanetRenderer implements Disposable{
beginBloom(); beginBloom();
//render skybox at 0,0,0 if(params.drawSkybox){
Vec3 lastPos = Tmp.v31.set(cam.position); //render skybox at 0,0,0
cam.position.setZero(); Vec3 lastPos = Tmp.v31.set(cam.position);
cam.update(); cam.position.setZero();
cam.update();
Gl.depthMask(false); Gl.depthMask(false);
skybox.render(cam.combined); skybox.render(cam.combined);
Gl.depthMask(true); Gl.depthMask(true);
cam.position.set(lastPos); cam.position.set(lastPos);
cam.update(); cam.update();
}
Events.fire(Trigger.universeDraw); Events.fire(Trigger.universeDraw);
renderPlanet(solarSystem); renderPlanet(params.solarSystem, params);
renderTransparent(params.solarSystem, params);
renderTransparent(solarSystem);
endBloom(); endBloom();
@@ -115,7 +108,9 @@ public class PlanetRenderer implements Disposable{
Gl.enable(Gl.blend); Gl.enable(Gl.blend);
irenderer.renderProjections(planet); if(params.renderer != null){
params.renderer.renderProjections(params.planet);
}
Gl.disable(Gl.cullFace); Gl.disable(Gl.cullFace);
Gl.disable(Gl.depthTest); Gl.disable(Gl.depthTest);
@@ -133,28 +128,28 @@ public class PlanetRenderer implements Disposable{
} }
public void renderPlanet(Planet planet){ public void renderPlanet(Planet planet, PlanetParams params){
if(!planet.visible()) return; if(!planet.visible()) return;
cam.update(); cam.update();
if(cam.frustum.containsSphere(planet.position, planet.clipRadius)){ if(cam.frustum.containsSphere(planet.position, planet.clipRadius)){
//render planet at offsetted position in the world //render planet at offsetted position in the world
planet.draw(cam.combined, planet.getTransform(mat)); planet.draw(params, cam.combined, planet.getTransform(mat));
} }
for(Planet child : planet.children){ for(Planet child : planet.children){
renderPlanet(child); renderPlanet(child, params);
} }
} }
public void renderTransparent(Planet planet){ public void renderTransparent(Planet planet, PlanetParams params){
if(!planet.visible()) return; if(!planet.visible()) return;
planet.drawClouds(cam.combined, planet.getTransform(mat)); planet.drawClouds(params, cam.combined, planet.getTransform(mat));
if(planet.hasGrid() && planet == this.planet){ if(planet.hasGrid() && planet == params.planet && params.drawUi){
renderSectors(planet); renderSectors(planet, params);
} }
if(cam.frustum.containsSphere(planet.position, planet.clipRadius) && planet.parent != null && planet.hasAtmosphere && Core.settings.getBool("atmosphere")){ if(cam.frustum.containsSphere(planet.position, planet.clipRadius) && planet.parent != null && planet.hasAtmosphere && Core.settings.getBool("atmosphere")){
@@ -162,31 +157,35 @@ public class PlanetRenderer implements Disposable{
} }
for(Planet child : planet.children){ for(Planet child : planet.children){
renderTransparent(child); renderTransparent(child, params);
} }
batch.proj(cam.combined); batch.proj(cam.combined);
renderOrbit(planet); if(params.drawUi){
renderOrbit(planet, params);
}
} }
public void renderOrbit(Planet planet){ public void renderOrbit(Planet planet, PlanetParams params){
if(planet.parent == null || !planet.visible() || orbitAlpha <= 0.02f || !planet.drawOrbit) return; if(planet.parent == null || !planet.visible() || params.uiAlpha <= 0.02f || !planet.drawOrbit) return;
Vec3 center = planet.parent.position; Vec3 center = planet.parent.position;
float radius = planet.orbitRadius; float radius = planet.orbitRadius;
int points = (int)(radius * 10); int points = (int)(radius * 10);
Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(orbitAlpha))); Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(params.uiAlpha)));
batch.flush(Gl.lineLoop); batch.flush(Gl.lineLoop);
} }
public void renderSectors(Planet planet){ public void renderSectors(Planet planet, PlanetParams params){
if(orbitAlpha <= 0.02f) return; if(params.uiAlpha <= 0.02f) return;
//apply transformed position //apply transformed position
batch.proj().mul(planet.getTransform(mat)); batch.proj().mul(planet.getTransform(mat));
irenderer.renderSectors(planet); if(params.renderer != null){
params.renderer.renderSectors(planet);
}
//render sector grid //render sector grid
Mesh mesh = outline(planet.grid.size); Mesh mesh = outline(planet.grid.size);
@@ -264,12 +263,12 @@ public class PlanetRenderer implements Disposable{
} }
public void setPlane(Sector sector){ public void setPlane(Sector sector){
float rotation = -planet.getRotation(); float rotation = -sector.planet.getRotation();
float length = 0.01f; float length = 0.01f;
projector.setPlane( projector.setPlane(
//origin on sector position //origin on sector position
Tmp.v33.set(sector.tile.v).setLength(outlineRad + length).rotate(Vec3.Y, rotation).add(planet.position), Tmp.v33.set(sector.tile.v).setLength(outlineRad + length).rotate(Vec3.Y, rotation).add(sector.planet.position),
//face up //face up
sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor(), sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor(),
//right vector //right vector

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

@@ -8,9 +8,4 @@ public class ShaderSphereMesh extends PlanetMesh{
public ShaderSphereMesh(Planet planet, Shader shader, int divisions){ public ShaderSphereMesh(Planet planet, Shader shader, int divisions){
super(planet, MeshBuilder.buildIcosphere(divisions, planet.radius), shader); super(planet, MeshBuilder.buildIcosphere(divisions, planet.radius), shader);
} }
@Override
public void preRender(){
}
} }

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

@@ -25,9 +25,4 @@ public class SunMesh extends HexMesh{
} }
}, divisions, Shaders.unlit); }, divisions, Shaders.unlit);
} }
@Override
public void preRender(){
//do absolutely nothing
}
} }

8
core/src/mindustry/type/Planet.java
View File

@@ -301,8 +301,8 @@ public class Planet extends UnlockableContent{
return visible; return visible;
} }
public void draw(Mat3D projection, Mat3D transform){ public void draw(PlanetParams params, Mat3D projection, Mat3D transform){
mesh.render(projection, transform); mesh.render(params, projection, transform);
} }
public void drawAtmosphere(Mesh atmosphere, Camera3D cam){ public void drawAtmosphere(Mesh atmosphere, Camera3D cam){
@@ -323,9 +323,9 @@ public class Planet extends UnlockableContent{
Gl.depthMask(true); Gl.depthMask(true);
} }
public void drawClouds(Mat3D projection, Mat3D transform){ public void drawClouds(PlanetParams params, Mat3D projection, Mat3D transform){
if(cloudMesh != null){ if(cloudMesh != null){
cloudMesh.render(projection, transform); cloudMesh.render(params, projection, transform);
} }
} }
} }

116
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -15,6 +15,7 @@ import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.content.TechTree.*; import mindustry.content.TechTree.*;
import mindustry.core.*; import mindustry.core.*;
@@ -24,8 +25,8 @@ import mindustry.game.SectorInfo.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.graphics.g3d.*;
import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.graphics.g3d.PlanetGrid.*;
import mindustry.graphics.g3d.*;
import mindustry.input.*; import mindustry.input.*;
import mindustry.maps.*; import mindustry.maps.*;
import mindustry.type.*; import mindustry.type.*;
@@ -50,10 +51,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
public static float sectorShowDuration = 60f * 2.4f; public static float sectorShowDuration = 60f * 2.4f;
public final FrameBuffer buffer = new FrameBuffer(2, 2, true); public final FrameBuffer buffer = new FrameBuffer(2, 2, true);
public final PlanetRenderer planets = renderer.planets;
public final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog(); public final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog();
public final PlanetRenderer planets = renderer.planets;
public float zoom = 1f, selectAlpha = 1f; public PlanetParams state = new PlanetParams();
public float zoom = 1f;
public @Nullable Sector selected, hovered, launchSector; public @Nullable Sector selected, hovered, launchSector;
public Mode mode = look; public Mode mode = look;
public boolean launching; public boolean launching;
@@ -69,10 +71,13 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
public PlanetDialog(){ public PlanetDialog(){
super("", Styles.fullDialog); super("", Styles.fullDialog);
state.renderer = this;
state.drawUi = true;
shouldPause = true; shouldPause = true;
planets.planet = content.getByName(ContentType.planet, Core.settings.getString("lastplanet", "serpulo")); state.planet = content.getByName(ContentType.planet, Core.settings.getString("lastplanet", "serpulo"));
if(planets.planet == null) planets.planet = Planets.serpulo; if(state.planet == null) state.planet = Planets.serpulo;
addListener(new InputListener(){ addListener(new InputListener(){
@Override @Override
@@ -108,7 +113,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
newPresets.clear(); newPresets.clear();
} }
Vec3 pos = planets.camPos; Vec3 pos = state.camPos;
float upV = pos.angle(Vec3.Y); float upV = pos.angle(Vec3.Y);
float xscale = 9f, yscale = 10f; float xscale = 9f, yscale = 10f;
@@ -117,20 +122,20 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//scale X speed depending on polar coordinate //scale X speed depending on polar coordinate
float speed = 1f - Math.abs(upV - 90) / 90f; float speed = 1f - Math.abs(upV - 90) / 90f;
pos.rotate(planets.cam.up, cx / xscale * speed); pos.rotate(state.camUp, cx / xscale * speed);
//prevent user from scrolling all the way up and glitching it out //prevent user from scrolling all the way up and glitching it out
float amount = cy / yscale; float amount = cy / yscale;
amount = Mathf.clamp(upV + amount, margin, 180f - margin) - upV; amount = Mathf.clamp(upV + amount, margin, 180f - margin) - upV;
pos.rotate(Tmp.v31.set(planets.cam.up).rotate(planets.cam.direction, 90), amount); pos.rotate(Tmp.v31.set(state.camUp).rotate(state.camDir, 90), amount);
}); });
addListener(new InputListener(){ addListener(new InputListener(){
@Override @Override
public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){ public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){
if(event.targetActor == PlanetDialog.this){ if(event.targetActor == PlanetDialog.this){
zoom = Mathf.clamp(zoom + amountY / 10f, planets.planet.minZoom, 2f); zoom = Mathf.clamp(zoom + amountY / 10f, state.planet.minZoom, 2f);
} }
return true; return true;
} }
@@ -145,7 +150,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
lastZoom = zoom; lastZoom = zoom;
} }
zoom = (Mathf.clamp(initialDistance / distance * lastZoom, planets.planet.minZoom, 2f)); zoom = (Mathf.clamp(initialDistance / distance * lastZoom, state.planet.minZoom, 2f));
} }
@Override @Override
@@ -171,9 +176,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
launching = false; launching = false;
zoom = 1f; zoom = 1f;
planets.zoom = 1f; state.zoom = 1f;
selectAlpha = 0f; state.uiAlpha = 0f;
launchSector = state.getSector(); launchSector = Vars.state.getSector();
presetShow = 0f; presetShow = 0f;
showed = false; showed = false;
listener = s -> {}; listener = s -> {};
@@ -182,7 +187,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//announce new presets //announce new presets
for(SectorPreset preset : content.sectors()){ for(SectorPreset preset : content.sectors()){
if(preset.unlocked() && !preset.alwaysUnlocked && !preset.sector.info.shown && !preset.sector.hasBase() && preset.planet == planets.planet){ if(preset.unlocked() && !preset.alwaysUnlocked && !preset.sector.info.shown && !preset.sector.hasBase() && preset.planet == state.planet){
newPresets.add(preset.sector); newPresets.add(preset.sector);
preset.sector.info.shown = true; preset.sector.info.shown = true;
preset.sector.saveInfo(); preset.sector.saveInfo();
@@ -190,14 +195,14 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
if(newPresets.any()){ if(newPresets.any()){
newPresets.add(planets.planet.getLastSector()); newPresets.add(state.planet.getLastSector());
} }
newPresets.reverse(); newPresets.reverse();
updateSelected(); updateSelected();
if(planets.planet.getLastSector() != null){ if(state.planet.getLastSector() != null){
lookAt(planets.planet.getLastSector()); lookAt(state.planet.getLastSector());
} }
return super.show(); return super.show();
@@ -253,8 +258,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//update view to sector //update view to sector
zoom = 1f; zoom = 1f;
planets.zoom = 1f; state.zoom = 1f;
selectAlpha = 0f; state.uiAlpha = 0f;
mode = planetLaunch; mode = planetLaunch;
@@ -270,8 +275,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//update view to sector //update view to sector
lookAt(sector); lookAt(sector);
zoom = 1f; zoom = 1f;
planets.zoom = 1f; state.zoom = 1f;
selectAlpha = 0f; state.uiAlpha = 0f;
launchSector = sector; launchSector = sector;
mode = select; mode = select;
@@ -282,7 +287,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
void lookAt(Sector sector){ void lookAt(Sector sector){
if(sector.tile == Ptile.empty) return; if(sector.tile == Ptile.empty) return;
planets.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation())); state.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()));
} }
boolean canSelect(Sector sector){ boolean canSelect(Sector sector){
@@ -310,7 +315,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
launchFrom = to.near().find(Sector::hasBase); launchFrom = to.near().find(Sector::hasBase);
if(launchFrom == null && to.preset != null){ if(launchFrom == null && to.preset != null){
if(launchSector != null) return launchSector; if(launchSector != null) return launchSector;
launchFrom = planets.planet.sectors.min(s -> !s.hasBase() ? Float.MAX_VALUE : s.tile.v.dst2(to.tile.v)); launchFrom = state.planet.sectors.min(s -> !s.hasBase() ? Float.MAX_VALUE : s.tile.v.dst2(to.tile.v));
if(!launchFrom.hasBase()) launchFrom = null; if(!launchFrom.hasBase()) launchFrom = null;
} }
} }
@@ -326,7 +331,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
public void renderSectors(Planet planet){ public void renderSectors(Planet planet){
//draw all sector stuff //draw all sector stuff
if(selectAlpha > 0.01f){ if(state.uiAlpha > 0.01f){
for(Sector sec : planet.sectors){ for(Sector sec : planet.sectors){
if(canSelect(sec) || sec.unlocked() || debugSelect){ if(canSelect(sec) || sec.unlocked() || debugSelect){
@@ -339,15 +344,15 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
null; null;
if(color != null){ if(color != null){
planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f); planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(state.uiAlpha), 0.026f, -0.001f);
} }
}else{ }else{
planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f); planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, state.uiAlpha), -0.001f);
} }
} }
} }
Sector current = state.getSector() != null && state.getSector().isBeingPlayed() && state.getSector().planet == planets.planet ? state.getSector() : null; Sector current = Vars.state.getSector() != null && Vars.state.getSector().isBeingPlayed() && Vars.state.getSector().planet == state.planet ? Vars.state.getSector() : null;
if(current != null){ if(current != null){
planets.fill(current, hoverColor, -0.001f); planets.fill(current, hoverColor, -0.001f);
@@ -374,12 +379,12 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
} }
if(selectAlpha > 0.001f){ if(state.uiAlpha > 0.001f){
for(Sector sec : planet.sectors){ for(Sector sec : planet.sectors){
if(sec.hasBase()){ if(sec.hasBase()){
for(Sector enemy : sec.near()){ for(Sector enemy : sec.near()){
if(enemy.hasEnemyBase()){ if(enemy.hasEnemyBase()){
planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(selectAlpha), Color.clear, 0.24f, 110f, 25); planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(state.uiAlpha), Color.clear, 0.24f, 110f, 25);
} }
} }
@@ -387,11 +392,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
if(selected != null && selected != sec && selected.hasBase()){ if(selected != null && selected != sec && selected.hasBase()){
//imports //imports
if(sec.info.getRealDestination() == selected && sec.info.anyExports()){ if(sec.info.getRealDestination() == selected && sec.info.anyExports()){
planets.drawArc(planet, sec.tile.v, selected.tile.v, Color.gray.write(Tmp.c2).a(selectAlpha), Pal.accent.write(Tmp.c3).a(selectAlpha), 0.4f, 90f, 25); planets.drawArc(planet, sec.tile.v, selected.tile.v, Color.gray.write(Tmp.c2).a(state.uiAlpha), Pal.accent.write(Tmp.c3).a(state.uiAlpha), 0.4f, 90f, 25);
} }
//exports //exports
if(selected.info.getRealDestination() == sec && selected.info.anyExports()){ if(selected.info.getRealDestination() == sec && selected.info.anyExports()){
planets.drawArc(planet, selected.tile.v, sec.tile.v, Pal.place.write(Tmp.c2).a(selectAlpha), Pal.accent.write(Tmp.c3).a(selectAlpha), 0.4f, 90f, 25); planets.drawArc(planet, selected.tile.v, sec.tile.v, Pal.place.write(Tmp.c2).a(state.uiAlpha), Pal.accent.write(Tmp.c3).a(state.uiAlpha), 0.4f, 90f, 25);
} }
} }
} }
@@ -418,7 +423,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
if(icon != null){ if(icon != null){
planets.drawPlane(sec, () -> { planets.drawPlane(sec, () -> {
//use white for content icons //use white for content icons
Draw.color(preficon == icon && sec.info.contentIcon != null ? Color.white : color, selectAlpha); Draw.color(preficon == icon && sec.info.contentIcon != null ? Color.white : color, state.uiAlpha);
Draw.rect(icon, 0, 0, iw, iw * icon.height / icon.width); Draw.rect(icon, 0, 0, iw, iw * icon.height / icon.width);
}); });
} }
@@ -447,13 +452,13 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
boolean selectable(Planet planet){ boolean selectable(Planet planet){
//TODO what if any sector is selectable? //TODO what if any sector is selectable?
if(mode == planetLaunch) return launchSector != null && planet != launchSector.planet; if(mode == planetLaunch) return launchSector != null && planet != launchSector.planet;
return planet == planets.planet || (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase); return planet == state.planet || (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase);
} }
void setup(){ void setup(){
searchText = ""; searchText = "";
zoom = planets.zoom = 1f; zoom = state.zoom = 1f;
selectAlpha = 1f; state.uiAlpha = 1f;
ui.minimapfrag.hide(); ui.minimapfrag.hide();
clearChildren(); clearChildren();
@@ -495,8 +500,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
@Override @Override
public void draw(){ public void draw(){
planets.orbitAlpha = selectAlpha; planets.render(state);
planets.render(PlanetDialog.this);
} }
}, },
//info text //info text
@@ -521,12 +525,12 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
pt.button(planet.localizedName, Styles.clearTogglet, () -> { pt.button(planet.localizedName, Styles.clearTogglet, () -> {
selected = null; selected = null;
launchSector = null; launchSector = null;
if(renderer.planets.planet != planet){ if(state.planet != planet){
renderer.planets.planet = planet; state.planet = planet;
rebuildList(); rebuildList();
} }
settings.put("lastplanet", planet.name); settings.put("lastplanet", planet.name);
}).width(200).height(40).growX().update(bb -> bb.setChecked(renderer.planets.planet == planet)); }).width(200).height(40).growX().update(bb -> bb.setChecked(state.planet == planet));
pt.row(); pt.row();
} }
} }
@@ -536,8 +540,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
new Table(c -> { new Table(c -> {
c.visible(() -> !(graphics.isPortrait() && mobile)); c.visible(() -> !(graphics.isPortrait() && mobile));
if(planets.planet.sectors.contains(Sector::hasBase)){ if(state.planet.sectors.contains(Sector::hasBase)){
int attacked = planets.planet.sectors.count(Sector::isAttacked); int attacked = state.planet.sectors.count(Sector::isAttacked);
//sector notifications & search //sector notifications & search
c.top().right(); c.top().right();
@@ -567,7 +571,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
notifs.clear(); notifs.clear();
var all = planets.planet.sectors.select(Sector::hasBase); var all = state.planet.sectors.select(Sector::hasBase);
all.sort(Structs.comps(Structs.comparingBool(s -> !s.isAttacked()), Structs.comparingInt(s -> s.save == null ? 0 : -(int)s.save.meta.timePlayed))); all.sort(Structs.comps(Structs.comparingBool(s -> !s.isAttacked()), Structs.comparingInt(s -> s.save == null ? 0 : -(int)s.save.meta.timePlayed)));
notifs.pane(p -> { notifs.pane(p -> {
@@ -649,20 +653,20 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
public void lookAt(Sector sector, float alpha){ public void lookAt(Sector sector, float alpha){
float len = planets.camPos.len(); float len = state.camPos.len();
planets.camPos.slerp(Tmp.v31.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()).setLength(len), alpha); state.camPos.slerp(Tmp.v31.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()).setLength(len), alpha);
} }
@Override @Override
public void act(float delta){ public void act(float delta){
super.act(delta); super.act(delta);
if(hovered != null && !mobile && planets.planet.hasGrid()){ if(hovered != null && !mobile && state.planet.hasGrid()){
addChild(hoverLabel); addChild(hoverLabel);
hoverLabel.toFront(); hoverLabel.toFront();
hoverLabel.touchable = Touchable.disabled; hoverLabel.touchable = Touchable.disabled;
Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad).rotate(Vec3.Y, -planets.planet.getRotation()).add(planets.planet.position)); Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad).rotate(Vec3.Y, -state.planet.getRotation()).add(state.planet.position));
hoverLabel.setPosition(pos.x - Core.scene.marginLeft, pos.y - Core.scene.marginBottom, Align.center); hoverLabel.setPosition(pos.x - Core.scene.marginLeft, pos.y - Core.scene.marginBottom, Align.center);
hoverLabel.getText().setLength(0); hoverLabel.getText().setLength(0);
@@ -707,13 +711,13 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
} }
if(planets.planet.hasGrid()){ if(state.planet.hasGrid()){
hovered = planets.planet.getSector(planets.cam.getMouseRay(), PlanetRenderer.outlineRad); hovered = state.planet.getSector(planets.cam.getMouseRay(), PlanetRenderer.outlineRad);
}else if(planets.planet.isLandable()){ }else if(state.planet.isLandable()){
boolean wasNull = selected == null; boolean wasNull = selected == null;
//always have the first sector selected. //always have the first sector selected.
//TODO better support for multiple sectors in gridless planets? //TODO better support for multiple sectors in gridless planets?
hovered = selected = planets.planet.sectors.first(); hovered = selected = state.planet.sectors.first();
//autoshow //autoshow
if(wasNull){ if(wasNull){
@@ -723,8 +727,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
hovered = selected = null; hovered = selected = null;
} }
planets.zoom = Mathf.lerpDelta(planets.zoom, zoom, 0.4f); state.zoom = Mathf.lerpDelta(state.zoom, zoom, 0.4f);
selectAlpha = Mathf.lerpDelta(selectAlpha, Mathf.num(planets.zoom < 1.9f), 0.1f); state.uiAlpha = Mathf.lerpDelta(state.uiAlpha, Mathf.num(state.zoom < 1.9f), 0.1f);
} }
void displayItems(Table c, float scl, ObjectMap<Item, ExportStat> stats, String name){ void displayItems(Table c, float scl, ObjectMap<Item, ExportStat> stats, String name){
@@ -1009,11 +1013,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
if(launching){ if(launching){
stable.color.sub(0, 0, 0, 0.05f * Time.delta); stable.color.sub(0, 0, 0, 0.05f * Time.delta);
}else{ }else{
if(!planets.planet.hasGrid()){ if(!state.planet.hasGrid()){
stable.color.a = 1f; stable.color.a = 1f;
}else{ }else{
//fade out UI when not facing selected sector //fade out UI when not facing selected sector
Tmp.v31.set(selected.tile.v).rotate(Vec3.Y, -planets.planet.getRotation()).scl(-1f).nor(); Tmp.v31.set(selected.tile.v).rotate(Vec3.Y, -state.planet.getRotation()).scl(-1f).nor();
float dot = planets.cam.direction.dot(Tmp.v31); float dot = planets.cam.direction.dot(Tmp.v31);
stable.color.a = Math.max(dot, 0f)*2f; stable.color.a = Math.max(dot, 0f)*2f;
if(dot*2f <= -0.1f){ if(dot*2f <= -0.1f){
@@ -1046,7 +1050,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
boolean shouldHide = true; boolean shouldHide = true;
//save before launch. //save before launch.
if(control.saves.getCurrent() != null && state.isGame() && mode != select){ if(control.saves.getCurrent() != null && Vars.state.isGame() && mode != select){
try{ try{
control.saves.getCurrent().save(); control.saves.getCurrent().save();
}catch(Throwable e){ }catch(Throwable e){