diff --git a/src/assets/minecraft/textures/block/acacia_planks.pbr.yml b/src/assets/minecraft/textures/block/acacia_planks.pbr.yml index 3ee40105..936b8108 100644 --- 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 index 5d7cc36b..cf29e63c 100644 --- 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 new file mode 100644 index 00000000..4bedac81 Binary files /dev/null and b/src/assets/minecraft/textures/block/coal_ore.png differ diff --git a/src/assets/minecraft/textures/block/coal_ore_smooth.png b/src/assets/minecraft/textures/block/coal_ore_smooth.png new file mode 100644 index 00000000..b8202671 Binary files /dev/null and b/src/assets/minecraft/textures/block/coal_ore_smooth.png differ diff --git a/src/assets/minecraft/textures/block/diamond_block.pbr.yml b/src/assets/minecraft/textures/block/diamond_block.pbr.yml index d6b88bf0..023992e4 100644 --- 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 new file mode 100644 index 00000000..5dc52c92 Binary files /dev/null and b/src/assets/minecraft/textures/block/diamond_ore/albedo.png differ diff --git a/src/assets/minecraft/textures/block/diamond_ore/metal.png b/src/assets/minecraft/textures/block/diamond_ore/metal.png new file mode 100644 index 00000000..6ddd2fc0 Binary files /dev/null and b/src/assets/minecraft/textures/block/diamond_ore/metal.png differ diff --git a/src/assets/minecraft/textures/block/diamond_ore/pbr.yml b/src/assets/minecraft/textures/block/diamond_ore/pbr.yml new file mode 100644 index 00000000..077c4750 --- /dev/null +++ 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 new file mode 100644 index 00000000..7f491250 Binary files /dev/null and b/src/assets/minecraft/textures/block/diamond_ore/smooth.png differ diff --git a/src/assets/minecraft/textures/block/emerald_ore/albedo.png b/src/assets/minecraft/textures/block/emerald_ore/albedo.png new file mode 100644 index 00000000..5f4df655 Binary files /dev/null and b/src/assets/minecraft/textures/block/emerald_ore/albedo.png differ diff --git a/src/assets/minecraft/textures/block/emerald_ore/metal.png b/src/assets/minecraft/textures/block/emerald_ore/metal.png new file mode 100644 index 00000000..85660447 Binary files /dev/null and b/src/assets/minecraft/textures/block/emerald_ore/metal.png differ diff --git a/src/assets/minecraft/textures/block/emerald_ore/pbr.yml b/src/assets/minecraft/textures/block/emerald_ore/pbr.yml new file mode 100644 index 00000000..077c4750 --- /dev/null +++ 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 new file mode 100644 index 00000000..051a6dfa Binary files /dev/null and b/src/assets/minecraft/textures/block/emerald_ore/smooth.png differ diff --git a/src/assets/minecraft/textures/block/iron_ore.pbr.yml b/src/assets/minecraft/textures/block/iron_ore.pbr.yml index 9390cf77..ccedebe0 100644 --- 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 new file mode 100644 index 00000000..4808a95c Binary files /dev/null and b/src/assets/minecraft/textures/block/iron_ore.png differ diff --git a/src/assets/minecraft/textures/block/iron_ore_smooth.png b/src/assets/minecraft/textures/block/iron_ore_smooth.png new file mode 100644 index 00000000..8339def5 Binary files /dev/null and b/src/assets/minecraft/textures/block/iron_ore_smooth.png differ diff --git a/src/assets/minecraft/textures/block/quartz_block_bottom.pbr.yml b/src/assets/minecraft/textures/block/quartz_block_bottom.pbr.yml index d266524e..24a4995f 100644 --- 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 index d266524e..24a4995f 100644 --- 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 index d266524e..24a4995f 100644 --- 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 index 9b4449de..be43f420 100644 --- 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 index aff04116..c399d992 100644 --- 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/src/assets/minecraft/textures/block/rail.pbr.yml b/src/assets/minecraft/textures/block/rail/rail.pbr.yml similarity index 100% rename from src/assets/minecraft/textures/block/rail.pbr.yml rename to src/assets/minecraft/textures/block/rail/rail.pbr.yml diff --git a/src/assets/minecraft/textures/block/rail.png b/src/assets/minecraft/textures/block/rail/rail.png similarity index 100% rename from src/assets/minecraft/textures/block/rail.png rename to src/assets/minecraft/textures/block/rail/rail.png diff --git a/src/assets/minecraft/textures/block/rail_a.png b/src/assets/minecraft/textures/block/rail/rail_a.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_a.png rename to src/assets/minecraft/textures/block/rail/rail_a.png diff --git a/src/assets/minecraft/textures/block/rail_metal.png b/src/assets/minecraft/textures/block/rail/rail_metal.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_metal.png rename to src/assets/minecraft/textures/block/rail/rail_metal.png diff --git a/src/assets/minecraft/textures/block/rail_p.png b/src/assets/minecraft/textures/block/rail/rail_p.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_p.png rename to src/assets/minecraft/textures/block/rail/rail_p.png diff --git a/src/assets/minecraft/textures/block/rail_smooth.png b/src/assets/minecraft/textures/block/rail/rail_smooth.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_smooth.png rename to src/assets/minecraft/textures/block/rail/rail_smooth.png diff --git a/src/assets/minecraft/textures/block/rail_corner.png b/src/assets/minecraft/textures/block/rail_corner/albedo.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner.png rename to src/assets/minecraft/textures/block/rail_corner/albedo.png diff --git a/src/assets/minecraft/textures/block/rail_corner_a.png b/src/assets/minecraft/textures/block/rail_corner/alpha.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner_a.png rename to src/assets/minecraft/textures/block/rail_corner/alpha.png diff --git a/src/assets/minecraft/textures/block/rail_corner_metal.png b/src/assets/minecraft/textures/block/rail_corner/metal.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner_metal.png rename to src/assets/minecraft/textures/block/rail_corner/metal.png diff --git a/src/assets/minecraft/textures/block/rail_corner.pbr.yml b/src/assets/minecraft/textures/block/rail_corner/pbr.yml similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner.pbr.yml rename to src/assets/minecraft/textures/block/rail_corner/pbr.yml diff --git a/src/assets/minecraft/textures/block/rail_corner_p.png b/src/assets/minecraft/textures/block/rail_corner/porosity.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner_p.png rename to src/assets/minecraft/textures/block/rail_corner/porosity.png diff --git a/src/assets/minecraft/textures/block/rail_corner_smooth.png b/src/assets/minecraft/textures/block/rail_corner/smooth.png similarity index 100% rename from src/assets/minecraft/textures/block/rail_corner_smooth.png rename to src/assets/minecraft/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 deleted file mode 100644 index 20f0e2dc..00000000 --- a/src/assets/minecraft/textures/block/redstone_ore.pbr.yml +++ /dev/null @@ -1,14 +0,0 @@ -alpha: - value: 255 -albedo: - value-red: 141 - value-green: 112 - value-blue: 112 -height: - value: 0 -normal: - noise: 3 -smooth: - value: 0.08 -porosity: - value: 0.31 diff --git a/src/assets/minecraft/textures/block/redstone_ore/albedo.png b/src/assets/minecraft/textures/block/redstone_ore/albedo.png new file mode 100644 index 00000000..3c09582f Binary files /dev/null and b/src/assets/minecraft/textures/block/redstone_ore/albedo.png differ diff --git a/src/assets/minecraft/textures/block/redstone_ore/emissive.png b/src/assets/minecraft/textures/block/redstone_ore/emissive.png new file mode 100644 index 00000000..89f3695c Binary files /dev/null and b/src/assets/minecraft/textures/block/redstone_ore/emissive.png differ diff --git a/src/assets/minecraft/textures/block/redstone_ore/pbr.yml b/src/assets/minecraft/textures/block/redstone_ore/pbr.yml new file mode 100644 index 00000000..ccedebe0 --- /dev/null +++ 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 new file mode 100644 index 00000000..eacf09ff Binary files /dev/null and b/src/assets/minecraft/textures/block/redstone_ore/smooth.png differ diff --git a/src/assets/minecraft/textures/entity/cow/cow.pbr.yml b/src/assets/minecraft/textures/entity/cow/cow.pbr.yml new file mode 100644 index 00000000..e69de29b diff --git a/src/assets/minecraft/textures/entity/cow/cow.png b/src/assets/minecraft/textures/entity/cow/cow.png new file mode 100644 index 00000000..ee48aa72 Binary files /dev/null and b/src/assets/minecraft/textures/entity/cow/cow.png differ diff --git a/src/assets/minecraft/textures/entity/cow/cow_a.png b/src/assets/minecraft/textures/entity/cow/cow_a.png new file mode 100644 index 00000000..bdf61618 Binary files /dev/null and b/src/assets/minecraft/textures/entity/cow/cow_a.png differ 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 new file mode 100644 index 00000000..65de1897 --- /dev/null +++ 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 new file mode 100644 index 00000000..60c87275 Binary files /dev/null and b/src/assets/minecraft/textures/models/armor/gold_layer_1_a.png differ 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 new file mode 100644 index 00000000..40ffa593 --- /dev/null +++ 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 new file mode 100644 index 00000000..c5b0ff67 Binary files /dev/null and b/src/assets/minecraft/textures/models/armor/gold_layer_2_a.png differ 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 new file mode 100644 index 00000000..83ef3317 --- /dev/null +++ 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 new file mode 100644 index 00000000..60c87275 Binary files /dev/null and b/src/assets/minecraft/textures/models/armor/iron_layer_1_a.png differ 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 new file mode 100644 index 00000000..92fc2e44 --- /dev/null +++ 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 new file mode 100644 index 00000000..37b73e4e Binary files /dev/null and b/src/assets/minecraft/textures/models/armor/iron_layer_2_a.png differ diff --git a/src/input.yml b/src/input.yml index b88f67c7..6e541ab9 100644 --- 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 index b766a904..8ed76297 100644 --- 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