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

Refactored planet rendering to different classes

Browse Source
This commit is contained in:
Anuken
2020-02-23 19:05:25 -05:00
parent 9af93dc44d
commit 7f53328f52
11 changed files with 189 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/graphics/PlanetMesh.java
View File

@@ -4,10 +4,10 @@ import arc.graphics.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.gl.*;
import arc.math.geom.*;
import arc.math3d.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.graphics.PlanetGrid.*;
import mindustry.maps.planet.*;
public class PlanetMesh{
private float[] floats = new float[3 + 3 + 1];
@@ -19,13 +19,13 @@ public class PlanetMesh{
private boolean lines;
private float radius, intensity = 0.2f;
private final PlanetGenerator gen;
private final PlanetMesher gen;
public PlanetMesh(int divisions, PlanetGenerator gen){
public PlanetMesh(int divisions, PlanetMesher gen){
this(divisions, gen, 1f, false);
}
public PlanetMesh(int divisions, PlanetGenerator gen, float radius, boolean lines){
public PlanetMesh(int divisions, PlanetMesher gen, float radius, boolean lines){
this.gen = gen;
this.radius = radius;
this.grid = PlanetGrid.newGrid(divisions);

10
core/src/mindustry/graphics/PlanetMesher.java Normal file
View File

@@ -0,0 +1,10 @@
package mindustry.graphics;
import arc.graphics.*;
import arc.math.geom.*;
/** Defines color and height for a planet mesh. */
public interface PlanetMesher{
float getHeight(Vec3 position);
Color getColor(Vec3 position);
}

149
core/src/mindustry/graphics/PlanetRenderer.java
View File

@@ -1,149 +0,0 @@
package mindustry.graphics;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.graphics.g3d.*;
import arc.input.*;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import mindustry.graphics.PlanetGrid.*;
import mindustry.maps.planet.*;
import mindustry.type.*;
import mindustry.type.Sector.*;
import mindustry.world.*;
import static mindustry.Vars.*;
public class PlanetRenderer implements PlanetGenerator{
private static final Color outlineColor = Pal.accent.cpy().a(0.6f);
private static final float camLength = 4f, outlineRad = 1.15f;
private static final boolean drawRect = false;
private final PlanetMesh[] outlines = new PlanetMesh[10];
private final Camera3D cam = new Camera3D();
private final VertexBatch3D batch = new VertexBatch3D(false, true, 0);
private float lastX, lastY;
public PlanetRenderer(){
Tmp.v1.trns(0, camLength);
cam.position.set(Tmp.v1.x, 0f, Tmp.v1.y);
}
public void render(Planet planet){
Draw.flush();
Gl.clear(Gl.depthBufferBit);
Gl.enable(Gl.depthTest);
input();
cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
cam.update();
cam.lookAt(0, 0, 0);
cam.update();
PlanetMesh outline = outline(planet.size);
planet.mesh.render(cam.combined());
outline.render(cam.combined());
Ptile tile = outline.getTile(cam.getPickRay(Core.input.mouseX(), Core.input.mouseY()));
if(tile != null){
Sector sector = planet.getSector(tile);
for(int i = 0; i < sector.tile.corners.length; i++){
batch.color(outlineColor);
batch.vertex(sector.tile.corners[i].v);
}
batch.flush(cam.combined(), Gl.triangleFan);
if(drawRect){
SectorRect rect = sector.rect;
rect.center.scl(outlineRad);
rect.right.scl(outlineRad);
rect.top.scl(outlineRad);
batch.color(Color.red);
batch.vertex(rect.center);
batch.color(Color.red);
batch.vertex(sector.tile.corners[0].v);
batch.color(Color.green);
batch.vertex(rect.center);
batch.color(Color.green);
batch.vertex(rect.top.cpy().add(rect.center));
batch.flush(cam.combined(), Gl.lines);
//Log.info((int)(sector.tile.corners[0].v.cpy().sub(rect.center).angle(rect.top)));
rect.center.scl(1f / outlineRad);
rect.right.scl(1f / outlineRad);
rect.top.scl(1f / outlineRad);
}
if(Core.input.keyTap(KeyCode.SPACE)){
control.playSector(sector);
ui.planet.hide();
}
}
Gl.disable(Gl.depthTest);
}
private PlanetMesh outline(int size){
if(outlines[size] == null){
outlines[size] = new PlanetMesh(size, this, outlineRad, true);
}
return outlines[size];
}
private void input(){
Vec3 v = Tmp.v33.set(Core.input.mouseX(), Core.input.mouseY(), 0);
if(Core.input.keyDown(KeyCode.MOUSE_LEFT)){
float upV = cam.position.angle(Vec3.Y);
float xscale = 9f, yscale = 10f;
float margin = 1;
//scale X speed depending on polar coordinate
float speed = 1f - Math.abs(upV - 90) / 90f;
cam.position.rotate(cam.up, (v.x - lastX) / xscale * speed);
//prevent user from scrolling all the way up and glitching it out
float amount = (v.y - lastY) / yscale;
amount = Mathf.clamp(upV + amount, margin, 180f - margin) - upV;
cam.position.rotate(Tmp.v31.set(cam.up).rotate(cam.direction, 90), amount);
}
//lock to Y coordinate so planet rotation doesn't get confusing
cam.up.set(Vec3.Y);
lastX = v.x;
lastY = v.y;
}
@Override
public float getHeight(Vec3 position){
return 0;
}
@Override
public Color getColor(Vec3 position){
return outlineColor;
}
@Override
public void generate(Vec3 position, TileGen tile){
}
@Override
public void decorate(Tiles tiles, Sector sec){
}
}