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

11
core/src/mindustry/ui/Fonts.java
View File

@@ -16,6 +16,7 @@ import arc.graphics.g2d.*;
import arc.graphics.g2d.BitmapFont.*;
import arc.graphics.g2d.PixmapPacker.*;
import arc.graphics.g2d.TextureAtlas.*;
import arc.math.*;
import arc.math.geom.*;
import arc.scene.style.*;
import arc.scene.ui.layout.*;
@@ -40,13 +41,17 @@ public class Fonts{
/** Called from a static context to make the cursor appear immediately upon startup.*/
public static void loadSystemCursors(){
SystemCursor.arrow.set(Core.graphics.newCursor("cursor"));
SystemCursor.hand.set(Core.graphics.newCursor("hand"));
SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam"));
SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScale()));
SystemCursor.hand.set(Core.graphics.newCursor("hand", cursorScale()));
SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam", cursorScale()));
Core.graphics.restoreCursor();
}
public static int cursorScale(){
return Math.max(1, Mathf.round(Scl.scl(1f)));
}
public static void loadFonts(){
String fontName = "fonts/font.ttf";

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);