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

Rounding error corrections in offseting hotspots math

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1538 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-02-15 10:18:20 +00:00
parent e9403fa111
commit 78e86e3bbd
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/tfb_prim.c
+20 -15
View File
@@ -55,10 +55,13 @@ TFB_Prim_Rect (PRECT r, TFB_Palette *color)
arm.extent.height = r->extent.height; arm.extent.height = r->extent.height;
arm.extent.width = 1; arm.extent.width = 1;
TFB_Prim_FillRect (&arm, color); TFB_Prim_FillRect (&arm, color);
arm.corner.x += ((r->extent.width * gscale) / GSCALE_IDENTITY) - 1; // rounding error correction here
arm.corner.x += ((r->extent.width * gscale + (GSCALE_IDENTITY >> 1))
/ GSCALE_IDENTITY) - 1;
TFB_Prim_FillRect (&arm, color); TFB_Prim_FillRect (&arm, color);
arm.corner.x = r->corner.x; arm.corner.x = r->corner.x;
arm.corner.y += ((r->extent.height * gscale) / GSCALE_IDENTITY) - 1; arm.corner.y += ((r->extent.height * gscale + (GSCALE_IDENTITY >> 1))
/ GSCALE_IDENTITY) - 1;
arm.extent.width = r->extent.width; arm.extent.width = r->extent.width;
arm.extent.height = 1; arm.extent.height = 1;
TFB_Prim_FillRect (&arm, color); TFB_Prim_FillRect (&arm, color);
@@ -77,9 +80,11 @@ TFB_Prim_FillRect (PRECT r, TFB_Palette *color)
gscale = GetGraphicScale (); gscale = GetGraphicScale ();
if (gscale != GSCALE_IDENTITY) if (gscale != GSCALE_IDENTITY)
{ { // rounding error correction here
rect.extent.width = (rect.extent.width * gscale) / GSCALE_IDENTITY; rect.extent.width = (rect.extent.width * gscale
rect.extent.height = (rect.extent.height * gscale) / GSCALE_IDENTITY; + (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
rect.extent.height = (rect.extent.height * gscale
+ (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
rect.corner.x += (r->extent.width - rect.corner.x += (r->extent.width -
rect.extent.width) >> 1; rect.extent.width) >> 1;
rect.corner.y += (r->extent.height - rect.corner.y += (r->extent.height -
@@ -140,11 +145,11 @@ TFB_Prim_Stamp (PSTAMP stmp)
paletted = FALSE; paletted = FALSE;
if (gscale != GSCALE_IDENTITY) if (gscale != GSCALE_IDENTITY)
{ { // rounding error correction here
x += (SrcFramePtr->HotSpot.x * x += (SrcFramePtr->HotSpot.x * (GSCALE_IDENTITY - gscale)
(GSCALE_IDENTITY - gscale)) / GSCALE_IDENTITY; + (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
y += (SrcFramePtr->HotSpot.y * y += (SrcFramePtr->HotSpot.y * (GSCALE_IDENTITY - gscale)
(GSCALE_IDENTITY - gscale)) / GSCALE_IDENTITY; + (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
} }
if (TFB_DrawCanvas_IsPaletted(img->NormalImg) && img->colormap_index != -1) if (TFB_DrawCanvas_IsPaletted(img->NormalImg) && img->colormap_index != -1)
@@ -200,11 +205,11 @@ TFB_Prim_StampFill (PSTAMP stmp, TFB_Palette *color)
b = color->b; b = color->b;
if (gscale != GSCALE_IDENTITY) if (gscale != GSCALE_IDENTITY)
{ { // rounding error correction here
x += (SrcFramePtr->HotSpot.x * x += (SrcFramePtr->HotSpot.x * (GSCALE_IDENTITY - gscale)
(GSCALE_IDENTITY - gscale)) / GSCALE_IDENTITY; + (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
y += (SrcFramePtr->HotSpot.y * y += (SrcFramePtr->HotSpot.y * (GSCALE_IDENTITY - gscale)
(GSCALE_IDENTITY - gscale)) / GSCALE_IDENTITY; + (GSCALE_IDENTITY >> 1)) / GSCALE_IDENTITY;
} }
UnlockMutex (img->mutex); UnlockMutex (img->mutex);