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

Added custom cursors

Browse Source
This commit is contained in:
Anuken 2018-03-16 12:34:35 -04:00
parent b9f565f5fc
commit 13619a14dc
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = '36de2b4' uCoreVersion = '872bce6'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

BIN
core/assets/cursors/cursor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
core/assets/cursors/hand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 B

BIN
core/assets/cursors/ibar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 196 B

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Fri Mar 16 00:38:49 EDT 2018 #Fri Mar 16 12:34:23 EDT 2018
version=release version=release
androidBuildCode=414 androidBuildCode=421
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=custom build build=custom build

9
core/src/io/anuke/mindustry/core/Renderer.java
View File

@ -33,6 +33,7 @@ import io.anuke.ucore.function.Callable;
import io.anuke.ucore.graphics.*; import io.anuke.ucore.graphics.*;
import io.anuke.ucore.modules.RendererModule; import io.anuke.ucore.modules.RendererModule;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp; import io.anuke.ucore.util.Tmp;
@ -68,6 +69,12 @@ public class Renderer extends RendererModule{
} }
}); });
Cursors.cursorScaling = 3;
Cursors.outlineColor = Color.valueOf("444444");
Cursors.arrow = Cursors.loadCursor("cursor");
Cursors.hand = Cursors.loadCursor("hand");
Cursors.ibeam = Cursors.loadCursor("ibar");
clearColor = Hue.lightness(0.4f); clearColor = Hue.lightness(0.4f);
clearColor.a = 1f; clearColor.a = 1f;
@ -427,7 +434,7 @@ public class Renderer extends RendererModule{
}else if(input.breakMode.delete && control.input().drawPlace() }else if(input.breakMode.delete && control.input().drawPlace()
&& (input.recipe == null || !state.inventory.hasItems(input.recipe.requirements)) && (input.recipe == null || !state.inventory.hasItems(input.recipe.requirements))
&& (input.placeMode.delete || input.breakMode.both)){ && (input.placeMode.delete || input.breakMode.both || !android)){
if(input.breakMode == PlaceMode.holdDelete) if(input.breakMode == PlaceMode.holdDelete)
input.breakMode.draw(tilex, tiley, 0, 0); input.breakMode.draw(tilex, tiley, 0, 0);