Paris8/DemoGL4D
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove extra space

Browse source
This commit is contained in:
Mylloon 2022-05-15 21:09:27 +02:00
parent cac541a314
commit 78238a6150
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/animations.h
View file

@ -13,6 +13,6 @@ void cube(int);
void cube2(int); void cube2(int);
// Effet de transition en fondu // Effet de transition en fondu
void fondu(void (*)(int), void (*)(int), Uint32, Uint32, int); void fondu(void (*)(int), void (*)(int), Uint32, Uint32, int);
#endif #endif

2
shaders/cube.vs
View file

@ -17,7 +17,7 @@ void main() {
vec3 n = (transpose(inverse(modview)) * vec4(normal, 0.0)).xyz; vec3 n = (transpose(inverse(modview)) * vec4(normal, 0.0)).xyz;
il = clamp(dot(n, -Ld), 0.0, 1.0); 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); vsoColor = vec4(texCoord, 0.5, 1);
} }

6
src/fondu.c
View file

@ -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); glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &tex_id);
// Dessine les deux animations // 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) { if(ancienne_anim) {
ancienne_anim(etat); 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) { if(nouvelle_anim) {
nouvelle_anim(etat); nouvelle_anim(etat);
} }
// Mix des deux écrans // 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); glDisable(GL_DEPTH);
glUseProgram(proc_id); glUseProgram(proc_id);