From 18ce4b6bde13c38408a09bc3c8125ecfe0f77476 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 12 Jan 2020 12:16:08 -0500
Subject: [PATCH] Cleanup

---
 core/src/mindustry/graphics/PlanetMesh.java   | 25 ++++++++++++++-----
 .../mindustry/graphics/PlanetRenderer.java    |  2 ++
 core/src/mindustry/graphics/Shaders.java      |  2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/graphics/PlanetMesh.java b/core/src/mindustry/graphics/PlanetMesh.java
index c48db28f20..ddebce6fb4 100644
--- a/core/src/mindustry/graphics/PlanetMesh.java
+++ b/core/src/mindustry/graphics/PlanetMesh.java
@@ -1,16 +1,16 @@
 package mindustry.graphics;
 
-import arc.*;
 import arc.graphics.*;
 import arc.graphics.VertexAttributes.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
+import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.graphics.Pgrid.*;
 
 public class PlanetMesh{
     private float[] floats = new float[3 + 3 + 1];
-    private Shader shader = new Shader(Core.files.internal("shaders/planet.vertex.glsl").readString(), Core.files.internal("shaders/planet.fragment.glsl").readString());
+    private Vec3 center = new Vec3(0, 0, 0);
     private Mesh mesh;
     private Pgrid grid;
 
@@ -40,14 +40,27 @@ public class PlanetMesh{
     public void render(Mat3D mat){
         Gl.enable(Gl.depthTest);
 
-        shader.begin();
-        shader.setUniformMatrix4("u_projModelView", mat.val);
-        mesh.render(shader, lines ? Gl.lines : Gl.triangles);
-        shader.end();
+        Shaders.planet.begin();
+        Shaders.planet.setUniformMatrix4("u_projModelView", mat.val);
+        mesh.render(Shaders.planet, lines ? Gl.lines : Gl.triangles);
+        Shaders.planet.end();
 
         Gl.disable(Gl.depthTest);
     }
 
+    public @Nullable Ptile getTile(Ray ray){
+        Vec3 vec = intersect(ray);
+        if(vec == null) return null;
+        return Structs.findMin(grid.tiles, t -> t.v.dst(vec));
+    }
+
+    public @Nullable Vec3 intersect(Ray ray){
+        if(Intersector3D.intersectRaySphere(ray, center, length, Tmp.v33)){
+            return Tmp.v33;
+        }
+        return null;
+    }
+
     private void generateMesh(){
 
         for(Ptile tile : grid.tiles){
diff --git a/core/src/mindustry/graphics/PlanetRenderer.java b/core/src/mindustry/graphics/PlanetRenderer.java
index 477debb913..f3fbb18ad3 100644
--- a/core/src/mindustry/graphics/PlanetRenderer.java
+++ b/core/src/mindustry/graphics/PlanetRenderer.java
@@ -25,6 +25,8 @@ public class PlanetRenderer{
         Gl.clearColor(0, 0, 0, 1);
         Gl.clear(Gl.depthBufferBit | Gl.colorBufferBit);
 
+        Ray ray = cam.getPickRay(Core.input.mouseX(), Core.input.mouseY());
+
         input();
 
         cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index 3f7282c430..0aa0d7c4af 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -17,6 +17,7 @@ public class Shaders{
     public static MenuShader menu;
     public static LightShader light;
     public static SurfaceShader water, tar, slag;
+    public static Shader planet;
 
     public static void init(){
         shadow = new Shadow();
@@ -35,6 +36,7 @@ public class Shaders{
         water = new SurfaceShader("water");
         tar = new SurfaceShader("tar");
         slag = new SurfaceShader("slag");
+        planet = new LoadShader("planet", "planet");
     }
 
     public static class LightShader extends LoadShader{