fix single block shader
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit

This commit is contained in:
austin 2025-06-08 23:39:06 -04:00
parent 385e01821e
commit 0bb66aa0b4
2 changed files with 7 additions and 8 deletions

View File

@ -1,5 +1,7 @@
//Vertex Shader //Vertex Shader
#version 330 core #version 450 core
#extension GL_ARB_shading_language_include : require
#include "../../lib/standarduniform.fs"
//defines //defines
#define TEXTURE_MAP_SCALE 1.0 #define TEXTURE_MAP_SCALE 1.0
@ -13,11 +15,7 @@ layout (location = 4) in vec2 aTex;
//coordinate space transformation matrices //coordinate space transformation matrices
uniform mat4 transform;
uniform mat4 model; uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
uniform mat4 lightSpaceMatrix;
@ -39,15 +37,15 @@ void main() {
//push frag, normal, and texture positions to fragment shader //push frag, normal, and texture positions to fragment shader
FragPos = vec3(model * FinalVertex); FragPos = vec3(model * FinalVertex);
ViewFragPos = vec3(view * model * FinalVertex); ViewFragPos = vec3(standardUniforms.view * model * FinalVertex);
Normal = mat3(transpose(inverse(model))) * aNormal; Normal = mat3(transpose(inverse(model))) * aNormal;
uv = aTex; uv = aTex;
//shadow map stuff //shadow map stuff
FragPosLightSpace = lightSpaceMatrix * vec4(FragPos, 1.0); FragPosLightSpace = standardUniforms.lightSpaceMatrix * vec4(FragPos, 1.0);
//set final position with opengl space //set final position with opengl space
gl_Position = projection * view * model * FinalVertex; gl_Position = standardUniforms.projection * standardUniforms.view * model * FinalVertex;
} }

View File

@ -2141,6 +2141,7 @@ Prevent mouse event re-allocation every frame
More allocation work More allocation work
Frametime reporting work Frametime reporting work
Raycast allocation fix Raycast allocation fix
Fix single block shader