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

Light RGB clamp + Arc update

Browse Source
This commit is contained in:
Anuken
2022-02-02 11:54:39 -05:00
parent cc221d669a
commit ca6723e696
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -70,7 +70,7 @@ public class EnergyFieldAbility extends Ability{
for(int i = 0; i < sectors; i++){ for(int i = 0; i < sectors; i++){
float rot = unit.rotation + i * 360f/sectors - Time.time * rotateSpeed; float rot = unit.rotation + i * 360f/sectors - Time.time * rotateSpeed;
Lines.swirl(rx, ry, orbRadius + 3f, sectorRad, rot); Lines.arc(rx, ry, orbRadius + 3f, sectorRad, rot);
} }
Lines.stroke(Lines.getStroke() * curStroke); Lines.stroke(Lines.getStroke() * curStroke);
@@ -78,7 +78,7 @@ public class EnergyFieldAbility extends Ability{
if(curStroke > 0){ if(curStroke > 0){
for(int i = 0; i < sectors; i++){ for(int i = 0; i < sectors; i++){
float rot = unit.rotation + i * 360f/sectors + Time.time * rotateSpeed; float rot = unit.rotation + i * 360f/sectors + Time.time * rotateSpeed;
Lines.swirl(rx, ry, range, sectorRad, rot); Lines.arc(rx, ry, range, sectorRad, rot);
} }
} }

2
core/src/mindustry/world/blocks/power/LightBlock.java
View File

@@ -63,7 +63,7 @@ public class LightBlock extends Block{
@Override @Override
public void control(LAccess type, double p1, double p2, double p3, double p4){ public void control(LAccess type, double p1, double p2, double p3, double p4){
if(type == LAccess.color){ if(type == LAccess.color){
color = Color.rgba8888((float)p1, (float)p2, (float)p3, 1f); color = Color.rgba8888(Mathf.clamp((float)p1), Mathf.clamp((float)p2), Mathf.clamp((float)p3), 1f);
} }
super.control(type, p1, p2, p3, p4); super.control(type, p1, p2, p3, p4);

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=0370ef92e5 archash=680252597e