From 7345870d56c047ac420629be4b7030b03619e219 Mon Sep 17 00:00:00 2001 From: victorfisac Date: Sat, 15 Jul 2017 17:07:08 +0200 Subject: [PATCH] Added LOC_MATRIX_MODEL and LOC_VECTOR_VIEW to difference it from LOC_MATRIX_VIEW (view matrix) --- src/models.c | 1 + src/raylib.h | 1 + src/rlgl.c | 2 +- src/rlgl.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/models.c b/src/models.c index 1f49977ea..9e1a76483 100644 --- a/src/models.c +++ b/src/models.c @@ -1319,6 +1319,7 @@ Material LoadMaterialPBR(Texture2D hdr, Color albedo, float metalness, float rou mat.shader.locs[LOC_TEXMAP_BRDF] = GetShaderLocation(mat.shader, "brdfLUT"); // Set view matrix location + mat.shader.locs[LOC_MATRIX_MODEL] = GetShaderLocation(mat.shader, "mMatrix"); mat.shader.locs[LOC_MATRIX_VIEW] = GetShaderLocation(mat.shader, "view"); mat.shader.locs[LOC_VECTOR_VIEW] = GetShaderLocation(mat.shader, "viewPos"); diff --git a/src/raylib.h b/src/raylib.h index 09d35479b..417bc617f 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -534,6 +534,7 @@ typedef enum { LOC_VERTEX_TANGENT, LOC_VERTEX_COLOR, LOC_MATRIX_MVP, + LOC_MATRIX_MODEL, LOC_MATRIX_VIEW, LOC_MATRIX_PROJECTION, LOC_VECTOR_VIEW, diff --git a/src/rlgl.c b/src/rlgl.c index da2c7f693..c4c209324 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -2378,7 +2378,7 @@ void rlDrawMesh(Mesh mesh, Material material, Matrix transform) //----------------------------------------------------- // Calculate and send to shader model matrix (used by PBR shader) - SetShaderValueMatrix(material.shader, GetShaderLocation(material.shader, "mMatrix"), transform); + SetShaderValueMatrix(material.shader, material.shader.locs[LOC_MATRIX_MODEL], transform); // Upload to shader material.colDiffuse diff --git a/src/rlgl.h b/src/rlgl.h index 9fbbd4c94..b5d5475bb 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -154,6 +154,7 @@ typedef unsigned char byte; LOC_VERTEX_TANGENT, LOC_VERTEX_COLOR, LOC_MATRIX_MVP, + LOC_MATRIX_MODEL, LOC_MATRIX_VIEW, LOC_MATRIX_PROJECTION, LOC_VECTOR_VIEW,