fix quartz and ores

Null-MC · Jan 5, 2021 · 177fdf1 · 177fdf1
1 parent d4e3159
commit 177fdf1
Show file tree

Hide file tree

Showing 51 changed files with 130 additions and 45 deletions.
diff --git a/src/assets/minecraft/textures/block/acacia_planks.pbr.yml b/src/assets/minecraft/textures/block/acacia_planks.pbr.yml
@@ -10,7 +10,5 @@ occlusion:
   value: 0
 smooth:
   value: 0.47
-metal:
-  value: 0
 porosity:
   value: 0.2
diff --git a/src/assets/minecraft/textures/block/coal_ore.pbr.yml b/src/assets/minecraft/textures/block/coal_ore.pbr.yml
@@ -1,14 +1,10 @@
 alpha:
   value: 255
-albedo:
-  value-red: 124
-  value-green: 124
-  value-blue: 124
+albedo: {}
 height:
   value: 0
 normal:
   noise: 4
-smooth:
-  value: 0.08
+smooth: {}
 porosity:
   value: 0.47
diff --git a/src/assets/minecraft/textures/block/coal_ore.png b/src/assets/minecraft/textures/block/coal_ore.png
diff --git a/src/assets/minecraft/textures/block/coal_ore_smooth.png b/src/assets/minecraft/textures/block/coal_ore_smooth.png
diff --git a/src/assets/minecraft/textures/block/diamond_block.pbr.yml b/src/assets/minecraft/textures/block/diamond_block.pbr.yml
@@ -9,6 +9,7 @@ height:
 occlusion:
   value: 0
 smooth:
-  value: 0.67
+  value: 0.6
 metal:
   value: 255
+f0: {}
diff --git a/src/assets/minecraft/textures/block/diamond_ore/albedo.png b/src/assets/minecraft/textures/block/diamond_ore/albedo.png
diff --git a/src/assets/minecraft/textures/block/diamond_ore/metal.png b/src/assets/minecraft/textures/block/diamond_ore/metal.png
diff --git a/src/assets/minecraft/textures/block/diamond_ore/pbr.yml b/src/assets/minecraft/textures/block/diamond_ore/pbr.yml
@@ -0,0 +1,8 @@
+alpha:
+  value: 255
+height:
+  value: 0
+normal:
+  noise: 2
+porosity:
+  value: 0.2
diff --git a/src/assets/minecraft/textures/block/diamond_ore/smooth.png b/src/assets/minecraft/textures/block/diamond_ore/smooth.png
diff --git a/src/assets/minecraft/textures/block/emerald_ore/albedo.png b/src/assets/minecraft/textures/block/emerald_ore/albedo.png
diff --git a/src/assets/minecraft/textures/block/emerald_ore/metal.png b/src/assets/minecraft/textures/block/emerald_ore/metal.png
diff --git a/src/assets/minecraft/textures/block/emerald_ore/pbr.yml b/src/assets/minecraft/textures/block/emerald_ore/pbr.yml
@@ -0,0 +1,8 @@
+alpha:
+  value: 255
+height:
+  value: 0
+normal:
+  noise: 2
+porosity:
+  value: 0.2
diff --git a/src/assets/minecraft/textures/block/emerald_ore/smooth.png b/src/assets/minecraft/textures/block/emerald_ore/smooth.png
diff --git a/src/assets/minecraft/textures/block/iron_ore.pbr.yml b/src/assets/minecraft/textures/block/iron_ore.pbr.yml
@@ -1,14 +1,10 @@
 alpha:
   value: 255
-albedo:
-  value-red: 149
-  value-green: 136
-  value-blue: 129
+albedo: {}
 height:
   value: 0
 normal:
   noise: 3
-smooth:
-  value: 0.08
+smooth: {}
 porosity:
   value: 0.31
diff --git a/src/assets/minecraft/textures/block/iron_ore.png b/src/assets/minecraft/textures/block/iron_ore.png
diff --git a/src/assets/minecraft/textures/block/iron_ore_smooth.png b/src/assets/minecraft/textures/block/iron_ore_smooth.png
diff --git a/src/assets/minecraft/textures/block/quartz_block_bottom.pbr.yml b/src/assets/minecraft/textures/block/quartz_block_bottom.pbr.yml
@@ -8,9 +8,9 @@ height:
   value: 0
 occlusion:
   value: 0
-f0:
-  value: 60
 smooth:
   value: 0.98
+f0:
+  value: 0.05
 porosity:
   value: 0
diff --git a/src/assets/minecraft/textures/block/quartz_block_side.pbr.yml b/src/assets/minecraft/textures/block/quartz_block_side.pbr.yml
@@ -8,9 +8,9 @@ height:
   value: 0
 occlusion:
   value: 0
-f0:
-  value: 60
 smooth:
   value: 0.98
+f0:
+  value: 0.05
 porosity:
   value: 0
diff --git a/src/assets/minecraft/textures/block/quartz_block_top.pbr.yml b/src/assets/minecraft/textures/block/quartz_block_top.pbr.yml
@@ -8,9 +8,9 @@ height:
   value: 0
 occlusion:
   value: 0
-f0:
-  value: 60
 smooth:
   value: 0.98
+f0:
+  value: 0.05
 porosity:
   value: 0
diff --git a/src/assets/minecraft/textures/block/quartz_bricks.pbr.yml b/src/assets/minecraft/textures/block/quartz_bricks.pbr.yml
@@ -6,13 +6,13 @@ albedo:
   value-blue: 226
 height:
   value: 0
-occlusion:
-  value: 0
 normal:
   noise: 2
-f0:
-  value: 60
+occlusion:
+  value: 0
 smooth:
   value: 0.78
+f0:
+  value: 0.05
 porosity:
   value: 0
diff --git a/src/assets/minecraft/textures/block/quartz_pillar.pbr.yml b/src/assets/minecraft/textures/block/quartz_pillar.pbr.yml
@@ -6,14 +6,13 @@ albedo:
   value-blue: 226
 height:
   value: 0
-occlusion:
-  value: 0
 normal:
   noise: 2
   curve-x: 90
-f0:
-  value: 60
+occlusion:
+  value: 0
 smooth:
-  value: 0.78
+  value: 0.1
+f0: {}
 porosity:
-  value: 0
+  value: 80
diff --git a/...ets/minecraft/textures/block/rail.pbr.yml → ...inecraft/textures/block/rail/rail.pbr.yml b/...ets/minecraft/textures/block/rail.pbr.yml → ...inecraft/textures/block/rail/rail.pbr.yml
diff --git a/src/assets/minecraft/textures/block/rail.png → ...ts/minecraft/textures/block/rail/rail.png b/src/assets/minecraft/textures/block/rail.png → ...ts/minecraft/textures/block/rail/rail.png
diff --git a/...ssets/minecraft/textures/block/rail_a.png → .../minecraft/textures/block/rail/rail_a.png b/...ssets/minecraft/textures/block/rail_a.png → .../minecraft/textures/block/rail/rail_a.png
diff --git a/...s/minecraft/textures/block/rail_metal.png → ...ecraft/textures/block/rail/rail_metal.png b/...s/minecraft/textures/block/rail_metal.png → ...ecraft/textures/block/rail/rail_metal.png
diff --git a/...ssets/minecraft/textures/block/rail_p.png → .../minecraft/textures/block/rail/rail_p.png b/...ssets/minecraft/textures/block/rail_p.png → .../minecraft/textures/block/rail/rail_p.png
diff --git a/.../minecraft/textures/block/rail_smooth.png → ...craft/textures/block/rail/rail_smooth.png b/.../minecraft/textures/block/rail_smooth.png → ...craft/textures/block/rail/rail_smooth.png
diff --git a/.../minecraft/textures/block/rail_corner.png → ...aft/textures/block/rail_corner/albedo.png b/.../minecraft/textures/block/rail_corner.png → ...aft/textures/block/rail_corner/albedo.png
diff --git a/...inecraft/textures/block/rail_corner_a.png → ...raft/textures/block/rail_corner/alpha.png b/...inecraft/textures/block/rail_corner_a.png → ...raft/textures/block/rail_corner/alpha.png
diff --git a/...raft/textures/block/rail_corner_metal.png → ...raft/textures/block/rail_corner/metal.png b/...raft/textures/block/rail_corner_metal.png → ...raft/textures/block/rail_corner/metal.png
diff --git a/...ecraft/textures/block/rail_corner.pbr.yml → ...ecraft/textures/block/rail_corner/pbr.yml b/...ecraft/textures/block/rail_corner.pbr.yml → ...ecraft/textures/block/rail_corner/pbr.yml
diff --git a/...inecraft/textures/block/rail_corner_p.png → ...t/textures/block/rail_corner/porosity.png b/...inecraft/textures/block/rail_corner_p.png → ...t/textures/block/rail_corner/porosity.png
diff --git a/...aft/textures/block/rail_corner_smooth.png → ...aft/textures/block/rail_corner/smooth.png b/...aft/textures/block/rail_corner_smooth.png → ...aft/textures/block/rail_corner/smooth.png
diff --git a/src/assets/minecraft/textures/block/redstone_ore.pbr.yml b/src/assets/minecraft/textures/block/redstone_ore.pbr.yml
diff --git a/src/assets/minecraft/textures/block/redstone_ore/albedo.png b/src/assets/minecraft/textures/block/redstone_ore/albedo.png
diff --git a/src/assets/minecraft/textures/block/redstone_ore/emissive.png b/src/assets/minecraft/textures/block/redstone_ore/emissive.png
diff --git a/src/assets/minecraft/textures/block/redstone_ore/pbr.yml b/src/assets/minecraft/textures/block/redstone_ore/pbr.yml
@@ -0,0 +1,10 @@
+alpha:
+  value: 255
+albedo: {}
+height:
+  value: 0
+normal:
+  noise: 3
+smooth: {}
+porosity:
+  value: 0.31
diff --git a/src/assets/minecraft/textures/block/redstone_ore/smooth.png b/src/assets/minecraft/textures/block/redstone_ore/smooth.png
diff --git a/src/assets/minecraft/textures/entity/cow/cow.pbr.yml b/src/assets/minecraft/textures/entity/cow/cow.pbr.yml
diff --git a/src/assets/minecraft/textures/entity/cow/cow.png b/src/assets/minecraft/textures/entity/cow/cow.png
diff --git a/src/assets/minecraft/textures/entity/cow/cow_a.png b/src/assets/minecraft/textures/entity/cow/cow_a.png
diff --git a/src/assets/minecraft/textures/models/armor/gold_layer_1.pbr.yml b/src/assets/minecraft/textures/models/armor/gold_layer_1.pbr.yml
@@ -0,0 +1,16 @@
+wrap-x: false
+wrap-y: false
+albedo:
+  value-red: 223
+  value-green: 175
+  value-blue: 61
+height:
+  value: 0
+occlusion:
+  value: 0
+smooth:
+  value: 0.95
+metal:
+  value: 231
+porosity:
+  value: 0
diff --git a/src/assets/minecraft/textures/models/armor/gold_layer_1_a.png b/src/assets/minecraft/textures/models/armor/gold_layer_1_a.png
diff --git a/src/assets/minecraft/textures/models/armor/gold_layer_2.pbr.yml b/src/assets/minecraft/textures/models/armor/gold_layer_2.pbr.yml
@@ -0,0 +1,14 @@
+wrap-x: false
+wrap-y: false
+albedo:
+  value-red: 230
+  value-green: 179
+  value-blue: 51
+height:
+  value: 0
+smooth:
+  value: 0.9
+metal:
+  value: 231
+porosity:
+  value: 0
diff --git a/src/assets/minecraft/textures/models/armor/gold_layer_2_a.png b/src/assets/minecraft/textures/models/armor/gold_layer_2_a.png
diff --git a/src/assets/minecraft/textures/models/armor/iron_layer_1.pbr.yml b/src/assets/minecraft/textures/models/armor/iron_layer_1.pbr.yml
@@ -0,0 +1,16 @@
+wrap-x: false
+wrap-y: false
+albedo:
+  value-red: 194
+  value-green: 194
+  value-blue: 194
+height:
+  value: 0
+occlusion:
+  value: 0
+smooth:
+  value: 0.95
+metal:
+  value: 230
+porosity:
+  value: 0
diff --git a/src/assets/minecraft/textures/models/armor/iron_layer_1_a.png b/src/assets/minecraft/textures/models/armor/iron_layer_1_a.png
diff --git a/src/assets/minecraft/textures/models/armor/iron_layer_2.pbr.yml b/src/assets/minecraft/textures/models/armor/iron_layer_2.pbr.yml
@@ -0,0 +1,14 @@
+wrap-x: false
+wrap-y: false
+albedo:
+  value-red: 194
+  value-green: 194
+  value-blue: 194
+height:
+  value: 0
+smooth:
+  value: 0.9
+metal:
+  value: 230
+porosity:
+  value: 0
diff --git a/src/assets/minecraft/textures/models/armor/iron_layer_2_a.png b/src/assets/minecraft/textures/models/armor/iron_layer_2_a.png
diff --git a/src/input.yml b/src/input.yml
@@ -1,5 +1,27 @@
 format: raw
+alpha: {}
+diffuse-red: {}
+diffuse-green: {}
+diffuse-blue: {}
+albedo-red: {}
+albedo-green: {}
+albedo-blue: {}
 height:
   invert: true
 occlusion:
   invert: true
+normal-x: {}
+normal-y: {}
+normal-z: {}
+specular: {}
+smooth: {}
+rough: {}
+metal:
+  min-value: 230
+  range-min: 230
+f0:
+  max-value: 0.898
+  range-max: 229
+porosity: {}
+sss: {}
+emissive: {}
diff --git a/src/lab13-16x.pack.yml b/src/lab13-16x.pack.yml
@@ -6,3 +6,4 @@ texture-scale: 1
 texture-size: 16
 encoding:
   format: lab-1.3
+auto-generate-occlusion: false