rename texture to pattern and implement initial pattern settings

This commit is contained in:
2019-02-17 23:41:17 +01:00
parent 49d9b17719
commit e4ee87e4c6
16 changed files with 379 additions and 232 deletions

View File

@@ -24,7 +24,7 @@
<!--layers panel template-->
<layout id="tpl-panel-layers">
<node width="220" margin="0 0 10 0" rtl="ltr">
<node width="250" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center" margin="0 0 0 0">
<text text="Layers" color="1 1 1 1"/>
</border>
@@ -121,7 +121,7 @@
<!--color panel-->
<layout id="tpl-panel-color">
<node width="220" margin="0 0 10 0" rtl="ltr">
<node width="250" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<text text="Colors" color="1 1 1 1"/>
</border>
@@ -134,7 +134,7 @@
<!--stroke panel-->
<layout id="tpl-panel-stroke">
<node width="220" margin="0 0 10 0" rtl="ltr">
<node width="250" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<text text="Stroke" color="1 1 1 1"/>
</border>
@@ -149,7 +149,7 @@
<!-- PRESET AND SHAPE -->
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--<node height="20" justify="center" margin="5 0 5 0"><text text="Shade"/></node>-->
<node height="40" justify="center" margin="5 0 0 0">
<text text="Preset"/>
@@ -199,7 +199,7 @@
<text text="Color"/>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="30" justify="center" margin="0 0 5 0">
<text text="Blend"/>
@@ -235,7 +235,7 @@
<text text="Metrics"/>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center" margin="0 0 20 0">
<text text="Size"/>
@@ -275,28 +275,82 @@
</node>
</node>
<!-- TEXTURE -->
<!-- PATTERN -->
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<checkbox id="tex-enabled" width="20" height="20"/>
<checkbox id="pattern-enabled" width="20" height="20"/>
<node align="center" width="1" grow="1">
<text text="Texture"/>
<text text="Pattern"/>
</node>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="40" justify="center">
<node height="40" justify="center" margin="0 0 5 0">
<text text="Pattern"/>
</node>
<node height="30" justify="center" margin="0 0 5 0">
<text text="Blend"/>
</node>
<node height="30" justify="center" margin="0 0 5 0">
<text text="Projection"/>
</node>
<node height="20" justify="center">
<text text="Apply"/>
</node>
<node height="20" justify="center">
<text text="Opacity"/>
</node>
<node height="20" justify="center">
<text text="Scale"/>
</node>
<node height="20" justify="center">
<text text="Brightness"/>
</node>
<node height="20" justify="center">
<text text="Contrast"/>
</node>
</node>
<node dir="col" align="center" grow="1" width="1">
<node dir="col" grow="1" width="1">
<!--controls-->
<node height="40" width="100%" dir="row">
<slider-h id="tip-stencil" width="1" grow="1" height="30" margin="5 5 5 0"/>
<button-custom id="texture-change" width="40" height="40" dir="row" pad="4">
<image id="texture-change-thumb" width="32" height="100%"/>
<node dir="row" margin="0 0 5 0">
<button-custom id="pattern-change" width="40" height="40" dir="row" pad="4">
<image id="pattern-change-thumb" width="32" height="100%"/>
</button-custom>
<node width="1" grow="1" height="40">
<node align="center" dir="row">
<checkbox id="pattern-invert" width="20" height="19"/>
<text text="invert value"/>
</node>
<node align="center" dir="row">
<checkbox id="pattern-flipx" width="20" height="19"/>
<text text="flipX"/>
<checkbox id="pattern-flipy" width="20" height="19" margin="0 0 0 5"/>
<text text="flipY"/>
</node>
</node>
</node>
<node height="30" width="100%" pad="1" dir="row" margin="0 0 5 0">
<combobox id="pattern-blend-mode" width="100%" height="28" combo-list="Normal,-,Multiply,Screen,-,Color Dodge,Overlay" default="0"/>
</node>
<node height="30" width="100%" pad="1" dir="row" margin="0 0 5 0">
<combobox id="pattern-proj-mode" width="100%" height="28" combo-list="Cube,Screen" default="0"/>
</node>
<node align="center" dir="row">
<checkbox id="pattern-eachsample" height="20" width="20"/>
<text text="each sample"/>
</node>
<node height="20" pad="1" width="100%">
<slider-h id="pattern-opacity" value="1"/>
</node>
<node height="20" pad="1" width="100%">
<slider-h id="pattern-scale" value=".25"/>
</node>
<node height="20" pad="1" width="100%">
<slider-h id="pattern-brightness" value=".5"/>
</node>
<node height="20" pad="1" width="100%">
<slider-h id="pattern-contrast" value=".5"/>
</node>
</node>
</node>
@@ -310,9 +364,9 @@
</node>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="40" justify="center" margin="5 0 0 0">
<node height="40" justify="center" margin="0 0 5 0">
<text text="Shape"/>
</node>
<node height="30" justify="center" margin="0 0 5 0">
@@ -397,7 +451,7 @@
<text text="Medium"/>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center">
<text text="Mixer"/>
@@ -429,7 +483,7 @@
<text text="Color Variations"/>
</border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<!--labels-->
<node height="20" justify="center">
<text text="Hue"/>
@@ -459,7 +513,7 @@
<border color=".2" height="20" justify="center" align="center" margin="5 0 5 0"><text text="Jitter Settings"/></border>
<node dir="row">
<node width="30%" dir="col">
<node width="36%" dir="col">
<node height="20" justify="center">
<text text="Flip"/>
</node>
@@ -522,14 +576,14 @@
<!--grids panel-->
<layout id="tpl-panel-grid">
<node width="220" margin="0 0 10 0" rtl="ltr">
<node width="250" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<text text="Grids" color="1 1 1 1"/>
</border>
<border color=".3" pad="5" dir="col" width="100%">
<node dir="row">
<node width="40%" dir="col">
<node width="36%" dir="col">
<node height="20" justify="center"><text text="Opacity"/></node>
<node height="20" justify="center"><text text="Value"/></node>
<node height="20" justify="center"><text text="Offset"/></node>
@@ -550,7 +604,7 @@
<image-texture id="grid-heightmap-preview" width="100%" grow="1" height="100" aspect-ratio="1"/>
</border>
<node dir="row">
<node width="40%" dir="col">
<node width="36%" dir="col">
<node height="30" justify="center"><text text="File"/></node>
<node height="30" justify="center" margin="5 0 0 0"><text text="Shading"/></node>
<node height="20" justify="center" margin="5 0 0 0"><text text="Wireframe"/></node>