Remove obsolete code

Helco · Jan 17, 2024 · 7401546 · 7401546
1 parent e93f750
commit 7401546
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 528 deletions.
diff --git a/zzre/game/systems/ActorRenderer.cs b/zzre/game/systems/ActorRenderer.cs
@@ -32,7 +32,7 @@ public ActorRenderer(ITagContainer diContainer) :
         camera = diContainer.GetTag<Camera>();
         textureLoader = diContainer.GetTag<IAssetLoader<Texture>>();
         addSubscription = World.SubscribeEntityComponentAdded<components.ActorPart>(HandleAddedComponent);
-        removeSubscription = World.SubscribeEntityComponentRemoved<ModelSkinnedMaterial[]>(HandleRemovedComponent);
+        removeSubscription = World.SubscribeEntityComponentRemoved<ModelMaterial[]>(HandleRemovedComponent);
     }
 
     public override void Dispose()
@@ -102,11 +102,11 @@ private void HandleAddedComponent(in DefaultEcs.Entity entity, in components.Act
         entity.Set(zzreMaterials);
     }
 
-    private void HandleRemovedComponent(in DefaultEcs.Entity entity, in ModelSkinnedMaterial[] materials)
+    private void HandleRemovedComponent(in DefaultEcs.Entity entity, in ModelMaterial[] materials)
     {
         foreach (var material in materials)
         {
-            material.MainTexture.Texture?.Dispose();
+            material.Texture.Texture?.Dispose();
             material.Sampler.Sampler.Dispose();
             material.Dispose();
         }

diff --git a/zzre/materials/ModelInstancedMaterial.cs b/zzre/materials/ModelInstancedMaterial.cs
diff --git a/zzre/materials/ModelSkinnedMaterial.cs b/zzre/materials/ModelSkinnedMaterial.cs
diff --git a/zzre/shaders/DebugSkinAll.frag b/zzre/shaders/DebugSkinAll.frag
diff --git a/zzre/shaders/DebugSkinAll.vert b/zzre/shaders/DebugSkinAll.vert
diff --git a/zzre/shaders/DebugSkinSingle.frag b/zzre/shaders/DebugSkinSingle.frag
diff --git a/zzre/shaders/DebugSkinSingle.vert b/zzre/shaders/DebugSkinSingle.vert
diff --git a/zzre/shaders/ModelInstanced.frag b/zzre/shaders/ModelInstanced.frag
diff --git a/zzre/shaders/ModelInstanced.vert b/zzre/shaders/ModelInstanced.vert