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

Moved postpro texture to shader

Browse source
This commit is contained in:
raysan5 2015-06-22 19:59:55 +02:00
parent bae1bf7b0a
commit 1ec87f7990
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/rlgl.c
View file

@ -1045,12 +1045,7 @@ void rlglInitPostpro(void)
postproQuad = rlglLoadModel(quadData); postproQuad = rlglLoadModel(quadData);
Texture2D texture; // NOTE: fboColorTexture id must be assigned to postproQuad model shader
texture.id = fboColorTexture;
texture.width = w;
texture.height = h;
SetModelTexture(&postproQuad, texture);
#endif #endif
} }
@ -1060,6 +1055,13 @@ void rlglSetPostproShader(Shader shader)
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
rlglSetModelShader(&postproQuad, shader); rlglSetModelShader(&postproQuad, shader);
Texture2D texture;
texture.id = fboColorTexture;
texture.width = GetScreenWidth();
texture.height = GetScreenHeight();
SetShaderMapDiffuse(&postproQuad.shader, texture);
//TraceLog(INFO, "Postproquad texture id: %i", postproQuad.texture.id); //TraceLog(INFO, "Postproquad texture id: %i", postproQuad.texture.id);
//TraceLog(INFO, "Postproquad shader diffuse map id: %i", postproQuad.shader.texDiffuseId); //TraceLog(INFO, "Postproquad shader diffuse map id: %i", postproQuad.shader.texDiffuseId);
//TraceLog(INFO, "Shader diffuse map id: %i", shader.texDiffuseId); //TraceLog(INFO, "Shader diffuse map id: %i", shader.texDiffuseId);
@ -1369,8 +1371,7 @@ void rlglDrawModel(Model model, Vector3 position, float rotationAngle, Vector3 r
// Set shader textures (diffuse, normal, specular) // Set shader textures (diffuse, normal, specular)
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, model.texture.id); glBindTexture(GL_TEXTURE_2D, model.shader.texDiffuseId);
//glBindTexture(GL_TEXTURE_2D, model.shader.texDiffuseId);
//glUniform1i(model.shader.mapDiffuseLoc, 0); // Diffuse texture fits in texture unit 0 //glUniform1i(model.shader.mapDiffuseLoc, 0); // Diffuse texture fits in texture unit 0
if (vaoSupported) if (vaoSupported)