Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Godlander Tooltip rendering | Halloween #44

Open
wants to merge 1 commit into
base: halloween
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions resources/assets/minecraft/shaders/core/position_color.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"blend": {
"func": "add",
"srcrgb": "srcalpha",
"dstrgb": "1-srcalpha"
},
"vertex": "render/gui",
"fragment": "render/gui",
"attributes": [
"Color"
],
"samplers": [
],
"uniforms": [
{ "name": "ModelViewMat", "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": "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": "Scale", "type": "float", "count": 1, "values": [ -1.0 ] },
{ "name": "GameTime", "type": "float", "count": 1, "values": [ 1.0 ] }
]
}
58 changes: 58 additions & 0 deletions resources/assets/minecraft/shaders/core/render/gui.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#version 150

#define hex(i) vec4((i&0xFF000000u)>>24,(i&0xFF0000u)>>16,(i&0xFF00u)>>8,(i&0xFFu))/255.

uniform float GameTime;

in vec4 vertexColor;
flat in int tooltip;
in vec3 Pos;
in vec3 Pos1;
in vec3 Pos2;
in vec3 Pos3;

out vec4 fragColor;

#moj_import <tooltip.glsl>

void main() {
vec4 color = vertexColor;
float time = GameTime * 1200;

vec2 p1 = Pos1.xy / Pos1.z;
vec2 p2 = Pos2.xy / Pos2.z;
vec2 p3 = Pos3.xy / Pos3.z;
vec2 pmax = max(max(p1,p2),p3);
vec2 pmin = min(min(p1,p2),p3);
vec2 size = vec2(pmax - pmin);

if (tooltip == 1) {
if (all(greaterThan(size, vec2(1e3)))) {discard; return;}
int i = 0;
ivec4 corner = ivec4(abs(vec4(pmin, pmax) - Pos.xyxy));
ivec2 side = ivec2(clamp(abs(pmin - Pos.xy) - (size/2.) + (sizes.xy/2), ivec2(0), sizes.xy-1));
ivec4 edge = ivec4(lessThan(corner, sizes.zzzz));
switch ((edge.x<<0)+(edge.y<<1)+(edge.z<<2)+(edge.w<<3)) {
case 1: //left, 0001
i = (corner.x) + (side.y) * sizes.z; color = hex(l[i]); break;
case 2: //top, 0010
i = (side.x) + (corner.y) * sizes.x; color = hex(t[i]); break;
case 4: //right, 0100
i = (sizes.z-corner.z-1) + (side.y) * sizes.z; color = hex(r[i]); break;
case 8: //bottom, 1000
i = (side.x) + (sizes.z-corner.w-1) * sizes.x; color = hex(b[i]); break;
case 3: //topleft, 0011
i = (corner.x) + (corner.y) * sizes.z; color = hex(tl[i]); break;
case 6: //topright, 0110
i = (sizes.z-corner.z-1) + (corner.y) * sizes.z; color = hex(tr[i]); break;
case 9: //botleft, 1001
i = (corner.x) + (sizes.z-corner.w-1) * sizes.z; color = hex(bl[i]); break;
case 12: //botright, 1100
i = (sizes.z-corner.z-1) + (sizes.z-corner.w-1) * sizes.z; color = hex(br[i]); break;
default:
color = hex(base);
}
}
if (color.a == 0) discard;
fragColor = color;
}
43 changes: 43 additions & 0 deletions resources/assets/minecraft/shaders/core/render/gui.vsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#version 150

in vec3 Position;
in vec4 Color;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform float Scale;

out vec4 vertexColor;
flat out int tooltip;
out vec3 Pos;
out vec3 Pos1;
out vec3 Pos2;
out vec3 Pos3;

#define hex(i) vec4((i&0xFF000000u)>>24,(i&0xFF0000u)>>16,(i&0xFF00u)>>8,(i&0xFFu))/255.
const vec2[] corners = vec2[](vec2(1, 1),vec2(1, -1),vec2(-1, -1),vec2(-1, 1));
bool isgui(mat4 ProjMat) {return ProjMat[2][3] == 0.0;}

#moj_import <tooltip.glsl>

void main() {
Pos = Position;
vertexColor = Color;
int corner = gl_VertexID % 4;

tooltip = 0;
if (isgui(ProjMat) && Position.z > 300 && Position.z < 500) {
tooltip = 1;
Pos.xy += pad * Scale * corners[corner];
if (gl_VertexID / 4 != 2) Pos = vec3(0);
}

Pos1 = Pos2 = Pos3 = vec3(0);
switch (corner) {
case 0: Pos1 = vec3(Pos.xy, 1); break;
case 1: Pos2 = vec3(Pos.xy, 1); break;
case 2: Pos3 = vec3(Pos.xy, 1); break;
}

gl_Position = ProjMat * ModelViewMat * vec4(Pos, 1.0);
}
101 changes: 0 additions & 101 deletions resources/assets/minecraft/shaders/core/rendertype_gui.fsh

This file was deleted.

7 changes: 4 additions & 3 deletions resources/assets/minecraft/shaders/core/rendertype_gui.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"srcrgb": "srcalpha",
"dstrgb": "1-srcalpha"
},
"vertex": "rendertype_gui",
"fragment": "rendertype_gui",
"vertex": "render/gui",
"fragment": "render/gui",
"attributes": [
"Color"
],
Expand All @@ -14,6 +14,7 @@
"uniforms": [
{ "name": "ModelViewMat", "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": "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": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
{ "name": "Scale", "type": "float", "count": 1, "values": [ 1.0 ] },
{ "name": "GameTime", "type": "float", "count": 1, "values": [ 1.0 ] }
]
}
53 changes: 0 additions & 53 deletions resources/assets/minecraft/shaders/core/rendertype_gui.vsh

This file was deleted.

12 changes: 12 additions & 0 deletions resources/assets/minecraft/shaders/include/tooltip.glsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//generated for tooltip shader by Godlander
vec2 pad = vec2(7,7);
ivec3 sizes = ivec3(9,9,8);
uint base = 0xd0d0d81u;
uint[] tl = uint[](0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0x0u,0x0u,0xf0f0fffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0x0u,0xf0f0fffu,0xfcb120ffu,0xff9b0bffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u);
uint[] tr = uint[](0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0x0u,0x0u,0x0u,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xf0f0fffu,0x0u,0x0u,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xff9b0bffu,0xfcb120ffu,0xf0f0fffu,0x0u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u);
uint[] bl = uint[](0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0x0u,0xf0f0fffu,0xba7109ffu,0xff9b0bffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0x0u,0x0u,0xf0f0fffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0x0u,0x0u,0xc0u,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0x0u,0x0u,0x0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u);
uint[] br = uint[](0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xff9b0bffu,0xba7109ffu,0xf0f0fffu,0xc0u,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xf0f0fffu,0xc0u,0x81u,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xc0u,0x81u,0x0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u,0x81u,0x0u,0x0u);
uint[] t = uint[](0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0x0u,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xd0d0db9u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u);
uint[] l = uint[](0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u,0x0u,0xf0f0fffu,0xff9b0bffu,0xba7109ffu,0xd0d0db9u,0xe0e0ea1u,0xd0d0d81u,0xd0d0d81u);
uint[] r = uint[](0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xfcb120ffu,0xff9b0bffu,0xf0f0fffu,0xc0u);
uint[] b = uint[](0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xd0d0d81u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xe0e0ea1u,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xfcb120ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xba7109ffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xf0f0fffu,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u,0xc0u);