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

Small MapObjectives refactor (removal of duplicating overrided methods)

Browse Source
This commit is contained in:
ApsZoldat
2023-12-15 19:33:03 +03:00
parent 317a533b5c
commit df8f90a02b
1 changed files with 30 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
core/src/mindustry/game/MapObjectives.java
View File

@@ -627,6 +627,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay. */ /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay. */
public static abstract class ObjectiveMarker{ public static abstract class ObjectiveMarker{
/** Position of marker, in world coordinates */
public @TilePos Vec2 pos = new Vec2();
/** Makes sure markers are only added once. */ /** Makes sure markers are only added once. */
public transient boolean wasAdded; public transient boolean wasAdded;
/** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */ /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
@@ -640,9 +642,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */ /** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */
public void baseDraw(float x, float y, float scaleFactor){} public void baseDraw(float x, float y, float scaleFactor){}
/** Called in the main renderer. */ /** Called in the main renderer. */
public void drawWorld(){} public void drawWorld(){
baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
}
/** Called in the small and large map. */ /** Called in the small and large map. */
public void drawMinimap(MinimapRenderer minimap){} public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
}
/** Add any UI elements necessary. */ /** Add any UI elements necessary. */
public void added(){} public void added(){}
/** Remove any UI elements, if necessary. */ /** Remove any UI elements, if necessary. */
@@ -695,7 +702,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Displays text above a shape. */ /** Displays text above a shape. */
public static class ShapeTextMarker extends ObjectiveMarker{ public static class ShapeTextMarker extends ObjectiveMarker{
public @Multiline String text = "frog"; public @Multiline String text = "frog";
public @TilePos Vec2 pos = new Vec2();
public float fontSize = 1f, textHeight = 7f; public float fontSize = 1f, textHeight = 7f;
public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline; public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
@@ -756,17 +762,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
WorldLabel.drawAt(fetchedText, x, y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor); WorldLabel.drawAt(fetchedText, x, y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
} }
@Override
public void drawWorld(){
baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
}
@Override
public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
}
@Override @Override
public void control(LMarkerControl type, double p1, double p2, double p3){ public void control(LMarkerControl type, double p1, double p2, double p3){
if(!Double.isNaN(p1)){ if(!Double.isNaN(p1)){
@@ -889,7 +884,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Displays a shape with an outline and color. */ /** Displays a shape with an outline and color. */
public static class ShapeMarker extends ObjectiveMarker{ public static class ShapeMarker extends ObjectiveMarker{
public @TilePos Vec2 pos = new Vec2();
public float radius = 8f, rotation = 0f, stroke = 1f; public float radius = 8f, rotation = 0f, stroke = 1f;
public boolean fill = false, outline = true; public boolean fill = false, outline = true;
public int sides = 4; public int sides = 4;
@@ -929,17 +923,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
Draw.reset(); Draw.reset();
} }
@Override
public void drawWorld(){
baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
}
@Override
public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
}
@Override @Override
public void control(LMarkerControl type, double p1, double p2, double p3){ public void control(LMarkerControl type, double p1, double p2, double p3){
if(!Double.isNaN(p1)){ if(!Double.isNaN(p1)){
@@ -975,7 +958,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Displays text at a location. */ /** Displays text at a location. */
public static class TextMarker extends ObjectiveMarker{ public static class TextMarker extends ObjectiveMarker{
public @Multiline String text = "uwu"; public @Multiline String text = "uwu";
public @TilePos Vec2 pos = new Vec2();
public float fontSize = 1f; public float fontSize = 1f;
public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline; public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
// Cached localized text. // Cached localized text.
@@ -1007,17 +989,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
WorldLabel.drawAt(fetchedText, x, y, drawLayer, flags, fontSize * scaleFactor); WorldLabel.drawAt(fetchedText, x, y, drawLayer, flags, fontSize * scaleFactor);
} }
@Override
public void drawWorld(){
baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
}
@Override
public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
}
@Override @Override
public void control(LMarkerControl type, double p1, double p2, double p3){ public void control(LMarkerControl type, double p1, double p2, double p3){
if(!Double.isNaN(p1)){ if(!Double.isNaN(p1)){
@@ -1063,20 +1034,20 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Displays a line from pos1 to pos2. */ /** Displays a line from pos1 to pos2. */
public static class LineMarker extends ObjectiveMarker{ public static class LineMarker extends ObjectiveMarker{
public @TilePos Vec2 pos1 = new Vec2(), pos2 = new Vec2(); public @TilePos Vec2 pos = new Vec2(), endPos = new Vec2();
public float stroke = 1f; public float stroke = 1f;
public boolean outline = true; public boolean outline = true;
public Color color = Color.valueOf("ffd37f"); public Color color = Color.valueOf("ffd37f");
public LineMarker(String text, float x1, float y1, float x2, float y2, float stroke){ public LineMarker(float x1, float y1, float x2, float y2, float stroke){
this.stroke = stroke; this.stroke = stroke;
this.pos1.set(x1, y1); this.pos.set(x1, y1);
this.pos2.set(x2, y2); this.endPos.set(x2, y2);
} }
public LineMarker(String text, float x1, float y1, float x2, float y2){ public LineMarker(float x1, float y1, float x2, float y2){
this.pos1.set(x1, y1); this.pos.set(x1, y1);
this.pos2.set(x2, y2); this.endPos.set(x2, y2);
} }
public LineMarker(){} public LineMarker(){}
@@ -1094,13 +1065,13 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
@Override @Override
public void drawWorld(){ public void drawWorld(){
baseLineDraw(pos1.x, pos1.y, pos1.x, pos2.y, autoscale ? 4f / renderer.getDisplayScale() : 1f); baseLineDraw(pos.x, pos.y, endPos.x, endPos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
} }
@Override @Override
public void drawMinimap(MinimapRenderer minimap){ public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos1.x + 4f, pos1.y + 4f)); minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
minimap.transform(Tmp.v2.set(pos2.x + 4f, pos2.y + 4f)); minimap.transform(Tmp.v2.set(endPos.x + 4f, endPos.y + 4f));
baseLineDraw(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, minimap.getScaleFactor(autoscale)); baseLineDraw(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, minimap.getScaleFactor(autoscale));
} }
@@ -1108,8 +1079,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public void control(LMarkerControl type, double p1, double p2, double p3){ public void control(LMarkerControl type, double p1, double p2, double p3){
if(!Double.isNaN(p1)){ if(!Double.isNaN(p1)){
switch(type){ switch(type){
case pos -> pos1.x = (float)p1 * tilesize; case pos -> pos.x = (float)p1 * tilesize;
case endPos -> pos2.x = (float)p1 * tilesize; case endPos -> endPos.x = (float)p1 * tilesize;
case stroke -> stroke = (float)p1; case stroke -> stroke = (float)p1;
case color -> color.set(Tmp.c1.fromDouble(p1)); case color -> color.set(Tmp.c1.fromDouble(p1));
default -> super.control(type, p1, p2, p3); default -> super.control(type, p1, p2, p3);
@@ -1118,8 +1089,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
if(!Double.isNaN(p2)){ if(!Double.isNaN(p2)){
switch(type){ switch(type){
case pos -> pos1.y = (float)p2 * tilesize; case pos -> pos.y = (float)p2 * tilesize;
case endPos -> pos2.y = (float)p2 * tilesize; case endPos -> endPos.y = (float)p2 * tilesize;
default -> super.control(type, p1, p2, p3); default -> super.control(type, p1, p2, p3);
} }
} }
@@ -1128,13 +1099,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
/** Displays a texture with specified name. */ /** Displays a texture with specified name. */
public static class TextureMarker extends ObjectiveMarker{ public static class TextureMarker extends ObjectiveMarker{
public @TilePos Vec2 pos = new Vec2();
public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size
public String textureName = ""; public String textureName = "";
public Color color = Color.white.cpy(); public Color color = Color.white.cpy();
private transient TextureRegion fetchedRegion; private transient TextureRegion fetchedRegion;
public TextureMarker(String textureName, float x, float y, float width, float height){
this.textureName = textureName;
this.pos.set(x, y);
this.width = width;
this.height = height;
}
public TextureMarker(String textureName, float x, float y){ public TextureMarker(String textureName, float x, float y){
this.textureName = textureName; this.textureName = textureName;
this.pos.set(x, y); this.pos.set(x, y);
@@ -1183,17 +1160,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
} }
} }
@Override
public void drawWorld(){
baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
}
@Override
public void drawMinimap(MinimapRenderer minimap){
minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
}
@Override @Override
public void setTexture(String textureName){ public void setTexture(String textureName){
this.textureName = textureName; this.textureName = textureName;