From 54b96b2bac0b4f0b31e5ddac79ca7e9f67c6985e Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 14 May 2021 21:25:45 -0400 Subject: graphics: pbr: Add placeholder inputs/outputs to shaders. --- data/shaders/pbr-frag.glsl | 2 ++ data/shaders/pbr-vert.glsl | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/shaders/pbr-frag.glsl b/data/shaders/pbr-frag.glsl index e2841fe..5998474 100644 --- a/data/shaders/pbr-frag.glsl +++ b/data/shaders/pbr-frag.glsl @@ -32,12 +32,14 @@ struct Light { #ifdef GLSL120 attribute vec3 fragWorldPos; attribute vec3 fragNormal; +attribute vec3 fragTangent; attribute vec2 fragTexcoord0; attribute vec2 fragTexcoord1; attribute vec4 fragColor0; #else in vec3 fragWorldPos; in vec3 fragNormal; +in vec3 fragTangent; in vec2 fragTexcoord0; in vec2 fragTexcoord1; in vec4 fragColor0; diff --git a/data/shaders/pbr-vert.glsl b/data/shaders/pbr-vert.glsl index bf43e81..adbcdc5 100644 --- a/data/shaders/pbr-vert.glsl +++ b/data/shaders/pbr-vert.glsl @@ -3,31 +3,41 @@ #ifdef GLSL330 layout (location = 0) in vec3 position; layout (location = 1) in vec3 normal; -layout (location = 2) in vec2 texcoord0; -layout (location = 3) in vec2 texcoord1; -layout (location = 4) in vec4 color0; +layout (location = 2) in vec3 tangent; +layout (location = 3) in vec2 texcoord0; +layout (location = 4) in vec2 texcoord1; +layout (location = 5) in vec4 color0; +layout (location = 6) in vec4 joint; +layout (location = 7) in vec4 weight; #elif defined(GLSL130) in vec3 position; in vec3 normal; +in vec3 tangent; in vec2 texcoord0; in vec2 texcoord1; in vec4 color0; +in vec4 joint; #elif defined(GLSL120) attribute vec3 position; +attribute vec3 normal; +attribute vec3 tangent; attribute vec2 texcoord0; attribute vec2 texcoord1; attribute vec4 color0; +attribute vec4 weight; #endif #ifdef GLSL120 varying vec3 fragWorldPos; varying vec3 fragNormal; +varying vec3 fragTangent; varying vec2 fragTexcoord0; varying vec2 fragTexcoord1; varying vec4 fragColor0; #else out vec3 fragWorldPos; out vec3 fragNormal; +out vec3 fragTangent; out vec2 fragTexcoord0; out vec2 fragTexcoord1; out vec4 fragColor0; @@ -40,6 +50,7 @@ uniform mat4 projection; void main(void) { fragWorldPos = vec3(model * vec4(position, 1.0)); fragNormal = mat3(model) * normal; + fragTangent = mat3(model) * tangent; fragTexcoord0 = texcoord0; fragTexcoord1 = texcoord1; fragColor0 = color0; -- cgit v1.2.3