Fix character array binding

This commit is contained in:
2023-03-23 14:59:20 +00:00
parent 05d1d3d1eb
commit b352d17f72
8 changed files with 15 additions and 126 deletions
-26
View File
@@ -1,26 +0,0 @@
#version 450 core
layout (location=0) out vec4 fCol;
layout (location=1) out vec4 fPos;
layout (location=2) out vec4 fNorm;
in vec2 tPos;
in vec3 gTexCoords;
in vec4 gPos;
in vec4 gNorm;
in vec4 gColor;
in float gRot;
layout (binding=40) uniform sampler2DArray diffuseSampler;
layout (binding=41) uniform sampler2DArray normalSampler;
vec2 rotateV2 (float a, vec2 v)
{
return vec2(v.x*cos(a) - v.y*sin(a), v.x*sin(a) + v.y*cos(a));
}
void main()
{
//fCol = gColor * texture(tex,tPos);
fCol = texture(diffuseSampler,gTexCoords);
fPos = gPos;
vec4 basenorm = texture(normalSampler,gTexCoords) - 0.5;
//fNorm = fPos - vec4(rotateV2(gRot,basenorm.xz), basenorm.y,0);
vec2 n = rotateV2(gRot,vec2(-basenorm.x,-basenorm.z));
fNorm = vec4(fPos.xyz - vec3(n,basenorm.y),0);
}
-50
View File
@@ -1,50 +0,0 @@
#version 450 core
layout (points) in;
layout (triangle_strip, max_vertices = 4) out;
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
in vec4 vColor [];
out vec4 gColor;
out vec2 tPos;
out vec4 gPos;
out vec4 gNorm;
out vec3 gTexCoords;
out float gRot;
// consider using isLHS to check if the wall is facing the center
float isLHS (vec2 startV, vec2 testV)
{ return sign( -startV.x * testV.y + startV.y * testV.x); }
void main()
{ gColor = vColor[0];
vec2 p1xy = gl_in[0].gl_Position.xy;
vec2 p2xy = gl_in[0].gl_Position.zw;
vec4 p1 = vec4 (gl_in[0].gl_Position.xy,0,1);
vec4 p2 = vec4 (gl_in[0].gl_Position.zw,0,1);
vec4 p3 = vec4 (p1.xy,100,1);
vec4 p4 = vec4 (p2.xy,100,1);
vec2 d = vec2(p1.xy - p2.xy);
float rot = atan(d.y,d.x);
float dist = distance(p1xy,p2xy);
float tcoordx = dist / 50;
float tcoordz = 11;
vec4 norm = vec4( d.y, -d.x, 0, 0);
gPos = p1; tPos = vec2 ( 1,-1) ; gl_Position = vec4(theMat * p1);
gNorm = gPos - norm;
gTexCoords = vec3 (0,0,tcoordz);
gRot = rot;
EmitVertex();
gPos = p3; tPos = vec2 ( 1, 1) ; gl_Position = vec4(theMat * p3);
gNorm = gPos - norm;
gTexCoords = vec3 (0,2,tcoordz);
gRot = rot;
EmitVertex();
gPos = p2; tPos = vec2 (-1,-1) ; gl_Position = vec4(theMat * p2);
gNorm = gPos - norm;
gTexCoords = vec3 (tcoordx,0,tcoordz);
gRot = rot;
EmitVertex();
gPos = p4; tPos = vec2 (-1, 1) ; gl_Position = vec4(theMat * p4);
gNorm = gPos - norm;
gTexCoords = vec3 (tcoordx,2,tcoordz);
gRot = rot;
EmitVertex();
EndPrimitive();
}
-9
View File
@@ -1,9 +0,0 @@
#version 450 core
layout (location = 0) in vec4 poss;
layout (location = 1) in vec4 color;
out vec4 vColor;
void main()
{
gl_Position = poss;
vColor = color;
}