Skip to content

Commit

Permalink
#5532: Load values for the various macro into the controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Feb 20, 2021
1 parent 01d46ac commit 4792927
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 12 deletions.
12 changes: 6 additions & 6 deletions install/ui/materialeditor.fbp
View file
Expand Up @@ -5017,7 +5017,7 @@
<object class="notebookpage" expanded="1">
<property name="bitmap"></property>
<property name="label">Decals</property>
<property name="select">1</property>
<property name="select">0</property>
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
Expand Down Expand Up @@ -5204,7 +5204,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkBox20111</property>
<property name="name">MaterialHasDecalMacro</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -5332,7 +5332,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkBox201111</property>
<property name="name">MaterialHasTwoSidedDecalMacro</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -7828,7 +7828,7 @@
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">Misc</property>
<property name="select">0</property>
<property name="select">1</property>
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
Expand Down Expand Up @@ -8326,7 +8326,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkBox61111111</property>
<property name="name">MaterialHasParticleMacro</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -8390,7 +8390,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkBox611111111</property>
<property name="name">MaterialHasGlassMacro</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down
12 changes: 6 additions & 6 deletions install/ui/materialeditor.xrc
View file
Expand Up @@ -821,7 +821,7 @@
</object>
<object class="notebookpage">
<label>Decals</label>
<selected>1</selected>
<selected>0</selected>
<object class="wxPanel" name="DecalPage">
<style>wxTAB_TRAVERSAL</style>
<object class="wxBoxSizer">
Expand Down Expand Up @@ -856,7 +856,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<object class="wxCheckBox" name="m_checkBox20111">
<object class="wxCheckBox" name="MaterialHasDecalMacro">
<label>DECAL__MACRO</label>
<checked>0</checked>
</object>
Expand All @@ -874,7 +874,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxCheckBox" name="m_checkBox201111">
<object class="wxCheckBox" name="MaterialHasTwoSidedDecalMacro">
<label>TWOSIDED__DECAL__MACRO</label>
<checked>0</checked>
</object>
Expand Down Expand Up @@ -1307,7 +1307,7 @@
</object>
<object class="notebookpage">
<label>Misc</label>
<selected>0</selected>
<selected>1</selected>
<object class="wxPanel" name="MiscPage">
<style>wxTAB_TRAVERSAL</style>
<object class="wxBoxSizer">
Expand Down Expand Up @@ -1379,7 +1379,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP</flag>
<border>3</border>
<object class="wxCheckBox" name="m_checkBox61111111">
<object class="wxCheckBox" name="MaterialHasParticleMacro">
<label>PARTICLE__MACRO</label>
<checked>0</checked>
</object>
Expand All @@ -1388,7 +1388,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxCheckBox" name="m_checkBox611111111">
<object class="wxCheckBox" name="MaterialHasGlassMacro">
<label>GLASS__MACRO</label>
<checked>0</checked>
</object>
Expand Down
16 changes: 16 additions & 0 deletions radiant/ui/materials/MaterialEditor.cpp
View file
Expand Up @@ -241,6 +241,22 @@ void MaterialEditor::setupMaterialShaderFlags()
{
return material->getClampType() == CLAMP_ALPHAZEROCLAMP;
}));

// DECAL_MACRO
_bindings.emplace(std::make_shared<CheckBoxBinding>(getControl<wxCheckBox>("MaterialHasDecalMacro"),
[](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasDecalMacro; }));

// TWOSIDED_DECAL_MACRO
_bindings.emplace(std::make_shared<CheckBoxBinding>(getControl<wxCheckBox>("MaterialHasTwoSidedDecalMacro"),
[](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasTwoSidedDecalMacro; }));

// GLASS_MACRO
_bindings.emplace(std::make_shared<CheckBoxBinding>(getControl<wxCheckBox>("MaterialHasGlassMacro"),
[](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasGlassMacro; }));

// PARTICLE_MACRO
_bindings.emplace(std::make_shared<CheckBoxBinding>(getControl<wxCheckBox>("MaterialHasParticleMacro"),
[](const MaterialPtr& material) { return material->getParseFlags() & Material::PF_HasParticleMacro; }));
}

void MaterialEditor::setupMaterialSurfaceFlags()
Expand Down

0 comments on commit 4792927

Please sign in to comment.