Skip to content

Commit c52c55c

Browse files
peterkutzpeterkutz
authored
Merge branch 'dev_1.2' into peterkutz-thin-film-improvements
2 parents 1884520 + 87e3ecb commit c52c55c

87 files changed

Lines changed: 1067 additions & 154 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/open_pbr_aluminum_brushed.mtlx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0"?>
2-
<materialx version="1.38" colorspace="lin_rec709">
3-
<surfacematerial name="Aluminum_Brushed" type="material">
4-
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5-
</surfacematerial>
6-
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7-
<input name="base_color" type="color3" value="0.912, 0.914, 0.920" />
8-
<input name="base_metalness" type="float" value="1.0" />
9-
<input name="specular_color" type="color3" value="0.970, 0.979, 0.988" />
10-
<input name="specular_roughness" type="float" value="0.2" />
11-
<input name="specular_roughness_anisotropy" type="float" value="0.9" />
12-
</open_pbr_surface>
13-
</materialx>
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Aluminum_Brushed" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.918, 0.922, 0.923" />
8+
<input name="base_metalness" type="float" value="1.0" />
9+
<input name="specular_color" type="color3" value="0.921, 0.934, 0.955" />
10+
<input name="specular_roughness" type="float" value="0.2" />
11+
<input name="specular_roughness_anisotropy" type="float" value="0.9" />
12+
</open_pbr_surface>
13+
</materialx>

‎examples/open_pbr_beryllium.mtlx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Beryllium" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.537, 0.534, 0.534" />
8+
<input name="base_metalness" type="float" value="1.0" />
9+
<input name="specular_color" type="color3" value="0.734, 0.738, 0.752" />
10+
<input name="specular_roughness" type="float" value="0.02" />
11+
</open_pbr_surface>
12+
</materialx>

‎examples/open_pbr_blackboard.mtlx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Blackboard" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.039, 0.039, 0.039" />
8+
<input name="base_diffuse_roughness" type="float" value="1.0" />
9+
<input name="specular_roughness" type="float" value="1.0" />
10+
</open_pbr_surface>
11+
</materialx>

‎examples/open_pbr_blood.mtlx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Blood" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="specular_roughness" type="float" value="0.0" />
8+
<input name="specular_ior" type="float" value="1.35" />
9+
<input name="transmission_weight" type="float" value="1.0" />
10+
<input name="transmission_color" type="color3" value="0.396, 0.048, 0.018" />
11+
<input name="transmission_depth" type="float" value="0.08" />
12+
<input name="transmission_dispersion_scale" type="float" value="1.0" />
13+
<input name="transmission_dispersion_abbe_number" type="float" value="54" />
14+
</open_pbr_surface>
15+
</materialx>

‎examples/open_pbr_brass.mtlx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Brass" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.844, 0.782, 0.473" />
8+
<input name="base_metalness" type="float" value="1.0" />
9+
<input name="specular_color" type="color3" value="0.963, 0.977, 1.013" />
10+
<input name="specular_roughness" type="float" value="0.02" />
11+
</open_pbr_surface>
12+
</materialx>

‎examples/open_pbr_brick.mtlx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Brick" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.196, 0.106, 0.069" />
8+
<input name="base_diffuse_roughness" type="float" value="1.0" />
9+
<input name="specular_roughness" type="float" value="1.0" />
10+
</open_pbr_surface>
11+
</materialx>

‎examples/open_pbr_carpaint.mtlx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?xml version="1.0"?>
2-
<materialx version="1.38" colorspace="lin_rec709">
3-
<surfacematerial name="Car_Paint" type="material">
4-
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5-
</surfacematerial>
6-
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7-
<input name="base_color" type="color3" value="0.1, 0.6, 0.9" />
8-
<input name="specular_ior" type="float" value="1.6" />
9-
<input name="specular_roughness" type="float" value="0.3" />
10-
<input name="coat_weight" type="float" value="1" />
11-
<input name="coat_roughness" type="float" value="0.02" />
12-
<input name="coat_ior" type="float" value="1.6" />
13-
</open_pbr_surface>
14-
</materialx>
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Car_Paint" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.1, 0.6, 0.9" />
8+
<input name="specular_ior" type="float" value="1.6" />
9+
<input name="specular_roughness" type="float" value="0.3" />
10+
<input name="coat_weight" type="float" value="1" />
11+
<input name="coat_roughness" type="float" value="0.02" />
12+
<input name="coat_ior" type="float" value="1.6" />
13+
</open_pbr_surface>
14+
</materialx>

‎examples/open_pbr_cesium.mtlx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Cesium" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.633, 0.561, 0.299" />
8+
<input name="base_metalness" type="float" value="1.0" />
9+
<input name="specular_color" type="color3" value="1.128, 1.175, 1.394" />
10+
<input name="specular_roughness" type="float" value="0.02" />
11+
</open_pbr_surface>
12+
</materialx>

‎examples/open_pbr_charcoal.mtlx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Charcoal" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="base_color" type="color3" value="0.020, 0.020, 0.020" />
8+
<input name="base_diffuse_roughness" type="float" value="1.0" />
9+
<input name="specular_roughness" type="float" value="1.0" />
10+
</open_pbr_surface>
11+
</materialx>

‎examples/open_pbr_chocolate.mtlx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<materialx version="1.39" colorspace="acescg">
3+
<surfacematerial name="Chocolate" type="material">
4+
<input name="surfaceshader" type="surfaceshader" nodename="open_pbr_surface_surfaceshader" />
5+
</surfacematerial>
6+
<open_pbr_surface name="open_pbr_surface_surfaceshader" type="surfaceshader">
7+
<input name="specular_roughness" type="float" value="0.5" />
8+
<input name="subsurface_weight" type="float" value="1.0" />
9+
<input name="subsurface_color" type="color3" value="0.133, 0.096, 0.065" />
10+
<input name="subsurface_radius_scale" type="color3" value="0.1, 0.05, 0.025" />
11+
</open_pbr_surface>
12+
</materialx>

0 commit comments

Comments
 (0)
⚡