adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flattened transition_task_func to ScreenTransition() because

Browse Source 
additional thread isn't really needed


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@892 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-03-16 19:15:31 +00:00
parent acc4111de8
commit a11f966bd2
1 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c
+16 -45
View File
@@ -26,7 +26,6 @@
#include "graphics/tfb_draw.h" #include "graphics/tfb_draw.h"
int batch_depth = 0; int batch_depth = 0;
static const BOOLEAN pausing_transition = TRUE; // change to FALSE for non-pausing version
//Status: Not entirely unimplemented! //Status: Not entirely unimplemented!
@@ -84,36 +83,6 @@ FlushGraphics ()
TFB_DrawScreen_WaitForSignal (); TFB_DrawScreen_WaitForSignal ();
} }
static int
transition_task_func (void *data)
{
const float DURATION = (31.0f / 60.0f); // in seconds
Uint32 last_time = 0, current_time, delta_time, add_amount;
Task task = (Task)data;
TransitionAmount = 0;
last_time = SDL_GetTicks ();
for (;;)
{
SDL_Delay (10);
current_time = SDL_GetTicks ();
delta_time = current_time - last_time;
last_time = current_time;
add_amount = (Uint32) ((delta_time / 1000.0f / DURATION) * 255);
if (TransitionAmount + add_amount >= 255)
break;
TransitionAmount += add_amount;
}
TransitionAmount = 255;
FinishTask (task);
return 0;
}
void void
SetTransitionSource (PRECT pRect) SetTransitionSource (PRECT pRect)
{ {
@@ -124,14 +93,10 @@ SetTransitionSource (PRECT pRect)
void void
ScreenTransition (int TransType, PRECT pRect) ScreenTransition (int TransType, PRECT pRect)
{ {
Task transition_task; const float DURATION = (31.0f / 60.0f); // in seconds
Uint32 last_time = 0, current_time, delta_time, add_amount;
//fprintf(stderr, "ScreenTransition %d\n", TransType);
(void) TransType; /* dodge compiler warning */ (void) TransType; /* dodge compiler warning */
if (TransitionAmount != 255)
return;
if (pRect) if (pRect)
{ {
TransitionClipRect.x = pRect->corner.x; TransitionClipRect.x = pRect->corner.x;
@@ -153,18 +118,24 @@ ScreenTransition (int TransType, PRECT pRect)
} }
#endif #endif
if (pausing_transition) TransitionAmount = 0;
FlushGraphics ();
last_time = SDL_GetTicks ();
for (;;)
{ {
TransitionAmount = 0; SDL_Delay (10);
FlushGraphics ();
}
transition_task = AssignTask (transition_task_func, 1024, "screen transition"); current_time = SDL_GetTicks ();
delta_time = current_time - last_time;
last_time = current_time;
add_amount = (Uint32) ((delta_time / 1000.0f / DURATION) * 255);
if (TransitionAmount + add_amount >= 255)
break;
if (pausing_transition) TransitionAmount += add_amount;
{
WaitThread (transition_task->thread, NULL);
} }
TransitionAmount = 255;
} }
// Status: Ignored // Status: Ignored