diff --git a/core/src/mindustry/graphics/PlanetGrid.java b/core/src/mindustry/graphics/PlanetGrid.java index 2ba7d91de8..6af69da2fa 100644 --- a/core/src/mindustry/graphics/PlanetGrid.java +++ b/core/src/mindustry/graphics/PlanetGrid.java @@ -4,7 +4,7 @@ import arc.math.*; import arc.math.geom.*; import arc.util.*; -class PlanetGrid{ +public class PlanetGrid{ private static final float x = -0.525731112119133606f; private static final float z = -0.850650808352039932f; diff --git a/core/src/mindustry/graphics/PlanetRenderer.java b/core/src/mindustry/graphics/PlanetRenderer.java index ec237b744c..4e46df3cdf 100644 --- a/core/src/mindustry/graphics/PlanetRenderer.java +++ b/core/src/mindustry/graphics/PlanetRenderer.java @@ -7,14 +7,14 @@ import arc.graphics.g3d.*; import arc.input.*; import arc.math.geom.*; import arc.util.*; -import mindustry.graphics.PlanetGrid.*; +import mindustry.type.*; public class PlanetRenderer{ private Camera3D cam = new Camera3D(); private float lastX, lastY, camLength = 4f; - private PlanetMesh planet = new PlanetMesh(6, 1f, false, Color.royal); - private PlanetMesh outline = new PlanetMesh(3, 1.3f, true, Pal.accent); + //private PlanetMesh planet = new PlanetMesh(6, 1f, false, Color.royal); + //private PlanetMesh outline = new PlanetMesh(3, 1.3f, true, Pal.accent); private VertexBatch3D batch = new VertexBatch3D(false, true, 0); public PlanetRenderer(){ @@ -22,7 +22,7 @@ public class PlanetRenderer{ cam.position.set(Tmp.v1.x, 0f, Tmp.v1.y); } - public void draw(){ + public void render(Planet planet){ Draw.flush(); Gl.clear(Gl.depthBufferBit); Gl.enable(Gl.depthTest); @@ -34,9 +34,11 @@ public class PlanetRenderer{ cam.lookAt(0, 0, 0); cam.update(); - planet.render(cam.combined()); + planet.mesh.render(cam.combined()); //outline.render(cam.combined()); + //TODO + /* Ptile tile = outline.getTile(cam.getPickRay(Core.input.mouseX(), Core.input.mouseY())); if(tile != null){ for(int i = 0; i < tile.corners.length; i++){ @@ -44,7 +46,7 @@ public class PlanetRenderer{ batch.vertex(tile.corners[i].v); } batch.flush(cam.combined(), Gl.triangleFan); - } + }*/ Gl.disable(Gl.depthTest); } diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index a056fa4e83..eddcef84bb 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -1,12 +1,23 @@ package mindustry.type; import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; import mindustry.ctype.*; +import mindustry.graphics.*; -//TODO add full icon for this planet public class Planet extends UnlockableContent{ + /** Mesh used for rendering. */ + public @NonNull PlanetMesh mesh; + /** Grid used for the sectors on the planet. */ + public @NonNull PlanetGrid grid; - public Planet(String name){ + public Planet(String name, PlanetMesh mesh){ + super(name); + this.mesh = mesh; + } + + //mods + Planet(String name){ super(name); } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index c41ca7b5ba..5a8e4e7084 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -1,5 +1,6 @@ package mindustry.ui.dialogs; +import mindustry.content.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; @@ -23,7 +24,7 @@ public class PlanetDialog extends FloatingDialog{ titleTable.remove(); cont.addRect((x, y, w, h) -> { - renderer.draw(); + renderer.render(Planets.starter); }).grow(); } } diff --git a/gradle.properties b/gradle.properties index 65d5d065a3..8910adac73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=097f07c939d99020b24a9b33fc3e24bf800e210d +archash=2868291fbe70f3719efaa18414162d127a9aa774