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

Don't draw shape parts at 0 rad/stroke

Browse Source
This commit is contained in:
Anuken
2022-07-05 20:15:34 -04:00
parent 85321d7465
commit 69a26900fe
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/icons/icons.properties
View File

@@ -572,3 +572,4 @@
63112=scathe|block-scathe-ui 63112=scathe|block-scathe-ui
63111=scathe-missile|unit-scathe-missile-ui 63111=scathe-missile|unit-scathe-missile-ui
63110=ravage|block-ravage-ui 63110=ravage|block-ravage-ui
63109=underflow-duct|block-underflow-duct-ui

BIN
core/assets/logicids.dat
View File

Binary file not shown.

6
core/src/mindustry/entities/part/HaloPart.java
View File

@@ -66,10 +66,14 @@ public class HaloPart extends DrawPart{
float pointRot = rot + shapeMoveRot * prog * sign + shapeRotation * sign + baseRot * sign; float pointRot = rot + shapeMoveRot * prog * sign + shapeRotation * sign + baseRot * sign;
if(tri){ if(tri){
if(rad > 0.001 && triLen > 0.001){
Drawf.tri(shapeX, shapeY, rad, triLen, pointRot); Drawf.tri(shapeX, shapeY, rad, triLen, pointRot);
}
}else if(!hollow){ }else if(!hollow){
if(rad > 0.001){
Fill.poly(shapeX, shapeY, sides, rad, pointRot); Fill.poly(shapeX, shapeY, sides, rad, pointRot);
}else{ }
}else if(str > 0.001){
Lines.stroke(str); Lines.stroke(str);
Lines.poly(shapeX, shapeY, sides, rad, pointRot); Lines.poly(shapeX, shapeY, sides, rad, pointRot);
Lines.stroke(1f); Lines.stroke(1f);

2
core/src/mindustry/entities/part/ShapePart.java
View File

@@ -56,7 +56,7 @@ public class ShapePart extends DrawPart{
}else{ }else{
Fill.circle(rx, ry, rad); Fill.circle(rx, ry, rad);
} }
}else{ }else if(str > 0.0001f){
Lines.stroke(str); Lines.stroke(str);
if(!circle){ if(!circle){
Lines.poly(rx, ry, sides, rad, moveRot * prog * sign + params.rotation - 90 * sign + rotation * sign + baseRot * sign); Lines.poly(rx, ry, sides, rad, moveRot * prog * sign + params.rotation - 90 * sign + rotation * sign + baseRot * sign);