Singularity Fixes, Part 3 (#4105)

* Hopefully make singularity shader warping resolution-invariant

This may or may not fix intensity issues

* Fix singularity 'zero velocity' check

It got stuck in a corner. Twice. I really thought I'd fixed that.

* Make it easier to move around various power stuff by shrinking their AABBs a little and making singulo generator a circle

* Changes to some machine prototypes to reduce duplication of collision changes (#1)

* Changes to some machine prototypes to reduce duplication of collision changes

* BaseMachine.BaseMachineUnpowered -> BaseMachine.BaseMachinePowered

Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml

@@ -15,8 +15,9 @@
     bodyType: Static
     fixtures:
     - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+        # Using a circle here makes it a lot easier to pull it all the way from Cargo
+        !type:PhysShapeCircle
+          radius: 0.45
       mass: 25
       # Keep an eye on ParticlesProjectile when adjusting these
       layer:

Resources/Prototypes/Entities/Constructible/Power/parts.yml

@@ -1,30 +1,12 @@
 - type: entity
   abstract: true
   id: BaseSmes
+  parent: BaseMachine
   name: SMES
   description: A high-capacity superconducting magnetic energy storage (SMES) unit.
   placement:
     mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: SnapGrid
   - type: Sprite
     netsync: false
     sprite: Constructible/Power/smes.rsi
@@ -52,8 +34,6 @@
   - type: PowerSupplier
   - type: BatteryDischarger
     activeSupplyRate: 1000
-  - type: Anchorable
-  - type: Pullable
   - type: ClientEntitySpawner
     prototypes:
     - HVDummyWire
@@ -61,30 +41,12 @@
 - type: entity
   abstract: true
   id: BaseSubstation
+  parent: BaseMachine
   name: substation
   description: Reduces the voltage of electricity put into it.
   placement:
     mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: SnapGrid
   - type: Sprite
     sprite: Constructible/Power/substation.rsi
     layers:
@@ -113,8 +75,6 @@
     voltage: Medium
   - type: BatteryDischarger
     activeSupplyRate: 1000
-  - type: Anchorable
-  - type: Pullable
   - type: ClientEntitySpawner
     prototypes:
     - HVDummyWire

Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: CloningPod
-  parent: BaseMachine
+  parent: BaseMachinePowered
   name: cloning pod
   description: A Cloning Pod. 50% reliable.
   components:

Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: MedicalScanner
-  parent: BaseMachine
+  parent: BaseMachinePowered
   name: medical scanner
   description: A bulky medical scanner.
   components:

Resources/Prototypes/Entities/Constructible/base.yml

@@ -10,7 +10,8 @@
     bodyType: Static
     fixtures:
     - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.45, 0.45"
       mass: 50
       layer:
       - SmallImpassable
@@ -34,7 +35,8 @@
     bodyType: Dynamic
     fixtures:
     - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.45, 0.45"
       mass: 50
       layer:
       - SmallImpassable

Resources/Prototypes/Entities/Constructible/base_machine.yml

@@ -5,13 +5,12 @@
   components:
   - type: InteractionOutline
   - type: Anchorable
-  - type: Pullable
-  - type: PowerReceiver
   - type: Physics
     bodyType: Static
     fixtures:
     - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.45, 0.45"
       mass: 25
       layer:
       - MobMask
@@ -28,3 +27,11 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+
+- type: entity
+  abstract: true
+  parent: BaseMachine
+  id: BaseMachinePowered
+  components:
+  - type: PowerReceiver
+

Resources/Textures/Shaders/singularity.swsl

@@ -2,13 +2,14 @@
 
 uniform sampler2D SCREEN_TEXTURE;
 uniform highp vec2 positionInput;
+uniform highp vec2 renderScale;
 uniform highp float falloff;
 uniform highp float intensity;
 
 
 
 void fragment() {
-	highp float distanceToCenter = length(FRAGCOORD.xy-positionInput);
+	highp float distanceToCenter = length((FRAGCOORD.xy - positionInput) / renderScale);
 
 	highp vec2 finalCoords = FRAGCOORD.xy - positionInput;
 	highp float deformation = (pow(intensity, 2.0)*500.0) / pow(distanceToCenter, pow(falloff, 0.5));