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

Logic negative coordinate support

Browse Source
This commit is contained in:
Anuken
2021-03-12 09:35:32 -05:00
parent c5bea40e7d
commit d545dc0d02
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/logic/LExecutor.java
View File

@@ -861,9 +861,13 @@ public class LExecutor{
//add graphics calls, cap graphics buffer size
if(exec.graphicsBuffer.size < maxGraphicsBuffer){
exec.graphicsBuffer.add(DisplayCmd.get(type, exec.numi(x), exec.numi(y), num1, exec.numi(p2), exec.numi(p3), exec.numi(p4)));
exec.graphicsBuffer.add(DisplayCmd.get(type, packSign(exec.numi(x)), packSign(exec.numi(y)), packSign(num1), packSign(exec.numi(p2)), packSign(exec.numi(p3)), packSign(exec.numi(p4))));
}
}
static int packSign(int value){
return (Math.abs(value) & 0b011111111) | (value < 0 ? 0b1000000000 : 0);
}
}
public static class DrawFlushI implements LInstruction{

13
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@@ -75,8 +75,8 @@ public class LogicDisplay extends Block{
while(!commands.isEmpty()){
long c = commands.removeFirst();
byte type = DisplayCmd.type(c);
int x = DisplayCmd.x(c), y = DisplayCmd.y(c),
p1 = DisplayCmd.p1(c), p2 = DisplayCmd.p2(c), p3 = DisplayCmd.p3(c), p4 = DisplayCmd.p4(c);
int x = unpackSign(DisplayCmd.x(c)), y = unpackSign(DisplayCmd.y(c)),
p1 = unpackSign(DisplayCmd.p1(c)), p2 = unpackSign(DisplayCmd.p2(c)), p3 = unpackSign(DisplayCmd.p3(c)), p4 = unpackSign(DisplayCmd.p4(c));
switch(type){
case commandClear -> Core.graphics.clear(x / 255f, y / 255f, p1 / 255f, 1f);
@@ -106,6 +106,10 @@ public class LogicDisplay extends Block{
}
}
static int unpackSign(int value){
return (value & 0b0111111111) * ((value & (0b1000000000)) != 0 ? -1 : 1);
}
public enum GraphicsType{
clear,
color,
@@ -123,10 +127,11 @@ public class LogicDisplay extends Block{
@Struct
static class DisplayCmdStruct{
@StructField(4)
public byte type;
//9 bits are required for full 360 degrees
@StructField(9)
//at least 9 bits are required for full 360 degrees
@StructField(10)
public int x, y, p1, p2, p3, p4;
}
}