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

Flash planet location cursor task retired; some cleanups

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3289 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-11-08 02:05:49 +00:00
parent 00068aa772
commit a8c2acf7ba
1 changed files with 117 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/scan.c
+109 -100
View File
@@ -34,6 +34,7 @@
#include "../state.h"
#include "options.h"
#include "libs/graphics/gfx_common.h"
#include "libs/graphics/drawable.h"
#include "libs/inplib.h"
#include "libs/mathlib.h"
@@ -493,91 +494,117 @@ PrintCoarseScan3DO (void)
}
static void
SetPlanetLoc (POINT new_pt)
initPlanetLocationImage (MENU_STATE *pMS)
{
EXTENT size;
// Get the cursor image
pMS->flash_frame0 = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
size.width = GetFrameWidth (pMS->flash_frame0);
size.height = GetFrameHeight (pMS->flash_frame0);
pMS->flash_rect0.extent = size;
pMS->flash_frame1 = CaptureDrawable (CreateDrawable (
WANT_PIXMAP | MAPPED_TO_DISPLAY,
size.width, size.height, 1));
// copy the hotspot
SetFrameHot (pMS->flash_frame1, GetFrameHot (pMS->flash_frame0));
}
static void
savePlanetLocationImage (MENU_STATE *pMS)
{
RECT r;
HOT_SPOT hs = GetFrameHot (pMS->flash_frame1);
// Remember what we saved
pMS->flash_rect1.corner = pMS->flash_rect0.corner;
GetContextClipRect (&r);
r.corner.x += pMS->flash_rect1.corner.x - hs.x;
r.corner.y += pMS->flash_rect1.corner.y - hs.y;
r.extent = pMS->flash_rect0.extent;
LoadDisplayPixmap (&r, pMenuState->flash_frame1);
}
static void
restorePlanetLocationImage (MENU_STATE *pMS)
{
STAMP s;
s.origin = pMS->flash_rect1.corner;
s.frame = pMS->flash_frame1; // saved image
DrawStamp (&s);
}
static void
drawPlanetCursor (MENU_STATE *pMS, BOOLEAN filled)
{
STAMP s;
s.origin = pMS->flash_rect0.corner;
s.frame = pMS->flash_frame0;
if (filled)
DrawFilledStamp (&s);
else
DrawStamp (&s);
}
static void
SetPlanetLoc (POINT new_pt)
{
pSolarSysState->MenuState.first_item = new_pt;
// Set the new flash location
new_pt.x >>= MAG_SHIFT;
new_pt.y >>= MAG_SHIFT;
LockMutex (GraphicsLock);
SetContext (ScanContext);
s.origin.x = pMenuState->flash_rect0.corner.x - (FLASH_WIDTH >> 1);
s.origin.y = pMenuState->flash_rect0.corner.y - (FLASH_HEIGHT >> 1);
s.frame = pMenuState->flash_frame0;
DrawStamp (&s);
pMenuState->flash_rect0.corner = new_pt;
GetContextClipRect (&r);
r.corner.x += pMenuState->flash_rect0.corner.x - (FLASH_WIDTH >> 1);
r.corner.y += pMenuState->flash_rect0.corner.y - (FLASH_HEIGHT >> 1);
r.extent.width = FLASH_WIDTH;
r.extent.height = FLASH_HEIGHT;
LoadDisplayPixmap (&r, pMenuState->flash_frame0);
UnlockMutex (GraphicsLock);
TaskSwitch ();
SetContext (ScanContext);
restorePlanetLocationImage (pMenuState);
savePlanetLocationImage (pMenuState);
}
int
flash_planet_loc_func(void *data)
static void
flashPlanetLocation (MENU_STATE *pMS)
{
DWORD TimeIn;
BYTE c, val;
PRIMITIVE p;
Task task = (Task) data;
#define FLASH_FRAME_DELAY (ONE_SECOND / 16)
static BYTE c = 0x00;
static int val = -2;
static POINT prevPt;
static TimeCount NextTime = 0;
BOOLEAN locChanged;
TimeCount Now = GetTimeCounter ();
SetPrimType (&p, STAMPFILL_PRIM);
SetPrimNextLink (&p, END_OF_LIST);
locChanged = prevPt.x != pMS->flash_rect0.corner.x
|| prevPt.y != pMS->flash_rect0.corner.y;
p.Object.Stamp.origin.x = p.Object.Stamp.origin.y = -1;
p.Object.Stamp.frame = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
if (!locChanged && Now < NextTime)
return; // nothing to do
if (locChanged)
{ // Reset the flashing cycle
c = 0x00;
val = -0x02;
TimeIn = 0;
while (!Task_ReadState(task, TASK_EXIT))
{
DWORD T;
CONTEXT OldContext;
val = -2;
prevPt = pMS->flash_rect0.corner;
LockMutex (GraphicsLock);
T = GetTimeCounter ();
if (p.Object.Stamp.origin.x != pMenuState->flash_rect0.corner.x
|| p.Object.Stamp.origin.y != pMenuState->flash_rect0.corner.y)
{
c = 0x00;
val = -0x02;
NextTime = Now + FLASH_FRAME_DELAY;
}
else
{
if (T < TimeIn)
{
UnlockMutex (GraphicsLock);
TaskSwitch ();
continue;
}
{ // Continue the flashing cycle
if (c == 0x00 || c == 0x1A)
val = -val;
c += val;
if (Now - NextTime > FLASH_FRAME_DELAY)
NextTime = Now + FLASH_FRAME_DELAY; // missed timing by too much
else
NextTime += FLASH_FRAME_DELAY; // stable frame rate
}
p.Object.Stamp.origin = pMenuState->flash_rect0.corner;
SetPrimColor (&p, BUILD_COLOR (MAKE_RGB15 (c, c, c), c));
OldContext = SetContext (ScanContext);
DrawBatch (&p, 0, 0);
SetContext (OldContext);
TimeIn = T + (ONE_SECOND >> 4);
UnlockMutex (GraphicsLock);
TaskSwitch ();
}
FinishTask (task);
return(0);
SetContext (ScanContext);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (c, c, c), c));
drawPlanetCursor (pMS, TRUE);
}
static BOOLEAN DoScan (MENU_STATE *pMS);
@@ -589,13 +616,9 @@ PickPlanetSide (MENU_STATE *pMS)
BOOLEAN select, cancel;
select = PulsedInputState.menu[KEY_MENU_SELECT];
cancel = PulsedInputState.menu[KEY_MENU_CANCEL];
if (GLOBAL (CurrentActivity) & CHECK_ABORT)
{
if (pMenuState->flash_task)
{
ConcludeTask(pMenuState->flash_task);
pMenuState->flash_task = 0;
}
goto ExitPlanetSide;
}
@@ -606,36 +629,25 @@ PickPlanetSide (MENU_STATE *pMS)
SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
if (!select)
{
RECT r;
pMS->Initialized = TRUE;
LockMutex (GraphicsLock);
SetContext (ScanContext);
// Set the current flash location
pMenuState->flash_rect0.corner.x =
pSolarSysState->MenuState.first_item.x >> MAG_SHIFT;
pMenuState->flash_rect0.corner.y =
pSolarSysState->MenuState.first_item.y >> MAG_SHIFT;
GetContextClipRect (&r);
r.corner.x += pMenuState->flash_rect0.corner.x - (FLASH_WIDTH >> 1);
r.corner.y += pMenuState->flash_rect0.corner.y - (FLASH_HEIGHT >> 1);
r.extent.width = FLASH_WIDTH;
r.extent.height = FLASH_HEIGHT;
LoadDisplayPixmap (&r, pMenuState->flash_frame0);
savePlanetLocationImage (pMenuState);
SetFlashRect (NULL);
UnlockMutex (GraphicsLock);
InitLander (0);
pMenuState->flash_task = AssignTask (flash_planet_loc_func,
2048, "flash planet location");
}
}
else if (select || cancel)
{
STAMP s;
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
LockMutex (GraphicsLock);
@@ -643,14 +655,13 @@ PickPlanetSide (MENU_STATE *pMS)
UnlockMutex (GraphicsLock);
FlushInput ();
if (pMenuState->flash_task)
{
ConcludeTask (pMenuState->flash_task);
pMenuState->flash_task = 0;
}
if (!select)
{ // Bailing out
LockMutex (GraphicsLock);
SetPlanetLoc (pSolarSysState->MenuState.first_item);
UnlockMutex (GraphicsLock);
}
else
{
COUNT fuel_required;
@@ -666,9 +677,7 @@ PickPlanetSide (MENU_STATE *pMS)
LockMutex (GraphicsLock);
DeltaSISGauges (0, -(SIZE)fuel_required, 0);
SetContext (ScanContext);
s.origin = pMenuState->flash_rect0.corner;
s.frame = SetAbsFrameIndex (MiscDataFrame, FLASH_INDEX);
DrawStamp (&s);
drawPlanetCursor (pMenuState, FALSE);
UnlockMutex (GraphicsLock);
PlanetSide (pMS);
@@ -680,12 +689,6 @@ PickPlanetSide (MENU_STATE *pMS)
/* Create Fwiffo group and go into comm with it */
HSHIPFRAG hStarShip;
if (pMenuState->flash_task)
{
ConcludeTask (pMenuState->flash_task);
pMenuState->flash_task = 0;
}
NextActivity |= CHECK_LOAD; /* fake a load game */
GLOBAL (CurrentActivity) |= START_ENCOUNTER;
@@ -747,6 +750,9 @@ ExitPlanetSide:
if (PulsedInputState.menu[KEY_MENU_DOWN])
dy = 1;
LockMutex (GraphicsLock);
BatchGraphics ();
dx = dx << MAG_SHIFT;
if (dx)
{
@@ -770,6 +776,11 @@ ExitPlanetSide:
SetPlanetLoc (new_pt);
}
flashPlanetLocation (pMenuState);
UnbatchGraphics ();
UnlockMutex (GraphicsLock);
SleepThreadUntil (TimeIn + ONE_SECOND / 40);
}
@@ -1152,11 +1163,9 @@ ScanSystem (void)
LockMutex (GraphicsLock);
ScanContext = CreateContext ();
SetContext (ScanContext);
MenuState.flash_rect0.extent.width = FLASH_WIDTH;
MenuState.flash_rect0.extent.height = FLASH_HEIGHT;
MenuState.flash_frame0 = CaptureDrawable (
CreateDrawable (WANT_PIXMAP | MAPPED_TO_DISPLAY,
FLASH_WIDTH, FLASH_HEIGHT, 1));
initPlanetLocationImage (&MenuState);
SetContextFGFrame (Screen);
r.corner.x = (SIS_ORG_X + SIS_SCREEN_WIDTH) - MAP_WIDTH;
r.corner.y = (SIS_ORG_Y + SIS_SCREEN_HEIGHT) - MAP_HEIGHT;
@@ -1183,7 +1192,7 @@ ScanSystem (void)
{
LockMutex (GraphicsLock);
SetContext (SpaceContext);
DestroyDrawable (ReleaseDrawable (MenuState.flash_frame0));
DestroyDrawable (ReleaseDrawable (MenuState.flash_frame1));
DestroyContext (ScanContext);
ScanContext = 0;
UnlockMutex (GraphicsLock);