From bd6f658c6c53d160c40bc3b5fdead7b7b3dd20c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Jul 2020 00:53:17 +1000 Subject: 1.8 --- .../assets/notenoughupdates/ah_item_holder.png | Bin 0 -> 642 bytes .../resources/assets/notenoughupdates/ah_item_tab.png | Bin 0 -> 627 bytes .../resources/assets/notenoughupdates/item_mask.png | Bin 856 -> 2800 bytes src/main/resources/assets/notenoughupdates/off.png | Bin 1302 -> 3331 bytes .../resources/assets/notenoughupdates/order_value.png | Bin 0 -> 1818 bytes .../assets/notenoughupdates/order_value_active.png | Bin 0 -> 1804 bytes .../assets/notenoughupdates/shaders/program/blit.vsh | 16 ++++++++++++++++ .../notenoughupdates/shaders/program/grayscale.fsh | 15 +++++++++++++++ .../notenoughupdates/shaders/program/grayscale.json | 17 +++++++++++++++++ .../assets/notenoughupdates/slider_button.png | Bin 0 -> 666 bytes .../resources/assets/notenoughupdates/slider_off.png | Bin 0 -> 765 bytes .../resources/assets/notenoughupdates/slider_on.png | Bin 0 -> 767 bytes 12 files changed, 48 insertions(+) create mode 100644 src/main/resources/assets/notenoughupdates/ah_item_holder.png create mode 100644 src/main/resources/assets/notenoughupdates/ah_item_tab.png create mode 100644 src/main/resources/assets/notenoughupdates/order_value.png create mode 100644 src/main/resources/assets/notenoughupdates/order_value_active.png create mode 100644 src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh create mode 100644 src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh create mode 100644 src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json create mode 100644 src/main/resources/assets/notenoughupdates/slider_button.png create mode 100644 src/main/resources/assets/notenoughupdates/slider_off.png create mode 100644 src/main/resources/assets/notenoughupdates/slider_on.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/notenoughupdates/ah_item_holder.png b/src/main/resources/assets/notenoughupdates/ah_item_holder.png new file mode 100644 index 00000000..ed396f25 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/ah_item_holder.png differ diff --git a/src/main/resources/assets/notenoughupdates/ah_item_tab.png b/src/main/resources/assets/notenoughupdates/ah_item_tab.png new file mode 100644 index 00000000..c307fa31 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/ah_item_tab.png differ diff --git a/src/main/resources/assets/notenoughupdates/item_mask.png b/src/main/resources/assets/notenoughupdates/item_mask.png index 7a202a33..3b402d7f 100644 Binary files a/src/main/resources/assets/notenoughupdates/item_mask.png and b/src/main/resources/assets/notenoughupdates/item_mask.png differ diff --git a/src/main/resources/assets/notenoughupdates/off.png b/src/main/resources/assets/notenoughupdates/off.png index 174d1b4f..cfb17e40 100644 Binary files a/src/main/resources/assets/notenoughupdates/off.png and b/src/main/resources/assets/notenoughupdates/off.png differ diff --git a/src/main/resources/assets/notenoughupdates/order_value.png b/src/main/resources/assets/notenoughupdates/order_value.png new file mode 100644 index 00000000..5526e8f6 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/order_value.png differ diff --git a/src/main/resources/assets/notenoughupdates/order_value_active.png b/src/main/resources/assets/notenoughupdates/order_value_active.png new file mode 100644 index 00000000..3864021c Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/order_value_active.png differ diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh b/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh new file mode 100644 index 00000000..01a16db5 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh @@ -0,0 +1,16 @@ +#version 120 + +attribute vec4 Position; + +uniform mat4 ProjMat; +uniform vec2 OutSize; + +varying vec2 texCoord; + +void main(){ + vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0); + gl_Position = vec4(outPos.xy, 0.2, 1.0); + + texCoord = Position.xy / OutSize; + texCoord.y = 1.0 - texCoord.y; +} diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh new file mode 100644 index 00000000..70875510 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh @@ -0,0 +1,15 @@ +#version 120 + +uniform sampler2D DiffuseSampler; + +varying vec2 texCoord; + +void main(){ + vec3 Gray = vec3(0.3, 0.59, 0.11); + vec4 diffuseColor = texture2D(DiffuseSampler, texCoord); + + float Luma = dot(diffuseColor.rgb, Gray); + diffuseColor.rgb = vec3(Luma, Luma, Luma); + + gl_FragColor = diffuseColor; +} diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json new file mode 100644 index 00000000..048ceb9f --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json @@ -0,0 +1,17 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "blit", + "fragment": "grayscale", + "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": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] } + ] +} diff --git a/src/main/resources/assets/notenoughupdates/slider_button.png b/src/main/resources/assets/notenoughupdates/slider_button.png new file mode 100644 index 00000000..aeb81b86 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/slider_button.png differ diff --git a/src/main/resources/assets/notenoughupdates/slider_off.png b/src/main/resources/assets/notenoughupdates/slider_off.png new file mode 100644 index 00000000..0f514c41 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/slider_off.png differ diff --git a/src/main/resources/assets/notenoughupdates/slider_on.png b/src/main/resources/assets/notenoughupdates/slider_on.png new file mode 100644 index 00000000..8d2d6680 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/slider_on.png differ -- cgit