From 19cb144cdb3d42bf15c2ff5c8417b866dc5906ef Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 24 Jun 2020 20:37:49 -0400 Subject: [PATCH] Minor GL fixes --- .../revisions/BuilderCommanderMechMinerUnitEntity/14.json | 1 + .../revisions/BuilderCommanderMechMinerUnitEntity/15.json | 1 + .../src/main/resources/revisions/BuilderMechUnitEntity/14.json | 1 + .../src/main/resources/revisions/BuilderMechUnitEntity/15.json | 1 + .../resources/revisions/BuilderMinerPayloadUnitEntity/14.json | 1 + .../resources/revisions/BuilderMinerPayloadUnitEntity/15.json | 1 + .../src/main/resources/revisions/BuilderMinerUnitEntity/14.json | 1 + .../src/main/resources/revisions/BuilderMinerUnitEntity/15.json | 1 + .../src/main/resources/revisions/BuilderUnitEntity/14.json | 1 + .../src/main/resources/revisions/BuilderUnitEntity/15.json | 1 + core/assets/shaders/screenspace.frag | 1 - 11 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/14.json create mode 100644 annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/15.json create mode 100644 annotations/src/main/resources/revisions/BuilderMechUnitEntity/14.json create mode 100644 annotations/src/main/resources/revisions/BuilderMechUnitEntity/15.json create mode 100644 annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/14.json create mode 100644 annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/15.json create mode 100644 annotations/src/main/resources/revisions/BuilderMinerUnitEntity/14.json create mode 100644 annotations/src/main/resources/revisions/BuilderMinerUnitEntity/15.json create mode 100644 annotations/src/main/resources/revisions/BuilderUnitEntity/14.json create mode 100644 annotations/src/main/resources/revisions/BuilderUnitEntity/15.json diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/14.json b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/14.json new file mode 100644 index 0000000000..a8fd9c74f8 --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/14.json @@ -0,0 +1 @@ +{version:14,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/15.json b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/15.json new file mode 100644 index 0000000000..262ae6ff77 --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnitEntity/15.json @@ -0,0 +1 @@ +{version:15,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMechUnitEntity/14.json b/annotations/src/main/resources/revisions/BuilderMechUnitEntity/14.json new file mode 100644 index 0000000000..afd8b4563a --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMechUnitEntity/14.json @@ -0,0 +1 @@ +{version:14,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMechUnitEntity/15.json b/annotations/src/main/resources/revisions/BuilderMechUnitEntity/15.json new file mode 100644 index 0000000000..290d89492b --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMechUnitEntity/15.json @@ -0,0 +1 @@ +{version:15,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/14.json b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/14.json new file mode 100644 index 0000000000..07fbc5986d --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/14.json @@ -0,0 +1 @@ +{version:14,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq,size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/15.json b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/15.json new file mode 100644 index 0000000000..4e4a5fcf62 --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnitEntity/15.json @@ -0,0 +1 @@ +{version:15,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq,size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/14.json b/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/14.json new file mode 100644 index 0000000000..922766559c --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/14.json @@ -0,0 +1 @@ +{version:14,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/15.json b/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/15.json new file mode 100644 index 0000000000..bdb8f2e884 --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderMinerUnitEntity/15.json @@ -0,0 +1 @@ +{version:15,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderUnitEntity/14.json b/annotations/src/main/resources/revisions/BuilderUnitEntity/14.json new file mode 100644 index 0000000000..27ae9e80ab --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderUnitEntity/14.json @@ -0,0 +1 @@ +{version:14,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/BuilderUnitEntity/15.json b/annotations/src/main/resources/revisions/BuilderUnitEntity/15.json new file mode 100644 index 0000000000..8ec486ce03 --- /dev/null +++ b/annotations/src/main/resources/revisions/BuilderUnitEntity/15.json @@ -0,0 +1 @@ +{version:15,fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/assets/shaders/screenspace.frag b/core/assets/shaders/screenspace.frag index 493c608d6f..9cd773ad8c 100644 --- a/core/assets/shaders/screenspace.frag +++ b/core/assets/shaders/screenspace.frag @@ -1,4 +1,3 @@ - uniform sampler2D u_texture; varying vec2 v_texCoords;