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

Adds VV attributes on some fields in surveillance camera components (#11453)

Browse Source
This commit is contained in:
Flipp Syder
2022-09-22 08:45:26 -07:00
committed by GitHub
parent c471aca2af
commit aa1cd71d05
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
View File

@@ -10,6 +10,7 @@ public sealed class SurveillanceCameraComponent : Component
// List of active viewers. This is for bookkeeping purposes, // List of active viewers. This is for bookkeeping purposes,
// so that when a camera shuts down, any entity viewing it // so that when a camera shuts down, any entity viewing it
// will immediately have their subscription revoked. // will immediately have their subscription revoked.
[ViewVariables]
public HashSet<EntityUid> ActiveViewers { get; } = new(); public HashSet<EntityUid> ActiveViewers { get; } = new();
// Monitors != Viewers, as viewers are entities that are tied // Monitors != Viewers, as viewers are entities that are tied
@@ -18,6 +19,7 @@ public sealed class SurveillanceCameraComponent : Component
// Monitors are grouped sets of viewers, and may be // Monitors are grouped sets of viewers, and may be
// completely different monitor types (e.g., monitor console, // completely different monitor types (e.g., monitor console,
// AI, etc.) // AI, etc.)
[ViewVariables]
public HashSet<EntityUid> ActiveMonitors { get; } = new(); public HashSet<EntityUid> ActiveMonitors { get; } = new();
// If this camera is active or not. Deactivating a camera // If this camera is active or not. Deactivating a camera

9
Content.Server/SurveillanceCamera/Components/SurveillanceCameraMonitorComponent.cs
View File

@@ -5,17 +5,24 @@ namespace Content.Server.SurveillanceCamera;
public sealed class SurveillanceCameraMonitorComponent : Component public sealed class SurveillanceCameraMonitorComponent : Component
{ {
// Currently active camera viewed by this monitor. // Currently active camera viewed by this monitor.
[ViewVariables]
public EntityUid? ActiveCamera { get; set; } public EntityUid? ActiveCamera { get; set; }
[ViewVariables]
public string ActiveCameraAddress { get; set; } = string.Empty; public string ActiveCameraAddress { get; set; } = string.Empty;
[ViewVariables]
// Last time this monitor was sent a heartbeat. // Last time this monitor was sent a heartbeat.
public float LastHeartbeat { get; set; } public float LastHeartbeat { get; set; }
[ViewVariables]
// Last time this monitor sent a heartbeat. // Last time this monitor sent a heartbeat.
public float LastHeartbeatSent { get; set; } public float LastHeartbeatSent { get; set; }
// Next camera this monitor is trying to connect to. // Next camera this monitor is trying to connect to.
// If the monitor has connected to the camera, this // If the monitor has connected to the camera, this
// should be set to null. // should be set to null.
[ViewVariables]
public string? NextCameraAddress { get; set; } public string? NextCameraAddress { get; set; }
[ViewVariables] [ViewVariables]
@@ -23,10 +30,12 @@ public sealed class SurveillanceCameraMonitorComponent : Component
public HashSet<EntityUid> Viewers { get; } = new(); public HashSet<EntityUid> Viewers { get; } = new();
// Current active subnet. // Current active subnet.
[ViewVariables]
public string ActiveSubnet { get; set; } = default!; public string ActiveSubnet { get; set; } = default!;
// Known cameras in this subnet by address with name values. // Known cameras in this subnet by address with name values.
// This is cleared when the subnet is changed. // This is cleared when the subnet is changed.
[ViewVariables]
public Dictionary<string, string> KnownCameras { get; } = new(); public Dictionary<string, string> KnownCameras { get; } = new();
[ViewVariables] [ViewVariables]