Skip to content

Commit

Permalink
#5532: Load spectrum value to controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Feb 20, 2021
1 parent d959727 commit 5965bc5
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 27 deletions.
39 changes: 20 additions & 19 deletions install/ui/materialeditor.fbp
View file
Expand Up @@ -4331,11 +4331,11 @@
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">6</property>
<property name="flag">wxBOTTOM|wxTOP</property>
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand All @@ -4349,6 +4349,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
Expand All @@ -4364,15 +4365,14 @@
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">spectrum</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText4211</property>
<property name="name">MaterialHasSpectrum</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand All @@ -4386,17 +4386,20 @@
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">6</property>
<property name="flag">wxALIGN_CENTER_VERTICAL</property>
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="0">
<object class="wxSpinCtrl" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -4424,15 +4427,17 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="initial">1</property>
<property name="max">99999</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="min">-99999</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_textCtrl5112</property>
<property name="name">MaterialSpectrumValue</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand All @@ -4442,15 +4447,11 @@
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="style">wxSP_ARROW_KEYS</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
Expand Down
19 changes: 11 additions & 8 deletions install/ui/materialeditor.xrc
View file
Expand Up @@ -694,19 +694,22 @@
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxBOTTOM|wxTOP</flag>
<border>6</border>
<object class="wxStaticText" name="m_staticText4211">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxCheckBox" name="MaterialHasSpectrum">
<label>spectrum</label>
<wrap>-1</wrap>
<checked>0</checked>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL</flag>
<border>6</border>
<object class="wxTextCtrl" name="m_textCtrl5112">
<value></value>
<flag>wxALL</flag>
<border>0</border>
<object class="wxSpinCtrl" name="MaterialSpectrumValue">
<style>wxSP_ARROW_KEYS</style>
<value>1</value>
<min>-99999</min>
<max>99999</max>
</object>
</object>
</object>
Expand Down
7 changes: 7 additions & 0 deletions radiant/ui/materials/MaterialEditor.cpp
View file
Expand Up @@ -364,13 +364,20 @@ void MaterialEditor::updateMaterialPropertiesFromMaterial()

auto lightFalloffCubeMap = _material->getLightFalloffCubeMapExpression();
getControl<wxTextCtrl>("MaterialLightFalloffCubeMap")->SetValue(lightFalloffCubeMap ? lightFalloffCubeMap->getExpressionString() : "");

bool hasSpectrum = _material->getParseFlags() & Material::PF_HasSpectrum;
getControl<wxCheckBox>("MaterialHasSpectrum")->SetValue(hasSpectrum);
getControl<wxSpinCtrl>("MaterialSpectrumValue")->Enable(hasSpectrum);
getControl<wxSpinCtrl>("MaterialSpectrumValue")->SetValue(_material->getSpectrum());

// Surround the definition with curly braces, these are not included
auto definition = fmt::format("{0}\n{{{1}}}", _material->getName(), _material->getDefinition());
_sourceView->SetValue(definition);
}
else
{
getControl<wxCheckBox>("MaterialHasSpectrum")->SetValue(false);
getControl<wxSpinCtrl>("MaterialSpectrumValue")->SetValue(0);
getControl<wxTextCtrl>("MaterialLightFalloffMap")->SetValue("");
getControl<wxTextCtrl>("MaterialDescription")->SetValue("");
_sourceView->SetValue("");
Expand Down

0 comments on commit 5965bc5

Please sign in to comment.