Skip to content

Commit

Permalink
#5532: Blend types are loaded into the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Feb 23, 2021
1 parent fe82bee commit 7e45278
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 33 deletions.
30 changes: 16 additions & 14 deletions install/ui/materialeditor.fbp
View file
Expand Up @@ -9812,7 +9812,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choice3</property>
<property name="name">MaterialStageBlendType</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -9937,7 +9937,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choice4</property>
<property name="name">MaterialStageBlendTypeSrc</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -10062,7 +10062,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choice41</property>
<property name="name">MaterialStageBlendTypeDest</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down Expand Up @@ -10749,11 +10749,11 @@
<property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">0</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxSpinCtrlDouble" expanded="1">
<object class="wxSpinCtrlDouble" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -10883,11 +10883,11 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">6</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="flag">wxLEFT</property>
<property name="proportion">0</property>
<object class="wxSpinCtrl" expanded="0">
<object class="wxSpinCtrlDouble" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand All @@ -10905,6 +10905,7 @@
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="digits">1</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
Expand All @@ -10915,17 +10916,18 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="inc">0.1</property>
<property name="initial">0</property>
<property name="max">100</property>
<property name="max">9999</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min">-100</property>
<property name="min">-9999</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">MaterialEditorPolygonOffset2</property>
<property name="name">MaterialStagePrivatePolygonOffset</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand All @@ -10934,9 +10936,9 @@
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size">80,-1</property>
<property name="size"></property>
<property name="style">wxSP_ARROW_KEYS</property>
<property name="subclass"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="value"></property>
Expand Down Expand Up @@ -11071,7 +11073,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkBox53</property>
<property name="name">MaterialStageIgnoreAlphaTest</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
Expand Down
19 changes: 10 additions & 9 deletions install/ui/materialeditor.xrc
View file
Expand Up @@ -1672,7 +1672,7 @@
<option>1</option>
<flag>wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>6</border>
<object class="wxChoice" name="m_choice3">
<object class="wxChoice" name="MaterialStageBlendType">
<selection>0</selection>
<content />
</object>
Expand All @@ -1690,7 +1690,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxALL|wxLEFT</flag>
<border>6</border>
<object class="wxChoice" name="m_choice4">
<object class="wxChoice" name="MaterialStageBlendTypeSrc">
<selection>0</selection>
<content />
</object>
Expand All @@ -1708,7 +1708,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
<border>6</border>
<object class="wxChoice" name="m_choice41">
<object class="wxChoice" name="MaterialStageBlendTypeDest">
<selection>0</selection>
<content />
</object>
Expand Down Expand Up @@ -1853,14 +1853,15 @@
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
<flag>wxLEFT</flag>
<border>6</border>
<object class="wxSpinCtrl" name="MaterialEditorPolygonOffset2">
<object class="wxSpinCtrlDouble" name="MaterialStagePrivatePolygonOffset">
<style>wxSP_ARROW_KEYS</style>
<size>80,-1</size>
<value>0</value>
<min>-100</min>
<max>100</max>
<min>-9999</min>
<max>9999</max>
<inc>0.1</inc>
<digits>1</digits>
</object>
</object>
</object>
Expand Down Expand Up @@ -1894,7 +1895,7 @@
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP</flag>
<border>6</border>
<object class="wxCheckBox" name="m_checkBox53">
<object class="wxCheckBox" name="MaterialStageIgnoreAlphaTest">
<label>ignoreAlphaTest</label>
<checked>0</checked>
</object>
Expand Down
9 changes: 9 additions & 0 deletions libs/materials/ParseLib.h
View file
Expand Up @@ -92,4 +92,13 @@ inline std::string getStringForDeformType(Material::DeformType type)
return std::string();
}

constexpr std::pair<const char*, std::pair<const char*, const char*>> BlendTypeShortcuts[]
{
{ "blend", { "gl_src_alpha", "gl_one_minus_src_alpha" } },
{ "add", { "gl_one", "gl_one" } },
{ "filter", { "gl_dst_color", "gl_zero" } },
{ "modulate", { "gl_dst_color", "gl_zero" } },
{ "none", { "gl_zero", "gl_one" } },
};

}

0 comments on commit 7e45278

Please sign in to comment.