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

the refactoring continues

Browse Source
This commit is contained in:
Anuken
2022-02-22 13:33:55 -05:00
parent 370191407d
commit d4aff92fda
84 changed files with 337 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/input/DesktopInput.java
View File

@@ -202,10 +202,10 @@ public class DesktopInput extends InputHandler{
//draw schematic requests
selectRequests.each(req -> {
req.animScale = 1f;
drawRequest(req);
drawPlan(req);
});
selectRequests.each(this::drawOverRequest);
selectRequests.each(this::drawOverPlan);
if(player.isBuilder()){
//draw things that may be placed soon
@@ -215,23 +215,23 @@ public class DesktopInput extends InputHandler{
if(i == lineRequests.size - 1 && req.block.rotate){
drawArrow(block, req.x, req.y, req.rotation);
}
drawRequest(lineRequests.get(i));
drawPlan(lineRequests.get(i));
}
lineRequests.each(this::drawOverRequest);
lineRequests.each(this::drawOverPlan);
}else if(isPlacing()){
if(block.rotate && block.drawArrow){
drawArrow(block, cursorX, cursorY, rotation);
}
Draw.color();
boolean valid = validPlace(cursorX, cursorY, block, rotation);
drawRequest(cursorX, cursorY, block, rotation);
drawPlan(cursorX, cursorY, block, rotation);
block.drawPlace(cursorX, cursorY, rotation, valid);
if(block.saveConfig){
Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));
brequest.set(cursorX, cursorY, rotation, block);
brequest.config = block.lastConfig;
block.drawRequestConfig(brequest, allRequests());
block.drawPlanConfig(brequest, allRequests());
brequest.config = null;
Draw.reset();
}

8
core/src/mindustry/input/InputHandler.java
View File

@@ -952,22 +952,22 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
}
protected void drawOverRequest(BuildPlan request){
protected void drawOverPlan(BuildPlan request){
boolean valid = validPlace(request.x, request.y, request.block, request.rotation);
Draw.reset();
Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));
Draw.alpha(1f);
request.block.drawRequestConfigTop(request, allSelectLines);
request.block.drawPlanConfigTop(request, allSelectLines);
Draw.reset();
}
protected void drawRequest(BuildPlan request){
protected void drawPlan(BuildPlan request){
request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
}
/** Draws a placement icon for a specific block. */
protected void drawRequest(int x, int y, Block block, int rotation){
protected void drawPlan(int x, int y, Block block, int rotation){
brequest.set(x, y, rotation, block);
brequest.animScale = 1f;
block.drawPlan(brequest, allRequests(), validPlace(x, y, block, rotation));

8
core/src/mindustry/input/MobileInput.java
View File

@@ -327,7 +327,7 @@ public class MobileInput extends InputHandler implements GestureListener{
request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
drawSelected(request.x, request.y, request.block, Pal.accent);
}
lineRequests.each(this::drawOverRequest);
lineRequests.each(this::drawOverPlan);
}else if(mode == breaking){
drawBreakSelection(lineStartX, lineStartY, tileX, tileY);
}
@@ -367,9 +367,9 @@ public class MobileInput extends InputHandler implements GestureListener{
}
Draw.reset();
drawRequest(request);
drawPlan(request);
if(!request.breaking){
drawOverRequest(request);
drawOverPlan(request);
}
//draw last placed request
@@ -399,7 +399,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}
@Override
protected void drawRequest(BuildPlan request){
protected void drawPlan(BuildPlan request){
if(request.tile() == null) return;
brequest.animScale = request.animScale = Mathf.lerpDelta(request.animScale, 1f, 0.1f);