snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 14:56:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'MKXP/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2018-07-03 11:36:50 -07:00
commit 4553e2f2bf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/graphics.cpp
View file

@ -743,6 +743,9 @@ void Graphics::transition(int duration,
setBrightness(255); setBrightness(255);
/* Capture new scene */
p->screen.composite();
/* The PP frontbuffer will hold the current scene after the /* The PP frontbuffer will hold the current scene after the
* composition step. Since the backbuffer is unused during * composition step. Since the backbuffer is unused during
* the transition, we can reuse it as the target buffer for * the transition, we can reuse it as the target buffer for
@ -750,9 +753,6 @@ void Graphics::transition(int duration,
TEXFBO &currentScene = p->screen.getPP().frontBuffer(); TEXFBO &currentScene = p->screen.getPP().frontBuffer();
TEXFBO &transBuffer = p->screen.getPP().backBuffer(); TEXFBO &transBuffer = p->screen.getPP().backBuffer();
/* Capture new scene */
p->screen.composite();
/* If no transition bitmap is provided, /* If no transition bitmap is provided,
* we can use a simplified shader */ * we can use a simplified shader */
TransShader &transShader = shState->shaders().trans; TransShader &transShader = shState->shaders().trans;