tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Physics Shapes (#306)

Browse Source 
* Removed BoundingBoxComponent.

* Updated prototypes to use refactored CollidableComponent.

* Renamed ICollidable to IPhysBody.
Moved ICollidable to the Shared/Physics namespace.

* Migrated more yaml files to use PhysShapes.

* Updated YAML to use the new list-of-bodies system.

* Updated the new prototypes.

* Update submodule

* Update submodule again, whoops
This commit is contained in:
Acruid
2019-09-03 13:14:04 -07:00
committed by Pieter-Jan Briers
parent 5aafe89d95
commit 9353a060f2
34 changed files with 148 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/AI/WanderProcessor.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.Chat;
using Content.Shared.Physics;
using Robust.Server.AI;
using Robust.Server.GameObjects;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
@@ -12,6 +13,7 @@ using Robust.Shared.Interfaces.Physics;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Utility;
namespace Content.Server.AI
@@ -122,8 +124,8 @@ namespace Content.Server.AI
var entWorldPos = SelfEntity.Transform.WorldPosition;
if (SelfEntity.TryGetComponent<BoundingBoxComponent>(out var bounds))
entWorldPos = bounds.WorldAABB.Center;
if (SelfEntity.TryGetComponent<CollidableComponent>(out var bounds))
entWorldPos = ((IPhysBody) bounds).WorldAABB.Center;
var rngState = GenSeed();
for (var i = 0; i < 3; i++) // you get 3 chances to find a place to walk

4
Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
View File

@@ -5,8 +5,8 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Physics;
using Robust.Shared.Serialization;
using Robust.Shared.Interfaces.Physics;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Projectiles
@@ -54,7 +54,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
/// </summary>
/// <param name="collidedwith"></param>
/// <returns></returns>
bool ICollideSpecial.PreventCollide(ICollidable collidedwith)
bool ICollideSpecial.PreventCollide(IPhysBody collidedwith)
{
if (IgnoreShooter && collidedwith.Owner.Uid == Shooter)
return true;

4
Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs
View File

@@ -39,9 +39,9 @@ namespace Content.Server.GameObjects.Components
// after impacting the first object.
// For realism this should actually be changed when the velocity of the object is less than a threshold.
// This would allow ricochets off walls, and weird gravity effects from slowing the object.
if (collidedwith.Count > 0 && Owner.TryGetComponent(out CollidableComponent body))
if (collidedwith.Count > 0 && Owner.TryGetComponent(out CollidableComponent body) && body.PhysicsShapes.Count >= 1)
{
body.CollisionMask &= (int)~CollisionGroup.Mob;
body.PhysicsShapes[0].CollisionMask &= (int)~CollisionGroup.Mob;
body.IsScrapingFloor = true;
// KYS, your job is finished. Trigger ILand as well.

4
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -329,9 +329,9 @@ namespace Content.Server.GameObjects.EntitySystems
}
// Check if ClickLocation is in object bounds here, if not lets log as warning and see why
if (attacked.TryGetComponent(out BoundingBoxComponent boundingBox))
if (attacked.TryGetComponent(out ICollidableComponent collideComp))
{
if (!boundingBox.WorldAABB.Contains(coordinates.ToWorld(_mapManager).Position))
if (!collideComp.WorldAABB.Contains(coordinates.ToWorld(_mapManager).Position))
{
Logger.WarningS("system.interaction",
$"Player {player.Name} clicked {attacked.Name} outside of its bounding box component somehow");

7
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -17,6 +17,7 @@ using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Players;
namespace Content.Server.GameObjects.EntitySystems
@@ -170,7 +171,11 @@ namespace Content.Server.GameObjects.EntitySystems
if (!throwEnt.TryGetComponent(out ThrownItemComponent projComp))
{
projComp = throwEnt.AddComponent<ThrownItemComponent>();
colComp.CollisionMask |= (int)CollisionGroup.Mob;
if(colComp.PhysicsShapes.Count == 0)
colComp.PhysicsShapes.Add(new PhysShapeAabb());
colComp.PhysicsShapes[0].CollisionMask |= (int)CollisionGroup.Mob;
colComp.IsScrapingFloor = false;
}

16
Content.Shared/Physics/CollisionGroup.cs
View File

@@ -1,17 +1,23 @@
using System;
using JetBrains.Annotations;
namespace Content.Shared.Physics
{
/// <summary>
/// Defined collision groups for the physics system.
/// </summary>
[Flags]
[Flags, PublicAPI]
public enum CollisionGroup
{
None = 0,
Grid = 1, // Walls
Mob = 2, // Mobs, like the player or NPCs
Fixture = 4, // wall fixtures, like APC or posters
Items = 8 // Items on the ground
Grid = 1 << 0, // Walls
Mob = 1 << 1, // Mobs, like the player or NPCs
Fixture = 1 << 2, // wall fixtures, like APC or posters
Items = 1 << 3, // Items on the ground
Furniture = 1 << 4, // Tables, machines
// 32 possible groups
MobMask = Grid | Mob | Furniture,
AllMask = -1,
}
}

1
Resources/Prototypes/Entities/Janitor.yml
View File

@@ -25,7 +25,6 @@
- type: Icon
texture: Objects/mopbucket.png
- type: Clickable
- type: BoundingBox
- type: Solution
maxVol: 500
caps: 3

12
Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml
View File

@@ -10,16 +10,18 @@
#rotation: -180
- type: Icon
texture: Objects/Projectiles/bullet.png
- type: BoundingBox
aabb: -0.2,-0.2,0.2,0.2
- type: Collidable
hard: false
shapes:
- !type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
layer: 1
mask: 3
- type: Physics
edgeslide: false
- type: Projectile
damages:
Brute: 20
- type: Collidable
hard: false
mask: 3
- type: entity
id: ProjectileBullet

9
Resources/Prototypes/Entities/buildings/airlock_base.yml
View File

@@ -20,14 +20,11 @@
sprite: Buildings/airlock_basic.rsi
state: closed
- type: BoundingBox
# This AABB isn't the full tile because..
# If it is, airlocks collide with walls and other airlocks causing them to never close.
# yeah...
# TODO: Fix that.
aabb: -0.45, -0.45, 0.45, 0.45
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 2
layer: 16
- type: Door
- type: Appearance
visuals:

4
Resources/Prototypes/Entities/buildings/asteroid.yml
View File

@@ -10,8 +10,10 @@
- type: Icon
sprite: Buildings/Walls/asteroid_rock.rsi
state: 0
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
layer: 1
- type: Damageable
- type: Destructible
thresholdvalue: 100

2
Resources/Prototypes/Entities/buildings/catwalk.yml
View File

@@ -3,7 +3,7 @@
name: Catwalk
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
netsync: false
sprite: Buildings/catwalk.rsi

4
Resources/Prototypes/Entities/buildings/computers.yml
View File

@@ -4,7 +4,9 @@
components:
- type: Clickable
- type: Collidable
- type: BoundingBox
shapes:
- !type:PhysShapeAabb
layer: 8
- type: Icon
sprite: Buildings/computer.rsi
state: computer

8
Resources/Prototypes/Entities/buildings/fuel_tank.yml
View File

@@ -10,10 +10,12 @@
texture: Buildings/weldtank.png
- type: Clickable
- type: BoundingBox
aabb: "-0.5,-0.25,0.5,0.25"
- type: Collidable
mask: 3
shapes:
- !type:PhysShapeAabb
bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
IsScrapingFloor: true
- type: Physics
mass: 15

8
Resources/Prototypes/Entities/buildings/furniture.yml
View File

@@ -3,7 +3,7 @@
id: stool
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
sprite: Buildings/furniture.rsi
state: stool_base
@@ -17,7 +17,7 @@
id: chairOfficeLight
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
sprite: Buildings/furniture.rsi
state: officechair_white
@@ -30,7 +30,7 @@
id: chairOfficeDark
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
sprite: Buildings/furniture.rsi
state: officechair_dark
@@ -43,7 +43,7 @@
id: chair
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
sprite: Buildings/furniture.rsi
state: chair

5
Resources/Prototypes/Entities/buildings/girder.yml
View File

@@ -8,8 +8,11 @@
- type: Icon
texture: Buildings/wall_girder.png
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 19
layer: 1
- type: Damageable
- type: Destructible
thresholdvalue: 50

5
Resources/Prototypes/Entities/buildings/lathe.yml
View File

@@ -9,8 +9,11 @@
- type: Icon
sprite: Buildings/autolathe.rsi
state: idle
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 19
layer: 16
- type: SnapGrid
offset: Center
- type: Lathe

5
Resources/Prototypes/Entities/buildings/lighting.yml
View File

@@ -3,7 +3,7 @@
name: "Unpowered Light"
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sound
- type: Sprite
sprite: Buildings/light_tube.rsi
@@ -29,7 +29,7 @@
parent: wall_light
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
sprite: Buildings/light_tube.rsi
state: off
@@ -53,7 +53,6 @@
parent: wall_light
components:
- type: Clickable
- type: BoundingBox
- type: Sprite
sprite: Buildings/light_small.rsi
state: off

4
Resources/Prototypes/Entities/buildings/low_wall.yml
View File

@@ -14,8 +14,10 @@
sprite: Buildings/low_wall.rsi
state: metal
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
layer: 1
- type: Damageable
- type: Destructible
thresholdvalue: 100

42
Resources/Prototypes/Entities/buildings/power.yml
View File

@@ -4,7 +4,7 @@
description: Transfers power, avoid letting things come down it
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
netsync: false
drawdepth: BelowFloor
@@ -40,9 +40,12 @@
description: A portal to hell which summons power from the nether
components:
- type: Clickable
- type: BoundingBox
aabb: -0.5, -0.5, 0.3, 0.5
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5, -0.5, 0.3, 0.5"
mask: 19
layer: 16
- type: Sprite
texture: Objects/generator.png
- type: Icon
@@ -55,7 +58,11 @@
description: Supplies power directly to nearby objects
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 19
layer: 4
- type: Sprite
drawdepth: WallMountedItems
texture: Objects/provider.png
@@ -96,8 +103,10 @@
interfaces:
- key: enum.ApcUiKey.Key
type: ApcBoundUserInterface
- type: BoundingBox
aabb: -0.25, -0.25, 0.25, 0.3
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.25, -0.25, 0.25, 0.3"
- type: Sound
- type: entity
@@ -106,9 +115,12 @@
description: Stores power in its super-magnetic cells
components:
- type: Clickable
- type: BoundingBox
aabb: -0.5, -0.5, 0.5, 0.5
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5, -0.5, 0.5, 0.5"
mask: 19
layer: 16
- type: Sprite
netsync: false
sprite: Buildings/smes.rsi
@@ -143,9 +155,12 @@
description: A monstrosity that does nothing but suck up power from the nearby wires
components:
- type: Clickable
- type: BoundingBox
aabb: -0.5, -0.25, 0.5, 0.25
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5, -0.25, 0.5, 0.25"
mask: 19
layer: 16
- type: Sprite
texture: Objects/wiredmachine.png
- type: Icon
@@ -161,9 +176,12 @@
description: A terrifying monstrosity that sucks up power from the wireless transmitters, Tesla would be proud
components:
- type: Clickable
- type: BoundingBox
aabb: -0.5, -0.25, 0.5, 0.25
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5, -0.25, 0.5, 0.25"
mask: 19
layer: 16
- type: Sprite
texture: Objects/wirelessmachine.png
- type: Icon

8
Resources/Prototypes/Entities/buildings/storage/closet_base.yml
View File

@@ -16,10 +16,12 @@
state: generic_door
- type: Clickable
- type: BoundingBox
aabb: "-0.5,-0.25,0.5,0.25"
- type: Collidable
mask: 3
shapes:
- !type:PhysShapeAabb
bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
IsScrapingFloor: true
- type: Physics
mass: 25

9
Resources/Prototypes/Entities/buildings/storage/crate_base.yml
View File

@@ -16,14 +16,17 @@
state: crate
- type: Clickable
- type: BoundingBox
aabb: -0.4, -0.4, 0.4, 0.4
- type: Physics
mass: 25
Anchored: false
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.4, -0.4, 0.4, 0.4"
layer: 16
mask: 19
- type: EntityStorage
Capacity: 60
- type: PlaceableSurface

5
Resources/Prototypes/Entities/buildings/table.yml
View File

@@ -12,8 +12,11 @@
sprite: Buildings/table_solid.rsi
state: plain_preview
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 19
layer: 16
- type: SnapGrid
offset: Center

6
Resources/Prototypes/Entities/buildings/turret.yml
View File

@@ -3,7 +3,7 @@
name: Turret Base
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
texture: Buildings/TurrBase.png
@@ -12,7 +12,7 @@
name: Turret (Gun)
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
drawdepth: WallMountedItems
texture: Buildings/TurrTop.png
@@ -26,7 +26,7 @@
name: Turret (Light)
components:
- type: Clickable
- type: BoundingBox
- type: Collidable
- type: Sprite
drawdepth: WallMountedItems
texture: Buildings/TurrLamp.png

4
Resources/Prototypes/Entities/buildings/vending_machines.yml
View File

@@ -13,8 +13,10 @@
- type: Icon
sprite: Buildings/VendingMachines/empty.rsi
state: normal
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
layer: 8
- type: SnapGrid
offset: Center
- type: Damageable

4
Resources/Prototypes/Entities/buildings/walls.yml
View File

@@ -8,8 +8,10 @@
drawdepth: Walls
- type: Icon
state: full
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
layer: 1
- type: Damageable
- type: Destructible
thresholdvalue: 100

5
Resources/Prototypes/Entities/buildings/windows.yml
View File

@@ -13,8 +13,11 @@
sprite: Buildings/window.rsi
state: window0
- type: BoundingBox
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.5, -0.5, 0.3, 0.5"
layer: 1
- type: Damageable
- type: Destructible
thresholdvalue: 100

5
Resources/Prototypes/Entities/items/item_base.yml
View File

@@ -5,9 +5,10 @@
- type: Item
Size: 5
- type: Clickable
- type: BoundingBox
aabb: "-0.25,-0.25,0.25,0.25"
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25"
mask: 5
layer: 8
IsScrapingFloor: true

6
Resources/Prototypes/Entities/items/powercells.yml
View File

@@ -3,8 +3,10 @@
abstract: true
parent: BaseItem
components:
- type: BoundingBox
aabb: -0.15,-0.3,0.2,0.3
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-0.15,-0.3,0.2,0.3"
- type: PowerCell
- type: Appearance
- type: Sprite

5
Resources/Prototypes/Entities/items/teleporters.yml
View File

@@ -50,9 +50,10 @@
description: "Portal to another location"
components:
- type: Collidable
shapes:
- !type:PhysShapeAabb
mask: 10
- type: Portal
- type: BoundingBox
aabb: "-0.25,-0.25,0.25,0.25"
- type: Sprite
netsync: false
sprite: "Effects/portal.rsi"

4
Resources/Prototypes/Entities/markers/construction_ghost.yml
View File

@@ -7,7 +7,7 @@
layers:
- shader: unshaded
- type: ConstructionGhost
- type: BoundingBox
- type: Collidable
- type: Clickable
baseshader: unshaded
selectionshader: selection_outline_unshaded
@@ -18,5 +18,5 @@
components:
- type: Sprite
- type: Construction
- type: BoundingBox
- type: Collidable
- type: Clickable

9
Resources/Prototypes/Entities/mobs/human.yml
View File

@@ -36,16 +36,15 @@
sprite: Mob/human.rsi
state: male
- type: BoundingBox
aabb: "-0.35,-0.35,0.35,0.35"
- type: Physics
mass: 85
- type: Collidable
mask: 3
shapes:
- !type:PhysShapeAabb
bounds: "-0.5,-0.25,-0.05,0.25"
mask: 19
layer: 2
DebugColor: "#0000FF"
- type: Input
context: "human"

2
Resources/Prototypes/Entities/mobs/observer.yml
View File

@@ -8,8 +8,6 @@
mass: 5
- type: Eye
zoom: 0.5, 0.5
- type: BoundingBox
aabb: "-0.5,-0.25,-0.05,0.25"
- type: Input
context: "ghost"
- type: Examiner

4
Resources/Prototypes/Entities/water_tank.yml
View File

@@ -11,11 +11,11 @@
texture: Buildings/watertank.png
- type: Clickable
- type: BoundingBox
aabb: "-0.5,-0.25,0.5,0.25"
- type: Collidable
mask: 3
layer: 1
shape:
bounds: "-0.5,-0.25,0.5,0.25"
IsScrapingFloor: true
- type: Physics
mass: 15

2
RobustToolbox

Submodule RobustToolbox updated: 5fee08e68b...f2eb035ed8