From 9731063f959ddf4a828d7de081493d2c60fc2315 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 15 Oct 2020 04:05:29 +0300 Subject: [PATCH] Canvas shaders --- .../betterend/materialmaps/block/chorus_bark.json | 3 --- .../betterend/materialmaps/block/chorus_grass.json | 3 +++ .../betterend/materialmaps/block/chorus_log.json | 14 -------------- .../materialmaps/block/pythadendron_leaves.json | 3 +++ .../materialmaps/block/pythadendron_sapling.json | 3 +++ .../assets/betterend/materials/leaves.json | 8 ++++++++ .../materials/waving_floor_glow_75_half.json | 10 ++++++++++ .../betterend/shaders/material/glow_75_half.frag | 6 ++++++ 8 files changed, 33 insertions(+), 17 deletions(-) delete mode 100644 src/main/resources/assets/betterend/materialmaps/block/chorus_bark.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/chorus_grass.json delete mode 100644 src/main/resources/assets/betterend/materialmaps/block/chorus_log.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/pythadendron_leaves.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/pythadendron_sapling.json create mode 100644 src/main/resources/assets/betterend/materials/leaves.json create mode 100644 src/main/resources/assets/betterend/materials/waving_floor_glow_75_half.json create mode 100644 src/main/resources/assets/betterend/shaders/material/glow_75_half.frag diff --git a/src/main/resources/assets/betterend/materialmaps/block/chorus_bark.json b/src/main/resources/assets/betterend/materialmaps/block/chorus_bark.json deleted file mode 100644 index 225e95be..00000000 --- a/src/main/resources/assets/betterend/materialmaps/block/chorus_bark.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "defaultMaterial": "betterend:glow_20_half" -} diff --git a/src/main/resources/assets/betterend/materialmaps/block/chorus_grass.json b/src/main/resources/assets/betterend/materialmaps/block/chorus_grass.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/chorus_grass.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/chorus_log.json b/src/main/resources/assets/betterend/materialmaps/block/chorus_log.json deleted file mode 100644 index 45ff06f2..00000000 --- a/src/main/resources/assets/betterend/materialmaps/block/chorus_log.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/chorus_log_side_glow_1", - "material": "betterend:glow_all_half" - }, - { - "sprite": "betterend:block/chorus_log_side_glow_2", - "material": "betterend:glow_all_half" - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/pythadendron_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/pythadendron_leaves.json new file mode 100644 index 00000000..e4224176 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/pythadendron_leaves.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:leaves" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/pythadendron_sapling.json b/src/main/resources/assets/betterend/materialmaps/block/pythadendron_sapling.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/pythadendron_sapling.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materials/leaves.json b/src/main/resources/assets/betterend/materials/leaves.json new file mode 100644 index 00000000..f40652bd --- /dev/null +++ b/src/main/resources/assets/betterend/materials/leaves.json @@ -0,0 +1,8 @@ +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "canvas:shaders/material/default.frag" + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_floor_glow_75_half.json b/src/main/resources/assets/betterend/materials/waving_floor_glow_75_half.json new file mode 100644 index 00000000..65374fc2 --- /dev/null +++ b/src/main/resources/assets/betterend/materials/waving_floor_glow_75_half.json @@ -0,0 +1,10 @@ +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_floor.vert", + "fragmentSource": "betterend:shaders/material/glow_75_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_75_half.frag b/src/main/resources/assets/betterend/shaders/material/glow_75_half.frag new file mode 100644 index 00000000..d7b53591 --- /dev/null +++ b/src/main/resources/assets/betterend/shaders/material/glow_75_half.frag @@ -0,0 +1,6 @@ +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.75 ? 0.5 : 0; +}