#5532: Material Editor can deal with soundMap stages

codereader · Feb 26, 2021 · 70d7154 · 70d7154
1 parent 18f2d0a
commit 70d7154
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/install/ui/materialeditor.fbp b/install/ui/materialeditor.fbp
@@ -11706,7 +11706,7 @@
                                                                                         <property name="minimize_button">0</property>
                                                                                         <property name="minimum_size"></property>
                                                                                         <property name="moveable">1</property>
-                                                                                        <property name="name">m_checkBox38</property>
+                                                                                        <property name="name">MaterialStageSoundMapWaveform</property>
                                                                                         <property name="pane_border">1</property>
                                                                                         <property name="pane_position"></property>
                                                                                         <property name="pane_size"></property>

diff --git a/install/ui/materialeditor.xrc b/install/ui/materialeditor.xrc
@@ -2021,7 +2021,7 @@
 																			<option>0</option>
 																			<flag>wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP</flag>
 																			<border>3</border>
-																			<object class="wxCheckBox" name="m_checkBox38">
+																			<object class="wxCheckBox" name="MaterialStageSoundMapWaveform">
 																				<label>Waveform</label>
 																				<checked>0</checked>
 																			</object>

diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
@@ -760,6 +760,7 @@ void MaterialEditor::updateStageControls()
 
         auto videoMapFile = getControl<wxTextCtrl>("MaterialStageVideoMapFile");
         auto videoMapLoop = getControl<wxCheckBox>("MaterialStageVideoMapLoop");
+        auto soundMapWave = getControl<wxCheckBox>("MaterialStageSoundMapWaveform");
 
         auto mapType = getControl<wxChoice>("MaterialStageMapType");
 
@@ -780,6 +781,7 @@ void MaterialEditor::updateStageControls()
             imageMap->Enable();
             videoMapFile->SetValue("");
             videoMapLoop->SetValue(false);
+            soundMapWave->SetValue(false);
         }
 
         switch (selectedStage->getMapType())
@@ -801,6 +803,11 @@ void MaterialEditor::updateStageControls()
             }
             break;
         case ShaderLayer::MapType::SoundMap:
+            {
+                auto soundMapExpression = std::dynamic_pointer_cast<shaders::ISoundMapExpression>(selectedStage->getMapExpression());
+                soundMapWave->SetValue(soundMapExpression ? soundMapExpression->isWaveform() : false);
+            }
+            break;
         case ShaderLayer::MapType::RemoteRenderMap:
         case ShaderLayer::MapType::MirrorRenderMap:
             break;