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

All T3s done / New third map

Browse Source
This commit is contained in:
Anuken
2022-02-04 18:09:26 -05:00
parent c8da241825
commit 0441f89529
9 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/entities/part/DrawPart.java
View File

@@ -21,7 +21,7 @@ public abstract class DrawPart{
//TODO document
public float warmup, reload, smoothReload, heat, life;
public float x, y, rotation;
public int sideOverride = -1;
public int sideOverride = -1, sideMultiplier = 1;
public PartParams set(float warmup, float reload, float smoothReload, float heat, float x, float y, float rotation){
this.warmup = warmup;
@@ -33,6 +33,7 @@ public abstract class DrawPart{
this.rotation = rotation;
this.sideOverride = -1;
this.life = 0f;
this.sideMultiplier = 1;
return this;
}
}

8
core/src/mindustry/entities/part/RegionPart.java
View File

@@ -70,7 +70,7 @@ public class RegionPart extends DrawPart{
//can be null
var region = drawRegion ? regions[Math.min(i, regions.length - 1)] : null;
float sign = i == 1 ? -1 : 1;
float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
Tmp.v1.set((x + moveX * prog) * sign, y + moveY * prog).rotate(params.rotation - 90);
float
@@ -78,7 +78,7 @@ public class RegionPart extends DrawPart{
ry = params.y + Tmp.v1.y,
rot = rotMove * prog * sign + params.rotation - 90;
Draw.xscl = i == 0 ? 1 : -1;
Draw.xscl = sign;
if(outline && drawRegion){
Draw.z(prevZ + outlineLayerOffset);
@@ -112,10 +112,12 @@ public class RegionPart extends DrawPart{
if(children.size > 0){
for(int s = 0; s < len; s++){
int i = (params.sideOverride == -1 ? s : params.sideOverride);
float sign = i == 1 ? -1 : 1;
float sign = (i == 1 ? -1 : 1) * params.sideMultiplier;
Tmp.v1.set((x + moveX * prog) * sign, y + moveY * prog).rotate(params.rotation - 90);
childParam.set(params.warmup, params.reload, params.smoothReload, params.heat, params.x + Tmp.v1.x, params.y + Tmp.v1.y, i * sign + rotMove * prog * sign + params.rotation);
childParam.sideMultiplier = params.sideMultiplier;
childParam.life = params.life;
childParam.sideOverride = i;
for(var child : children){
child.draw(childParam);

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

@@ -32,7 +32,7 @@ public class ShapePart extends DrawPart{
//use specific side if necessary
int i = params.sideOverride == -1 ? s : params.sideOverride;
float sign = i == 1 ? -1 : 1;
float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
Tmp.v1.set((x + moveX * prog) * sign, y + moveY * prog).rotate(params.rotation - 90);
float