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

Better-looking slave shield (bug #32), from Nic

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1305 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-12-17 15:06:02 +00:00
parent 48e9ffceb4
commit 2eaee9af88
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.4: Changes towards version 0.4:
- Better-looking slave shield (bug #32), from Nic
- Bay door animations don't stall before aborting (bug #500), from - Bay door animations don't stall before aborting (bug #500), from
chmmravatar chmmravatar
- Reports SDL version on startup (bug #520) - Mika,Nic - Reports SDL version on startup (bug #520) - Mika,Nic
sc2/src/sc2code/planets/plangen.c
+11 -15
View File
@@ -501,7 +501,7 @@ init_zoom_array (COUNT *zoom_arr)
// this routine, but a filter can be applied if desired too. // this routine, but a filter can be applied if desired too.
//Outer diameter of HALO //Outer diameter of HALO
#define SHIELD_RADIUS (RADIUS + 5) #define SHIELD_RADIUS (RADIUS + 6)
#define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1) #define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1)
#define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS) #define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS)
static void CreateShieldMask (void) static void CreateShieldMask (void)
@@ -517,11 +517,11 @@ static void CreateShieldMask (void)
rgba = pSolarSysState->Orbit.ScratchArray; rgba = pSolarSysState->Orbit.ScratchArray;
p_rgba = rgba; p_rgba = rgba;
// This is a non-transparent red for the halo // This is a non-transparent red for the halo
red_nt = 180; red_nt = 222;
// This is 100% transparent. // This is 100% transparent.
clear = frame_mapRGBA (ShieldFrame, 0, 0, 0, 0); clear = frame_mapRGBA (ShieldFrame, 0, 0, 0, 0);
aa_delta = SHIELD_RADIUS_2 - (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1); aa_delta = SHIELD_RADIUS_2 - (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1);
aa_delta2 = (RADIUS + 3) * (RADIUS + 3) - (RADIUS + 2)*(RADIUS + 2); aa_delta2 = (RADIUS + 1) * (RADIUS + 1) - RADIUS_2;
for (y = -SHIELD_RADIUS; y <= SHIELD_RADIUS; y++) for (y = -SHIELD_RADIUS; y <= SHIELD_RADIUS; y++)
{ {
for (x = -SHIELD_RADIUS; x <= SHIELD_RADIUS; x++) for (x = -SHIELD_RADIUS; x <= SHIELD_RADIUS; x++)
@@ -533,27 +533,23 @@ static void CreateShieldMask (void)
if (rad2 <= RADIUS_2) if (rad2 <= RADIUS_2)
// The mask for the planet // The mask for the planet
p=clear; p=clear;
else if (rad2 <= (RADIUS + 2) * (RADIUS + 2))
// The space between the halo and the planet
p = frame_mapRGBA (ShieldFrame, 0, 0, 0, 255);
else else
{ {
// The halo itself // The halo itself
UBYTE red = red_nt; UBYTE red = red_nt;
if (rad2 > (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1)) if (rad2 < (RADIUS + 1) * (RADIUS + 1))
{ {
DWORD r; DWORD r;
r = rad2 - (SHIELD_RADIUS - 1) * (SHIELD_RADIUS - 1); r = rad2 - RADIUS_2;
red = red_nt - (UBYTE)(red_nt * r / aa_delta);
}
else if (rad2 < (RADIUS + 3) * (RADIUS + 3))
{
DWORD r;
r = rad2 - (RADIUS + 2) * (RADIUS + 2);
red = (UBYTE)(red_nt * r / aa_delta2); red = (UBYTE)(red_nt * r / aa_delta2);
} }
else if (rad2 > (RADIUS + 2) * (RADIUS + 2))
{
DWORD r;
r = rad2 - ((RADIUS + 1) * (RADIUS + 1));
red = (UBYTE)red - (red * r / (SHIELD_RADIUS_2 - RADIUS_2 + 1));
}
p = frame_mapRGBA (ShieldFrame, red, 0, 0, 255); p = frame_mapRGBA (ShieldFrame, red, 0, 0, 255);
} }
} }
else else