From c6d16bcba824fb761056111a1df235540860a66b Mon Sep 17 00:00:00 2001
From: fgnm <fgnm.dev@gmail.com>
Date: Thu, 2 May 2024 23:03:31 +0200
Subject: [PATCH] [editor only] Fix shader reloading properties

---
 .../panels/UIScenePropertiesMediator.java        |  3 ++-
 .../ui/properties/panels/UIShaderProperties.java | 16 +++++++++-------
 .../panels/UIShaderPropertiesMediator.java       |  4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
index 337374b3..699ab7a9 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
@@ -73,7 +73,6 @@ public class UIScenePropertiesMediator extends UIAbstractPropertiesMediator<Scen
         super(NAME, new UISceneProperties());
 
         resourceManager = facade.retrieveProxy(ResourceManager.NAME);
-        viewComponent.initShader(resourceManager.getShaders());
     }
 
     @Override
@@ -121,6 +120,8 @@ public class UIScenePropertiesMediator extends UIAbstractPropertiesMediator<Scen
 
     @Override
     protected void translateObservableDataToView(SceneVO item) {
+        viewComponent.initShader(resourceManager.getShaders());
+
         PhysicsPropertiesVO physicsVO = item.physicsPropertiesVO;
         LightsPropertiesVO lightsVO = item.lightsPropertiesVO;
         ResolutionManager resolutionManager = facade.retrieveProxy(ResolutionManager.NAME);
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java
index e2bd8184..31aadb4d 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java
@@ -64,15 +64,9 @@ public class UIShaderProperties extends UIRemovableProperties {
         renderingLaterSelector.setItems(renderingLayerMap.keySet().toArray(new String[0]));
     }
 
-    public void initView(HashMap<String, ShaderProgram> shaders) {
+    public void initView() {
         mainTable.clear();
 
-        Array<String> shaderNames = new Array<>();
-        shaderNames.add("Default");
-        shaders.keySet().forEach(shaderNames::add);
-
-        shadersSelector.setItems(shaderNames);
-
         mainTable.add(new VisLabel("Shader: ", Align.right)).padRight(5).width(75).right();
         mainTable.add(shadersSelector).width(100).left().row();
 
@@ -89,6 +83,14 @@ public class UIShaderProperties extends UIRemovableProperties {
         mainTable.add(renderingLaterSelector).width(100).left().row();
     }
 
+    public void initShaders(HashMap<String, ShaderProgram> shaders) {
+        Array<String> shaderNames = new Array<>();
+        shaderNames.add("Default");
+        shaders.keySet().forEach(shaderNames::add);
+
+        shadersSelector.setItems(shaderNames);
+    }
+
     @Override
     public void onRemove() {
         Facade.getInstance().sendNotification(CLOSE_CLICKED);
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderPropertiesMediator.java
index cc1cc7d9..e4342abc 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderPropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderPropertiesMediator.java
@@ -51,7 +51,7 @@ public class UIShaderPropertiesMediator extends UIItemPropertiesMediator<UIShade
         super(NAME, new UIShaderProperties());
 
         resourceManager = facade.retrieveProxy(ResourceManager.NAME);
-        viewComponent.initView(resourceManager.getShaders());
+        viewComponent.initView();
 
         projectManager = facade.retrieveProxy(ProjectManager.NAME);
     }
@@ -97,6 +97,8 @@ public class UIShaderPropertiesMediator extends UIItemPropertiesMediator<UIShade
 
     @Override
     protected void translateObservableDataToView(int item) {
+        viewComponent.initShaders(resourceManager.getShaders());
+
         ShaderComponent shaderComponent = SandboxComponentRetriever.get(item, ShaderComponent.class);
         String currShaderName = shaderComponent.shaderName;
         viewComponent.setSelected(currShaderName);