mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-23 14:17:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Elevation

Browse Source
This commit is contained in:
Anuken
2020-01-13 07:45:11 -05:00
parent c637ec15ff
commit 899a12eddb
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/graphics/PlanetGrid.java
View File

@ -244,6 +244,7 @@ class PlanetGrid{
Corner[] corners = new Corner[3]; Corner[] corners = new Corner[3];
Edge[] edges = new Edge[3]; Edge[] edges = new Edge[3];
Vec3 v = new Vec3(); Vec3 v = new Vec3();
Vec3 bv = new Vec3();
public Corner(int id){ public Corner(int id){
this.id = id; this.id = id;

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

@ -21,7 +21,9 @@ public class PlanetMesh{
private float radius; private float radius;
private Simplex sim = new Simplex(); private Simplex sim = new Simplex();
private RidgedPerlin rid = new RidgedPerlin(2, 2);
private Color[] colors = {Color.royal, Color.royal, Color.royal, Color.tan, Color.valueOf("3f9a50"), Color.valueOf("3f9a50"), Color.gray, Color.white, Color.white}; private Color[] colors = {Color.royal, Color.royal, Color.royal, Color.tan, Color.valueOf("3f9a50"), Color.valueOf("3f9a50"), Color.gray, Color.white, Color.white};
private Vec3 normal = new Vec3();
public PlanetMesh(int divisions, float radius, boolean lines, Color color){ public PlanetMesh(int divisions, float radius, boolean lines, Color color){
this.radius = radius; this.radius = radius;
@ -71,12 +73,22 @@ public class PlanetMesh{
Corner[] c = tile.corners; Corner[] c = tile.corners;
for(Corner corner : c){ for(Corner corner : c){
corner.v.setLength(radius); corner.bv.set(corner.v).setLength(radius);;
}
for(Corner corner : c){
corner.v.setLength(radius + elevation(corner.bv));
}
for(Corner corner : c){
nor.add(corner.v); nor.add(corner.v);
} }
nor.nor(); nor.nor();
Color color = color(nor); Vec3 realNormal = normal(c[0].v, c[2].v, c[4].v);
nor.set(realNormal);
Color color = color(tile.v);
if(lines){ if(lines){
nor.set(1f, 1f, 1f); nor.set(1f, 1f, 1f);
@ -102,9 +114,21 @@ public class PlanetMesh{
} }
} }
private Vec3 normal(Vec3 v1, Vec3 v2, Vec3 v3){
return normal.set(v2).sub(v1).crs(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z).nor();
}
private float elevation(Vec3 v){
if(lines) return 0;
Color c = color(v);
if(c == Color.royal) return 0.19f;
return ((float)sim.octaveNoise3D(8, 0.7, 1 / 2.0, v.x, v.y, v.z)) / 3f + (rid.getValue(v.x, v.y, v.z, 1f) + 1f) / 12f;
}
private Color color(Vec3 v){ private Color color(Vec3 v){
float f = ((float)sim.octaveNoise3D(6, 0.6, 1 / 2.0, v.x, v.y, v.z)); float f = ((float)sim.octaveNoise3D(6, 0.6, 1 / 2.0, v.x, v.y, v.z)) * 0.5f + 0.5f * ((rid.getValue(v.x, v.y, v.z, 1f) + 1f) / 2f);
return colors[Mathf.clamp((int)(f * colors.length), 0, colors.length - 1)].cpy().mul(Mathf.round(Mathf.lerp(f*2f, 2f, 0.2f), 0.2f)).a(1f); return colors[Mathf.clamp((int)(f * colors.length), 0, colors.length - 1)];
} }
private void verts(Vec3 a, Vec3 b, Vec3 c, Vec3 normal, Color color){ private void verts(Vec3 a, Vec3 b, Vec3 c, Vec3 normal, Color color){

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

@ -11,14 +11,14 @@ import mindustry.graphics.PlanetGrid.*;
public class PlanetRenderer{ public class PlanetRenderer{
private Camera3D cam = new Camera3D(); private Camera3D cam = new Camera3D();
private float lastX, lastY; private float lastX, lastY, camLength = 4f;
private PlanetMesh planet = new PlanetMesh(4, 1f, false, Color.royal); private PlanetMesh planet = new PlanetMesh(6, 1f, false, Color.royal);
private PlanetMesh outline = new PlanetMesh(3, 1.01f, true, Pal.accent); private PlanetMesh outline = new PlanetMesh(3, 1.3f, true, Pal.accent);
private VertexBatch3D batch = new VertexBatch3D(false, true, 0); private VertexBatch3D batch = new VertexBatch3D(false, true, 0);
public PlanetRenderer(){ public PlanetRenderer(){
Tmp.v1.trns(0, 2.5f); Tmp.v1.trns(0, camLength);
cam.position.set(Tmp.v1.x, 0f, Tmp.v1.y); cam.position.set(Tmp.v1.x, 0f, Tmp.v1.y);
} }