mark component as dirty

OpenDreamProject · Feb 19, 2025 · 608cfc3 · 608cfc3
1 parent a08e3b1
commit 608cfc3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/OpenDreamRuntime/Objects/DreamObject.cs b/OpenDreamRuntime/Objects/DreamObject.cs
@@ -44,6 +44,7 @@ public class DreamObject {
         protected PvsOverrideSystem? PvsOverrideSystem => ObjectDefinition.PvsOverrideSystem;
         protected MetaDataSystem? MetaDataSystem => ObjectDefinition.MetaDataSystem;
         protected ServerVerbSystem? VerbSystem => ObjectDefinition.VerbSystem;
+        protected ServerDreamParticlesSystem? ParticlesSystem => ObjectDefinition.ParticlesSystem;
 
         protected Dictionary<string, DreamValue>? Variables;
         //handle to the list of vars on this object so that it's only created once and refs to object.vars are consistent

diff --git a/OpenDreamRuntime/Objects/DreamObjectDefinition.cs b/OpenDreamRuntime/Objects/DreamObjectDefinition.cs
@@ -30,6 +30,7 @@ public sealed class DreamObjectDefinition {
     public readonly PvsOverrideSystem? PvsOverrideSystem;
     public readonly MetaDataSystem? MetaDataSystem;
     public readonly ServerVerbSystem? VerbSystem;
+    public readonly ServerDreamParticlesSystem? ParticlesSystem;
 
     public readonly TreeEntry TreeEntry;
     public string Type => TreeEntry.Path;
@@ -74,6 +75,7 @@ public DreamObjectDefinition(DreamObjectDefinition copyFrom) {
         PvsOverrideSystem = copyFrom.PvsOverrideSystem;
         MetaDataSystem = copyFrom.MetaDataSystem;
         VerbSystem = copyFrom.VerbSystem;
+        ParticlesSystem = copyFrom.ParticlesSystem;
 
         TreeEntry = copyFrom.TreeEntry;
         InitializationProc = copyFrom.InitializationProc;
@@ -88,7 +90,7 @@ public DreamObjectDefinition(DreamObjectDefinition copyFrom) {
             Verbs = new List<int>(copyFrom.Verbs);
     }
 
-    public DreamObjectDefinition(DreamManager dreamManager, DreamObjectTree objectTree, AtomManager atomManager, IDreamMapManager dreamMapManager, IMapManager mapManager, DreamResourceManager dreamResourceManager, WalkManager walkManager, IEntityManager entityManager, IPlayerManager playerManager, ISerializationManager serializationManager, ServerAppearanceSystem? appearanceSystem, TransformSystem? transformSystem, PvsOverrideSystem? pvsOverrideSystem, MetaDataSystem? metaDataSystem, ServerVerbSystem? verbSystem, TreeEntry? treeEntry) {
+    public DreamObjectDefinition(DreamManager dreamManager, DreamObjectTree objectTree, AtomManager atomManager, IDreamMapManager dreamMapManager, IMapManager mapManager, DreamResourceManager dreamResourceManager, WalkManager walkManager, IEntityManager entityManager, IPlayerManager playerManager, ISerializationManager serializationManager, ServerAppearanceSystem? appearanceSystem, TransformSystem? transformSystem, PvsOverrideSystem? pvsOverrideSystem, MetaDataSystem? metaDataSystem, ServerVerbSystem? verbSystem, ServerDreamParticlesSystem? particlesSystem, TreeEntry? treeEntry) {
         DreamManager = dreamManager;
         ObjectTree = objectTree;
         AtomManager = atomManager;
@@ -104,6 +106,7 @@ public DreamObjectDefinition(DreamManager dreamManager, DreamObjectTree objectTr
         PvsOverrideSystem = pvsOverrideSystem;
         MetaDataSystem = metaDataSystem;
         VerbSystem = verbSystem;
+        ParticlesSystem = particlesSystem;
 
         TreeEntry = treeEntry;
 

diff --git a/OpenDreamRuntime/Objects/DreamObjectTree.cs b/OpenDreamRuntime/Objects/DreamObjectTree.cs
@@ -71,6 +71,7 @@ public sealed class DreamObjectTree {
     private PvsOverrideSystem? _pvsOverrideSystem;
     private MetaDataSystem? _metaDataSystem;
     private ServerVerbSystem? _verbSystem;
+    private ServerDreamParticlesSystem? _particlesSystem;
 
     public void LoadJson(DreamCompiledJson json) {
         var types = json.Types ?? Array.Empty<DreamTypeJson>();
@@ -84,6 +85,7 @@ public void LoadJson(DreamCompiledJson json) {
         _entitySystemManager.TryGetEntitySystem(out _pvsOverrideSystem);
         _entitySystemManager.TryGetEntitySystem(out _metaDataSystem);
         _entitySystemManager.TryGetEntitySystem(out _verbSystem);
+        _entitySystemManager.TryGetEntitySystem(out _particlesSystem);
 
         Strings = json.Strings ?? new();
 
@@ -335,7 +337,7 @@ private void LoadTypesFromJson(DreamTypeJson[] types, ProcDefinitionJson[]? proc
         foreach (TreeEntry type in GetAllDescendants(Root)) {
             int typeId = type.Id;
             DreamTypeJson jsonType = types[typeId];
-            var definition = new DreamObjectDefinition(_dreamManager, this, _atomManager, _dreamMapManager, _mapManager, _dreamResourceManager, _walkManager, _entityManager, _playerManager, _serializationManager, _appearanceSystem, _transformSystem, _pvsOverrideSystem, _metaDataSystem, _verbSystem, type);
+            var definition = new DreamObjectDefinition(_dreamManager, this, _atomManager, _dreamMapManager, _mapManager, _dreamResourceManager, _walkManager, _entityManager, _playerManager, _serializationManager, _appearanceSystem, _transformSystem, _pvsOverrideSystem, _metaDataSystem, _verbSystem, _particlesSystem, type);
 
             type.ObjectDefinition = definition;
             type.TreeIndex = treeIndex++;

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectParticles.cs b/OpenDreamRuntime/Objects/Types/DreamObjectParticles.cs
@@ -288,7 +288,7 @@ protected override void SetVar(string varName, DreamValue value) {
                 }
                 break;
         }
-
+        ParticlesSystem!.MarkDirty((Entity, ParticlesComponent));
         base.SetVar(varName, value); //all calls should set the internal vars, so GetVar() can just be default also
      }
 }
diff --git a/OpenDreamRuntime/Rendering/ServerDreamParticleSystem.cs b/OpenDreamRuntime/Rendering/ServerDreamParticleSystem.cs
@@ -2,4 +2,8 @@
 
 namespace OpenDreamRuntime.Rendering;
 
-public sealed class ServerDreamParticlesSystem : SharedDreamParticlesSystem {}
+public sealed class ServerDreamParticlesSystem : SharedDreamParticlesSystem {
+    public void MarkDirty(Entity<DreamParticlesComponent> ent){
+        Dirty(ent, ent.Comp);
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     break;
             }
+            ParticlesSystem!.MarkDirty((Entity, ParticlesComponent));
             base.SetVar(varName, value); //all calls should set the internal vars, so GetVar() can just be default also
          }
     }