UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WARNING: REVIEWED: Default shader uniform names

Browse source 
When a shader is loaded, by default, several locations are tried to be set automatically.
This commit is contained in:
Ray 2021-06-25 13:35:43 +02:00
parent d4c03b47ec
commit e0720a0a55
7 changed files with 76 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/models/resources/shaders/glsl100/cubemap.vs
View file

@ -4,8 +4,8 @@
attribute vec3 vertexPosition; attribute vec3 vertexPosition;
// Input uniform values // Input uniform values
uniform mat4 projection; uniform mat4 matProjection;
uniform mat4 view; uniform mat4 matView;
// Output vertex attributes (to fragment shader) // Output vertex attributes (to fragment shader)
varying vec3 fragPosition; varying vec3 fragPosition;
@ -16,5 +16,5 @@ void main()
fragPosition = vertexPosition; fragPosition = vertexPosition;
// Calculate final vertex position // Calculate final vertex position
gl_Position = projection*view*vec4(vertexPosition, 1.0); gl_Position = matProjection*matView*vec4(vertexPosition, 1.0);
} }

10
examples/models/resources/shaders/glsl100/skybox.vs
View file

@ -4,8 +4,8 @@
attribute vec3 vertexPosition; attribute vec3 vertexPosition;
// Input uniform values // Input uniform values
uniform mat4 projection; uniform mat4 matProjection;
uniform mat4 view; uniform mat4 matView;
// Output vertex attributes (to fragment shader) // Output vertex attributes (to fragment shader)
varying vec3 fragPosition; varying vec3 fragPosition;
@ -16,9 +16,9 @@ void main()
fragPosition = vertexPosition; fragPosition = vertexPosition;
// Remove translation from the view matrix // Remove translation from the view matrix
mat4 rotView = mat4(mat3(view)); mat4 rotView = mat4(mat3(matView));
vec4 clipPos = projection*rotView*vec4(vertexPosition, 1.0); vec4 clipPos = matProjection*rotView*vec4(vertexPosition, 1.0);
// Calculate final vertex position // Calculate final vertex position
gl_Position = clipPos.xyzw; gl_Position = clipPos;
} }

6
examples/models/resources/shaders/glsl330/cubemap.vs
View file

@ -4,8 +4,8 @@
in vec3 vertexPosition; in vec3 vertexPosition;
// Input uniform values // Input uniform values
uniform mat4 projection; uniform mat4 matProjection;
uniform mat4 view; uniform mat4 matView;
// Output vertex attributes (to fragment shader) // Output vertex attributes (to fragment shader)
out vec3 fragPosition; out vec3 fragPosition;
@ -16,5 +16,5 @@ void main()
fragPosition = vertexPosition; fragPosition = vertexPosition;
// Calculate final vertex position // Calculate final vertex position
gl_Position = projection*view*vec4(vertexPosition, 1.0); gl_Position = matProjection*matView*vec4(vertexPosition, 1.0);
} }

10
examples/models/resources/shaders/glsl330/skybox.vs
View file

@ -4,8 +4,8 @@
in vec3 vertexPosition; in vec3 vertexPosition;
// Input uniform values // Input uniform values
uniform mat4 projection; uniform mat4 matProjection;
uniform mat4 view; uniform mat4 matView;
// Output vertex attributes (to fragment shader) // Output vertex attributes (to fragment shader)
out vec3 fragPosition; out vec3 fragPosition;
@ -16,9 +16,9 @@ void main()
fragPosition = vertexPosition; fragPosition = vertexPosition;
// Remove translation from the view matrix // Remove translation from the view matrix
mat4 rotView = mat4(mat3(view)); mat4 rotView = mat4(mat3(matView));
vec4 clipPos = projection*rotView*vec4(vertexPosition, 1.0); vec4 clipPos = matProjection*rotView*vec4(vertexPosition, 1.0);
// Calculate final vertex position // Calculate final vertex position
gl_Position = clipPos.xyzw; gl_Position = clipPos;
} }

11
src/config.h
View file

@ -105,6 +105,7 @@
#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance
// Default shader vertex attribute names to set location points // Default shader vertex attribute names to set location points
// NOTE: When a new shader is loaded, the following locations are tried to be set for convenience
#define DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 #define DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0
#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 #define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1
#define DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 #define DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2
@ -112,6 +113,16 @@
#define DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 #define DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4
#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 #define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5
#define DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix
#define DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix
#define DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix
#define DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix
#define DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView))
#define DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color)
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0)
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1)
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2)
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Module: shapes - Configuration Flags // Module: shapes - Configuration Flags

18
src/core.c
View file

@ -2375,17 +2375,17 @@ RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode)
shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_COLOR); shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_COLOR);
// Get handles to GLSL uniform locations (vertex shader) // Get handles to GLSL uniform locations (vertex shader)
shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, "mvp"); shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_MVP);
shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, "view"); shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_VIEW);
shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, "projection"); shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_PROJECTION);
//shader.locs[SHADER_LOC_MATRIX_MODEL] = rlGetLocationUniform(shader.id, "matModel"); shader.locs[SHADER_LOC_MATRIX_MODEL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_MODEL);
shader.locs[SHADER_LOC_MATRIX_NORMAL] = rlGetLocationUniform(shader.id, "matNormal"); shader.locs[SHADER_LOC_MATRIX_NORMAL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_NORMAL);
// Get handles to GLSL uniform locations (fragment shader) // Get handles to GLSL uniform locations (fragment shader)
shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, "colDiffuse"); shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_COLOR);
shader.locs[SHADER_LOC_MAP_DIFFUSE] = rlGetLocationUniform(shader.id, "texture0"); // SHADER_LOC_MAP_ALBEDO shader.locs[SHADER_LOC_MAP_DIFFUSE] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0); // SHADER_LOC_MAP_ALBEDO
shader.locs[SHADER_LOC_MAP_SPECULAR] = rlGetLocationUniform(shader.id, "texture1"); // SHADER_LOC_MAP_METALNESS shader.locs[SHADER_LOC_MAP_SPECULAR] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1); // SHADER_LOC_MAP_METALNESS
shader.locs[SHADER_LOC_MAP_NORMAL] = rlGetLocationUniform(shader.id, "texture2"); shader.locs[SHADER_LOC_MAP_NORMAL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2);
} }
return shader; return shader;

28
src/rlgl.h
View file

@ -780,6 +780,34 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 #define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5
#endif #endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_MVP
#define DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix
#endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_VIEW
#define DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix
#endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_PROJECTION
#define DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix
#endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_MODEL
#define DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix
#endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_NORMAL
#define DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView))
#endif
#ifndef DEFAULT_SHADER_UNIFORM_NAME_COLOR
#define DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color)
#endif
#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0)
#endif
#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1)
#endif
#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2
#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2)
#endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Types and Structures Definition // Types and Structures Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------