Hide extra settings behind "Advanced" checkbox in materials & "Enable emitters" in lighting

Author: JustinTimeCuber

chunky/src/java/se/llbit/chunky/ui/render/tabs/LightingTab.java

@@ -25,6 +25,7 @@
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import se.llbit.chunky.renderer.EmitterMappingType;
 import se.llbit.chunky.renderer.EmitterSamplingStrategy;
@@ -53,6 +54,7 @@ public class LightingTab extends ScrollPane implements RenderControlsTab, Initia
   @FXML private DoubleAdjuster skyIntensity;
   @FXML private DoubleAdjuster apparentSkyBrightness;
   @FXML private DoubleAdjuster emitterIntensity;
+  @FXML private VBox emitterSettings;
   @FXML private ComboBox<EmitterMappingType> emitterMappingType;
   @FXML private DoubleAdjuster emitterMappingExponent;
   @FXML private DoubleAdjuster sunIntensity;
@@ -104,7 +106,21 @@ public LightingTab() throws IOException {
 
     enableEmitters.setTooltip(new Tooltip("Allow blocks to emit light based on their material settings."));
     enableEmitters.selectedProperty().addListener(
-      (observable, oldValue, newValue) -> scene.setEmittersEnabled(newValue));
+      (observable, oldValue, newValue) -> {
+        scene.setEmittersEnabled(newValue);
+        emitterSettings.setVisible(newValue);
+        emitterSettings.setManaged(newValue);
+      });
+    boolean showEmitterSettings = scene != null && scene.getEmittersEnabled();
+    emitterSettings.setVisible(showEmitterSettings);
+    emitterSettings.setManaged(showEmitterSettings);
+
+//    fancierTranslucency.selectedProperty()
+//      .addListener((observable, oldValue, newValue) -> {
+//        scene.setFancierTranslucency(newValue);
+//        transmissivityCap.setVisible(newValue);
+//        transmissivityCap.setManaged(newValue);
+//      });
 
     emitterIntensity.setName("Emitter intensity");
     emitterIntensity.setTooltip("Modifies the intensity of emitter light.");

chunky/src/java/se/llbit/chunky/ui/render/tabs/MaterialsTab.java

@@ -57,6 +57,8 @@ public class MaterialsTab extends HBox implements RenderControlsTab, Initializab
   private final DoubleAdjuster ior = new DoubleAdjuster();
   private final DoubleAdjuster perceptualSmoothness = new DoubleAdjuster();
   private final DoubleAdjuster metalness = new DoubleAdjuster();
+  private final CheckBox advanced = new CheckBox();
+  private final VBox advancedSettings = new VBox();
   private final ListView<String> listView;
 
   public MaterialsTab() {
@@ -80,6 +82,20 @@ public MaterialsTab() {
     metalness.setName("Metalness");
     metalness.setRange(0, 1);
     metalness.setTooltip("Metalness (texture-tinted reflectivity) of the selected material.");
+    advanced.setText("Advanced settings");
+    advanced.setTooltip(new Tooltip("Show advanced settings"));
+    advanced.selectedProperty().addListener((observable, oldValue, newValue) -> {
+        advancedSettings.setVisible(newValue);
+        advancedSettings.setManaged(newValue);
+      });
+    HBox emt = new HBox();
+    emt.setSpacing(10);
+    emt.setAlignment(Pos.CENTER_LEFT);
+    emt.getChildren().addAll(new Label("Emitter mapping type:"), emitterMappingType);
+    advancedSettings.setSpacing(10);
+    advancedSettings.getChildren().addAll(emitterMappingOffset, emt);
+    advancedSettings.setVisible(false);
+    advancedSettings.setManaged(false);
     ObservableList<String> blockIds = FXCollections.observableArrayList();
     blockIds.addAll(MaterialStore.collections.keySet());
     blockIds.addAll(ExtraMaterials.idMap.keySet());
@@ -91,16 +107,14 @@ public MaterialsTab() {
     listView.getSelectionModel().selectedItemProperty().addListener(
         (observable, oldValue, materialName) -> updateSelectedMaterial(materialName)
     );
-    HBox emt = new HBox();
-    emt.setSpacing(10);
-    emt.setAlignment(Pos.CENTER_LEFT);
-    emt.getChildren().addAll(new Label("Emitter mapping type:"), emitterMappingType);
     VBox settings = new VBox();
     settings.setSpacing(10);
     settings.getChildren().addAll(
         new Label("Material Properties"),
-        emittance, emitterMappingOffset, emt, specular, perceptualSmoothness, ior, metalness,
-        new Label("(set to zero to disable)"));
+        emittance, specular, perceptualSmoothness, ior, metalness,
+        new Label("(set to zero to disable)"),
+        advanced, advancedSettings
+      );
     setPadding(new Insets(10));
     setSpacing(15);
     TextField filterField = new TextField();
@@ -176,7 +190,9 @@ private void updateSelectedMaterial(String materialName) {
       materialExists = true;
     }
     if (materialExists) {
-      emittance.onValueChange(value -> scene.setEmittance(materialName, value.floatValue()));
+      emittance.onValueChange(value -> {
+        scene.setEmittance(materialName, value.floatValue());
+      });
       emitterMappingOffset.onValueChange(value -> scene.setEmitterMappingOffset(materialName, value.floatValue()));
       emtListener = (observable, oldValue, newValue) -> scene.setEmitterMappingTypeOverride(materialName, newValue);
       emitterMappingType.getSelectionModel().selectedItemProperty().addListener(emtListener);

chunky/src/res/se/llbit/chunky/ui/render/tabs/LightingTab.fxml

@@ -20,16 +20,18 @@
     <DoubleAdjuster fx:id="apparentSkyBrightness" maxWidth="1.7976931348623157E308" />
     <Separator />
     <CheckBox fx:id="enableEmitters" mnemonicParsing="false" text="Enable emitters" />
-    <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Emitter mapping type:" />
-      <ComboBox fx:id="emitterMappingType" />
-    </HBox>
-    <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-      <Label text="Emitter sampling strategy:" />
-      <ChoiceBox fx:id="emitterSamplingStrategy" />
-    </HBox>
+    <VBox fx:id="emitterSettings" spacing="10.0">
+      <DoubleAdjuster fx:id="emitterIntensity" maxWidth="1.7976931348623157E308" />
+      <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="Emitter mapping type:" />
+        <ComboBox fx:id="emitterMappingType" />
+      </HBox>
+      <DoubleAdjuster fx:id="emitterMappingExponent" maxWidth="1.7976931348623157E308" />
+      <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="Emitter sampling strategy:" />
+        <ChoiceBox fx:id="emitterSamplingStrategy" />
+      </HBox>
+    </VBox>
     <Separator />
     <CheckBox fx:id="drawSun" mnemonicParsing="false" text="Draw sun" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">