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

progress

Browse Source
This commit is contained in:
Anuken
2020-05-06 19:07:37 -04:00
parent 8b5adca750
commit 5aec051d9b
8 changed files with 515 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,8 +184,8 @@ public class PlanetDialog extends FloatingDialog{
//TODO hacky
Shaders.planet.camDir.set(cam.direction).rotate(Vec3.Y, planet.getRotation());
projector.proj(cam.combined());
batch.proj(cam.combined());
projector.proj(cam.combined);
batch.proj(cam.combined);
bloom.capture();
@@ -298,7 +298,7 @@ public class PlanetDialog extends FloatingDialog{
Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile.sub(planet.position).rotate(Vec3.Y, planet.getRotation()), 0.2f);
shader.bind();
shader.setUniformMatrix4("u_proj", cam.combined().val);
shader.setUniformMatrix4("u_proj", cam.combined.val);
shader.setUniformMatrix4("u_trans", planet.getTransform(mat).val);
shader.apply();
mesh.render(shader, Gl.lines);