From 50dc2122462642a0c3a00b3a3ae6389825dc04df Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:04:22 -0400 Subject: Re-license project as LGPL (#157) * add licence files & a few misc chores * add license notices & run auto formatter --- .../notenoughupdates/shaders/program/blur.json | 100 +++++++++++++++++---- .../shaders/program/dungeonmap.json | 61 +++++++++++-- .../shaders/program/grayscale.json | 42 ++++++++- .../shaders/program/setrgbtoalpha.json | 42 ++++++++- 4 files changed, 213 insertions(+), 32 deletions(-) (limited to 'src/main/resources/assets/notenoughupdates/shaders/program') diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/blur.json b/src/main/resources/assets/notenoughupdates/shaders/program/blur.json index 9da3c2e8..01c0578d 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/program/blur.json +++ b/src/main/resources/assets/notenoughupdates/shaders/program/blur.json @@ -1,21 +1,85 @@ { - "blend": { - "func": "add", - "srcrgb": "srcalpha", - "dstrgb": "1-srcalpha" + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "sobel", + "fragment": "blur2", + "attributes": [ + "Position" + ], + "samplers": [ + { + "name": "DiffuseSampler" + } + ], + "uniforms": [ + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] }, - "vertex": "sobel", - "fragment": "blur2", - "attributes": [ "Position" ], - "samplers": [ - { "name": "DiffuseSampler" } - ], - "uniforms": [ - { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "InSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, - { "name": "BlurDir", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, - { "name": "Radius", "type": "float", "count": 1, "values": [ 5.0 ] }, - { "name": "AlphaMult", "type": "float", "count": 1, "values": [ 1.0 ] } - ] + { + "name": "InSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + }, + { + "name": "OutSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + }, + { + "name": "BlurDir", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + }, + { + "name": "Radius", + "type": "float", + "count": 1, + "values": [ + 5.0 + ] + }, + { + "name": "AlphaMult", + "type": "float", + "count": 1, + "values": [ + 1.0 + ] + } + ] } diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/dungeonmap.json b/src/main/resources/assets/notenoughupdates/shaders/program/dungeonmap.json index bb41ffd5..a8a3fc79 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/program/dungeonmap.json +++ b/src/main/resources/assets/notenoughupdates/shaders/program/dungeonmap.json @@ -6,14 +6,63 @@ }, "vertex": "dungeonmap", "fragment": "dungeonmap", - "attributes": [ "Position" ], + "attributes": [ + "Position" + ], "samplers": [ - { "name": "DiffuseSampler" } + { + "name": "DiffuseSampler" + } ], "uniforms": [ - { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, - { "name": "InSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, - { "name": "radiusSq", "type": "float", "count": 1, "values": [ 1.0 ] } + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "OutSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + }, + { + "name": "InSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + }, + { + "name": "radiusSq", + "type": "float", + "count": 1, + "values": [ + 1.0 + ] + } ] } diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json index 048ceb9f..2878f3ed 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json +++ b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json @@ -6,12 +6,46 @@ }, "vertex": "blit", "fragment": "grayscale", - "attributes": [ "Position" ], + "attributes": [ + "Position" + ], "samplers": [ - { "name": "DiffuseSampler" } + { + "name": "DiffuseSampler" + } ], "uniforms": [ - { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] } + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "OutSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + } ] } diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/setrgbtoalpha.json b/src/main/resources/assets/notenoughupdates/shaders/program/setrgbtoalpha.json index 653764fb..3bd50d8b 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/program/setrgbtoalpha.json +++ b/src/main/resources/assets/notenoughupdates/shaders/program/setrgbtoalpha.json @@ -6,12 +6,46 @@ }, "vertex": "blit", "fragment": "setrgbtoalpha", - "attributes": [ "Position" ], + "attributes": [ + "Position" + ], "samplers": [ - { "name": "DiffuseSampler" } + { + "name": "DiffuseSampler" + } ], "uniforms": [ - { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] } + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "OutSize", + "type": "float", + "count": 2, + "values": [ + 1.0, + 1.0 + ] + } ] } -- cgit