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

Changed some uses of MAP_HEIGHT to SPHERE_SPAN_X to make a clear distinction; define SPHERE_SPAN_X to MAP_WIDTH/2 to see what happens; bug #885

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2358 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-05-06 22:58:05 +00:00
parent a3744bca6b
commit 286e02c09c
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/plangen.c
+26 -17
View File
@@ -67,6 +67,16 @@ extern void getpixelarray (void *map, int Bpp, FRAMEPTR FramePtr,
// distance beyond which all pixels are transparent (for aa) // distance beyond which all pixels are transparent (for aa)
#define RADIUS_THRES ((RADIUS + 1) * (RADIUS + 1)) #define RADIUS_THRES ((RADIUS + 1) * (RADIUS + 1))
#define DIAMETER (TWORADIUS + 1) #define DIAMETER (TWORADIUS + 1)
#if 0
# define SPHERE_SPAN_X (MAP_WIDTH >> 1)
#else
# define SPHERE_SPAN_X (MAP_HEIGHT)
#endif
// XXX: technically, the sphere's span over X should be MAP_WIDTH/2
// but this causes visible surface compression over X, because
// the surface dims ratio is H x H*PI, instead of H x 2*H
// see bug #885
#define DIFFUSE_BITS 16 #define DIFFUSE_BITS 16
#define AA_WEIGHT_BITS 16 #define AA_WEIGHT_BITS 16
@@ -248,7 +258,7 @@ P3norm (POINT3 *res, POINT3 *vec)
} }
// RenderPhongMask builds a shadow map for the rotating planet // RenderPhongMask builds a shadow map for the rotating planet
// loc indicates the planets position relavtive to the sun // loc indicates the planet's position relative to the sun
static void static void
RenderPhongMask (POINT loc) RenderPhongMask (POINT loc)
{ {
@@ -360,8 +370,8 @@ create_aa_points (MAP3D_POINT *ppt, double x, double y)
if (x < 0) if (x < 0)
x = 0; x = 0;
else if (x >= MAP_HEIGHT) else if (x >= SPHERE_SPAN_X)
x = MAP_HEIGHT - 1; x = SPHERE_SPAN_X - 1;
if (y < 0) if (y < 0)
y = 0; y = 0;
else if (y >= MAP_HEIGHT) else if (y >= MAP_HEIGHT)
@@ -451,9 +461,9 @@ void
SetPlanetTilt (int angle) SetPlanetTilt (int angle)
{ {
int x, y; int x, y;
const double multx = (MAP_HEIGHT / M_PI); const double multx = ((double)SPHERE_SPAN_X / M_PI);
const double multy = (MAP_HEIGHT / M_PI); const double multy = ((double)MAP_HEIGHT / M_PI);
const double xadj = ((double)MAP_HEIGHT / 2.0); const double xadj = ((double)SPHERE_SPAN_X / 2.0);
for (y = -RADIUS; y <= RADIUS; y++) for (y = -RADIUS; y <= RADIUS; y++)
{ {
@@ -725,7 +735,7 @@ calc_map_light (UBYTE val, DWORD dif, int lvf)
static inline DWORD static inline DWORD
get_map_pixel (DWORD *pixels, int x, int y) get_map_pixel (DWORD *pixels, int x, int y)
{ {
return pixels[y * (MAP_WIDTH + MAP_HEIGHT) + x]; return pixels[y * (MAP_WIDTH + SPHERE_SPAN_X) + x];
} }
static inline int static inline int
@@ -1357,7 +1367,7 @@ planet_orbit_init ()
CreateDrawable (WANT_PIXMAP, (COUNT)(MAP_WIDTH << 2), CreateDrawable (WANT_PIXMAP, (COUNT)(MAP_WIDTH << 2),
(COUNT)(MAP_HEIGHT << 2), 1)); (COUNT)(MAP_HEIGHT << 2), 1));
Orbit->lpTopoMap = HMalloc (sizeof (DWORD) Orbit->lpTopoMap = HMalloc (sizeof (DWORD)
* (MAP_HEIGHT * (MAP_WIDTH + MAP_HEIGHT))); * (MAP_HEIGHT * (MAP_WIDTH + SPHERE_SPAN_X)));
// always allocate the scratch array to largest needed size // always allocate the scratch array to largest needed size
Orbit->ScratchArray = HMalloc (sizeof (DWORD) Orbit->ScratchArray = HMalloc (sizeof (DWORD)
* (SHIELD_DIAM) * (SHIELD_DIAM)); * (SHIELD_DIAM) * (SHIELD_DIAM));
@@ -1773,7 +1783,7 @@ GeneratePlanetMask (PPLANET_DESC pPlanetDesc, FRAME SurfDefFrame)
RECT r; RECT r;
DWORD old_seed; DWORD old_seed;
PLANDATAPTR PlanDataPtr; PLANDATAPTR PlanDataPtr;
COUNT i, x, y; COUNT i, y;
POINT loc; POINT loc;
CONTEXT OldContext; CONTEXT OldContext;
PLANET_ORBIT *Orbit = &pSolarSysState->Orbit; PLANET_ORBIT *Orbit = &pSolarSysState->Orbit;
@@ -1952,17 +1962,16 @@ GeneratePlanetMask (PPLANET_DESC pPlanetDesc, FRAME SurfDefFrame)
// Generate a pixel array from the Topography map. // Generate a pixel array from the Topography map.
// We use this instead of lpTopoData because it needs to be // We use this instead of lpTopoData because it needs to be
// WAP_WIDTH+MAP_HEIGHT wide and we need this method for Earth anyway. // WAP_WIDTH+SPHERE_SPAN_X wide and we need this method for Earth anyway.
// It may be more efficient to build it from lpTopoData instead of the // It may be more efficient to build it from lpTopoData instead of the
// FRAMPTR though. // FRAMPTR though.
x = MAP_WIDTH + MAP_HEIGHT; getpixelarray (Orbit->lpTopoMap, 4, pSolarSysState->TopoFrame,
y = MAP_HEIGHT; MAP_WIDTH + SPHERE_SPAN_X, MAP_HEIGHT);
getpixelarray (Orbit->lpTopoMap, 4, pSolarSysState->TopoFrame, x, y); // Extend the width from MAP_WIDTH to MAP_WIDTH+SPHERE_SPAN_X
// Extend the width from MAP_WIDTH to MAP_WIDTH+MAP_HEIGHT for (y = 0; y < MAP_HEIGHT * (MAP_WIDTH + SPHERE_SPAN_X);
for (y = 0; y < MAP_HEIGHT * (MAP_WIDTH + MAP_HEIGHT); y += MAP_WIDTH + SPHERE_SPAN_X)
y += MAP_WIDTH + MAP_HEIGHT)
memcpy (Orbit->lpTopoMap + y + MAP_WIDTH, Orbit->lpTopoMap + y, memcpy (Orbit->lpTopoMap + y + MAP_WIDTH, Orbit->lpTopoMap + y,
MAP_HEIGHT * sizeof (Orbit->lpTopoMap[0])); SPHERE_SPAN_X * sizeof (Orbit->lpTopoMap[0]));
if (PLANALGO (PlanDataPtr->Type) != GAS_GIANT_ALGO) if (PLANALGO (PlanDataPtr->Type) != GAS_GIANT_ALGO)
{ // convert topo data to a light map, based on relative { // convert topo data to a light map, based on relative