Sfoglia il codice sorgente

Added defines for default shader names

pull/114/head
Ray 9 anni fa
parent
commit
c85cd29049
1 ha cambiato i file con 15 aggiunte e 6 eliminazioni
  1. +15
    -6
      src/rlgl.c

+ 15
- 6
src/rlgl.c Vedi File

@ -115,6 +115,15 @@
#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
#endif
// Default vertex attribute names on shader to set location points
#define DEFAULT_ATTRIB_POSITION_NAME "vertexPosition" // shader-location = 0
#define DEFAULT_ATTRIB_TEXCOORD_NAME "vertexTexCoord" // shader-location = 1
#define DEFAULT_ATTRIB_NORMAL_NAME "vertexNormal" // shader-location = 2
#define DEFAULT_ATTRIB_COLOR_NAME "vertexColor" // shader-location = 3
#define DEFAULT_ATTRIB_TANGENT_NAME "vertexTangent" // shader-location = 4
#define DEFAULT_ATTRIB_TEXCOORD2_NAME "vertexTexCoord2" // shader-location = 5
//----------------------------------------------------------------------------------
// Types and Structures Definition
//----------------------------------------------------------------------------------
@ -2220,12 +2229,12 @@ static unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr)
glAttachShader(program, fragmentShader);
// NOTE: Default attribute shader locations must be binded before linking
glBindAttribLocation(program, 0, sa">"vertexPosition");
glBindAttribLocation(program, 1, sa">"vertexTexCoord");
glBindAttribLocation(program, 2, sa">"vertexNormal");
glBindAttribLocation(program, 3, sa">"vertexColor");
glBindAttribLocation(program, 4, sa">"vertexTangent");
glBindAttribLocation(program, 5, sa">"vertexTexCoord2");
glBindAttribLocation(program, 0, n">DEFAULT_ATTRIB_POSITION_NAME);
glBindAttribLocation(program, 1, n">DEFAULT_ATTRIB_TEXCOORD_NAME);
glBindAttribLocation(program, 2, n">DEFAULT_ATTRIB_NORMAL_NAME);
glBindAttribLocation(program, 3, n">DEFAULT_ATTRIB_COLOR_NAME);
glBindAttribLocation(program, 4, n">DEFAULT_ATTRIB_TANGENT_NAME);
glBindAttribLocation(program, 5, n">DEFAULT_ATTRIB_TEXCOORD2_NAME);
// NOTE: If some attrib name is no found on the shader, it locations becomes -1

Caricamento…
Annulla
Salva