Cleanup
This commit is contained in:
@@ -2,10 +2,8 @@
|
|||||||
layout (location=0) out vec4 fCol;
|
layout (location=0) out vec4 fCol;
|
||||||
layout (location=1) out vec4 fPos;
|
layout (location=1) out vec4 fPos;
|
||||||
layout (location=2) out vec4 fNorm;
|
layout (location=2) out vec4 fNorm;
|
||||||
in vec2 tPos;
|
|
||||||
in vec3 gTexCoords;
|
in vec3 gTexCoords;
|
||||||
in vec4 gPos;
|
in vec4 gPos;
|
||||||
in vec4 gColor;
|
|
||||||
in float gAng;
|
in float gAng;
|
||||||
layout (binding=40) uniform sampler2DArray diffuseSampler;
|
layout (binding=40) uniform sampler2DArray diffuseSampler;
|
||||||
layout (binding=41) uniform sampler2DArray normalSampler;
|
layout (binding=41) uniform sampler2DArray normalSampler;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ layout (triangle_strip, max_vertices = 4) out;
|
|||||||
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
|
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
|
||||||
in vec2 vTexAng[];
|
in vec2 vTexAng[];
|
||||||
out float gAng;
|
out float gAng;
|
||||||
out vec2 tPos;
|
|
||||||
out vec4 gPos;
|
out vec4 gPos;
|
||||||
out vec3 gTexCoords;
|
out vec3 gTexCoords;
|
||||||
// consider using isLHS to check if the wall is facing the center
|
// consider using isLHS to check if the wall is facing the center
|
||||||
@@ -23,16 +22,20 @@ void main()
|
|||||||
float dist = distance(p1xy,p2xy);
|
float dist = distance(p1xy,p2xy);
|
||||||
float tcoordx = dist / 50;
|
float tcoordx = dist / 50;
|
||||||
vec4 norm = vec4( d.y, -d.x, 0, 0);
|
vec4 norm = vec4( d.y, -d.x, 0, 0);
|
||||||
gPos = p1; tPos = vec2 ( 1,-1) ; gl_Position = vec4(theMat * p1);
|
gPos = p1;
|
||||||
|
gl_Position = vec4(theMat * p1);
|
||||||
gTexCoords = vec3 (0,0,tcoordz);
|
gTexCoords = vec3 (0,0,tcoordz);
|
||||||
EmitVertex();
|
EmitVertex();
|
||||||
gPos = p3; tPos = vec2 ( 1, 1) ; gl_Position = vec4(theMat * p3);
|
gPos = p3;
|
||||||
|
gl_Position = vec4(theMat * p3);
|
||||||
gTexCoords = vec3 (0,2,tcoordz);
|
gTexCoords = vec3 (0,2,tcoordz);
|
||||||
EmitVertex();
|
EmitVertex();
|
||||||
gPos = p2; tPos = vec2 (-1,-1) ; gl_Position = vec4(theMat * p2);
|
gPos = p2;
|
||||||
|
gl_Position = vec4(theMat * p2);
|
||||||
gTexCoords = vec3 (tcoordx,0,tcoordz);
|
gTexCoords = vec3 (tcoordx,0,tcoordz);
|
||||||
EmitVertex();
|
EmitVertex();
|
||||||
gPos = p4; tPos = vec2 (-1, 1) ; gl_Position = vec4(theMat * p4);
|
gPos = p4;
|
||||||
|
gl_Position = vec4(theMat * p4);
|
||||||
gTexCoords = vec3 (tcoordx,2,tcoordz);
|
gTexCoords = vec3 (tcoordx,2,tcoordz);
|
||||||
EmitVertex();
|
EmitVertex();
|
||||||
EndPrimitive();
|
EndPrimitive();
|
||||||
|
|||||||
Reference in New Issue
Block a user