diff --git a/includes/animations.h b/includes/animations.h index a2c22f1..0dd6cbe 100644 --- a/includes/animations.h +++ b/includes/animations.h @@ -13,6 +13,6 @@ void cube(int); void cube2(int); // Effet de transition en fondu -void fondu(void (*)(int), void (*)(int), Uint32, Uint32, int); +void fondu(void (*)(int), void (*)(int), Uint32, Uint32, int); #endif diff --git a/shaders/cube.vs b/shaders/cube.vs index b31e053..8355370 100644 --- a/shaders/cube.vs +++ b/shaders/cube.vs @@ -17,7 +17,7 @@ void main() { vec3 n = (transpose(inverse(modview)) * vec4(normal, 0.0)).xyz; il = clamp(dot(n, -Ld), 0.0, 1.0); - gl_Position = proj * view * modview * vec4(position, 1.); + gl_Position = proj * view * modview * vec4(position, 1.); vsoColor = vec4(texCoord, 0.5, 1); } diff --git a/src/fondu.c b/src/fondu.c index 5d748c7..ba9202f 100644 --- a/src/fondu.c +++ b/src/fondu.c @@ -36,17 +36,17 @@ void fondu(void (* ancienne_anim)(int), void (* nouvelle_anim)(int), Uint32 temp glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &tex_id); // Dessine les deux animations - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, ecran[0], 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, ecran[0], 0); if(ancienne_anim) { ancienne_anim(etat); } - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, ecran[1], 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, ecran[1], 0); if(nouvelle_anim) { nouvelle_anim(etat); } // Mix des deux écrans - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex_id, 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex_id, 0); glDisable(GL_DEPTH); glUseProgram(proc_id);