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

Purged SetGraphicStrength, as the arith_blit_frame routine supercedes it.

Browse Source 
Cleaned up DCQ code appropriately to reflect this.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@626 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-02-01 06:02:50 +00:00
parent 366c385cb0
commit fcccc5a8f5
11 changed files with 45 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.2: Changes towards version 0.2:
- Removed the GraphicStrength code, since all that is handled with
an arithmetic blit routine outside of the drawing thread
- Added an improved version of biadapt scaling filter, - Added an improved version of biadapt scaling filter,
working name "biadv" (use --scale=biadv) -fOSSiL working name "biadv" (use --scale=biadv) -fOSSiL
- Removed SDL_mixer sound module - Removed SDL_mixer sound module
sc2/src/sc2code/libs/graphics/drawcmd.h
-4
View File
@@ -57,7 +57,6 @@ typedef struct tfb_dc_img
{ {
TFB_Image *image; TFB_Image *image;
int x, y; int x, y;
int BlendNumerator, BlendDenominator;
SCREEN destBuffer; SCREEN destBuffer;
BOOLEAN UsePalette; BOOLEAN UsePalette;
BOOLEAN UseScaling; BOOLEAN UseScaling;
@@ -68,7 +67,6 @@ typedef struct tfb_dc_filledimg
TFB_Image *image; TFB_Image *image;
int x, y; int x, y;
int r, g, b; int r, g, b;
int BlendNumerator, BlendDenominator;
SCREEN destBuffer; SCREEN destBuffer;
BOOLEAN UseScaling; BOOLEAN UseScaling;
} TFB_DrawCommand_FilledImage; } TFB_DrawCommand_FilledImage;
@@ -76,7 +74,6 @@ typedef struct tfb_dc_filledimg
typedef struct tfb_dc_copy typedef struct tfb_dc_copy
{ {
int x, y, w, h; int x, y, w, h;
int BlendNumerator, BlendDenominator;
SCREEN srcBuffer, destBuffer; SCREEN srcBuffer, destBuffer;
} TFB_DrawCommand_Copy; } TFB_DrawCommand_Copy;
@@ -84,7 +81,6 @@ typedef struct tfb_dc_copyimg
{ {
TFB_Image *image; TFB_Image *image;
int x, y, w, h; int x, y, w, h;
int BlendNumerator, BlendDenominator;
SCREEN srcBuffer; SCREEN srcBuffer;
} TFB_DrawCommand_CopyToImage; } TFB_DrawCommand_CopyToImage;
sc2/src/sc2code/libs/graphics/gfx_common.c
+23 -8
View File
@@ -33,15 +33,30 @@ int ScreenWidthActual;
int ScreenHeightActual; int ScreenHeightActual;
int GraphicsDriver; int GraphicsDriver;
int TFB_DEBUG_HALT = 0; int TFB_DEBUG_HALT = 0;
int BlendNumerator = 4;
int BlendDenominator = 4;
// Status: Ignored (only used in fmv.c)
void void
SetGraphicStrength (int numerator, int denominator) SetGraphicUseOtherExtra (int other) //Could this possibly be more cryptic?!? :)
{ {
//fprintf (stderr, "SetGraphicsStrength %d %d\n",numerator, denominator); //fprintf(stderr, "SetGraphicUseOtherExtra %d\n", other);
BlendNumerator = numerator; }
BlendDenominator = denominator;
// Status: Ignored (only used in solarsys.c)
void
SetGraphicGrabOther (int grab_other)
{
//fprintf(stderr, "SetGraphicGrabOther %d\n", grab_other);
}
void
DrawFromExtraScreen (PRECT r)
{
TFB_DrawScreen_Copy(r, TFB_SCREEN_EXTRA, TFB_SCREEN_MAIN);
}
void
LoadIntoExtraScreen (PRECT r)
{
TFB_DrawScreen_Copy(r, TFB_SCREEN_MAIN, TFB_SCREEN_EXTRA);
} }
sc2/src/sc2code/libs/graphics/gfx_common.h
-4
View File
@@ -53,11 +53,9 @@ void TFB_ProcessEvents (void);
void LoadIntoExtraScreen (PRECT r); void LoadIntoExtraScreen (PRECT r);
void DrawFromExtraScreen (PRECT r); void DrawFromExtraScreen (PRECT r);
void SetGraphicStrength (int numer, int denom);
void SetGraphicGrabOther (int grab_other); void SetGraphicGrabOther (int grab_other);
void SetGraphicScale (int scale); void SetGraphicScale (int scale);
void SetGraphicUseOtherExtra (int other); void SetGraphicUseOtherExtra (int other);
void *GetScreenBitmap (void);
void ScreenTransition (int transition, PRECT pRect); void ScreenTransition (int transition, PRECT pRect);
extern float FrameRate; extern float FrameRate;
@@ -72,8 +70,6 @@ extern int ScreenHeight;
extern int ScreenWidthActual; extern int ScreenWidthActual;
extern int ScreenHeightActual; extern int ScreenHeightActual;
extern int GraphicsDriver; extern int GraphicsDriver;
extern int BlendNumerator;
extern int BlendDenominator;
int Starcon2Main (void *); int Starcon2Main (void *);
sc2/src/sc2code/libs/graphics/sdl/3do_blt.c
+5 -8
View File
@@ -24,6 +24,11 @@
static int gscale; static int gscale;
void
SetGraphicScale (int scale)
{
gscale = scale;
}
static void static void
blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr) blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr)
@@ -364,12 +369,4 @@ LoadDisplay (PDISPLAY_INTERFACE *pDisplay)
*pDisplay = &DisplayInterface; *pDisplay = &DisplayInterface;
} }
// Status: Unimplemented
void
SetGraphicScale (int scale)
//Calibration...
{
gscale = scale;
}
#endif #endif
sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c
-26
View File
@@ -80,20 +80,6 @@ FlushGraphics ()
TFB_DrawScreen_WaitForSignal (); TFB_DrawScreen_WaitForSignal ();
} }
// Status: Ignored (only used in fmv.c)
void
SetGraphicUseOtherExtra (int other) //Could this possibly be more cryptic?!? :)
{
//fprintf(stderr, "SetGraphicUseOtherExtra %d\n", other);
}
// Status: Ignored (only used in solarsys.c)
void
SetGraphicGrabOther (int grab_other)
{
//fprintf(stderr, "SetGraphicGrabOther %d\n", grab_other);
}
static int static int
transition_task_func (void *data) transition_task_func (void *data)
{ {
@@ -172,18 +158,6 @@ ScreenTransition (int TransType, PRECT pRect)
} }
} }
void
DrawFromExtraScreen (PRECT r) //No scaling?
{
TFB_DrawScreen_Copy(r, TFB_SCREEN_EXTRA, TFB_SCREEN_MAIN);
}
void
LoadIntoExtraScreen (PRECT r)
{
TFB_DrawScreen_Copy(r, TFB_SCREEN_MAIN, TFB_SCREEN_EXTRA);
}
// Status: Ignored // Status: Ignored
BOOLEAN BOOLEAN
InitVideo (BOOLEAN useCDROM) //useCDROM doesn't really apply to us... InitVideo (BOOLEAN useCDROM) //useCDROM doesn't really apply to us...
sc2/src/sc2code/libs/graphics/sdl/canvas.c
+6 -6
View File
@@ -13,7 +13,7 @@ TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Ca
SDL_Rect rect; SDL_Rect rect;
screen_plot = putpixel_for (target); screen_plot = putpixel_for (target);
color = SDL_MapRGB (((NativeCanvas)target)->format, r, g, b); color = SDL_MapRGB (((NativeCanvas) target)->format, r, g, b);
SDL_GetClipRect((NativeCanvas) target, &rect); SDL_GetClipRect((NativeCanvas) target, &rect);
@@ -56,11 +56,11 @@ TFB_DrawCanvas_Rect (PRECT rect, int r, int g, int b, TFB_Canvas target)
sr.w = rect->extent.width; sr.w = rect->extent.width;
sr.h = rect->extent.height; sr.h = rect->extent.height;
SDL_FillRect((NativeCanvas)target, &sr, SDL_MapRGB(((NativeCanvas)target)->format, r, g, b)); SDL_FillRect((NativeCanvas) target, &sr, SDL_MapRGB(((NativeCanvas) target)->format, r, g, b));
} }
void void
TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Canvas target, int bn, int bd) TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Canvas target)
{ {
SDL_Rect targetRect; SDL_Rect targetRect;
SDL_Surface *surf; SDL_Surface *surf;
@@ -92,12 +92,12 @@ TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette
} }
} }
TFB_BlitSurface(surf, NULL, target, &targetRect, bn, bd); SDL_BlitSurface(surf, NULL, (NativeCanvas) target, &targetRect);
UnlockMutex (img->mutex); UnlockMutex (img->mutex);
} }
void void
TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Canvas target, int bn, int bd) TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Canvas target)
{ {
SDL_Rect targetRect; SDL_Rect targetRect;
SDL_Surface *surf; SDL_Surface *surf;
@@ -128,6 +128,6 @@ TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r,
} }
SDL_SetColors (surf, pal, 0, 256); SDL_SetColors (surf, pal, 0, 256);
TFB_BlitSurface(surf, NULL, target, &targetRect, bn, bd); SDL_BlitSurface(surf, NULL, (NativeCanvas) target, &targetRect);
UnlockMutex (img->mutex); UnlockMutex (img->mutex);
} }
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+4 -6
View File
@@ -585,8 +585,7 @@ TFB_FlushGraphics () // Only call from main thread!!
TFB_DrawCanvas_Image (DC_image, x, y, TFB_DrawCanvas_Image (DC_image, x, y,
DC.data.image.UseScaling, pal, DC.data.image.UseScaling, pal,
SDL_Screens[DC.data.image.destBuffer], SDL_Screens[DC.data.image.destBuffer]);
DC.data.image.BlendNumerator, DC.data.image.BlendDenominator);
break; break;
} }
@@ -603,8 +602,7 @@ TFB_FlushGraphics () // Only call from main thread!!
TFB_DrawCanvas_FilledImage (DC.data.filledimage.image, DC.data.filledimage.x, DC.data.filledimage.y, TFB_DrawCanvas_FilledImage (DC.data.filledimage.image, DC.data.filledimage.x, DC.data.filledimage.y,
DC.data.filledimage.UseScaling, DC.data.filledimage.r, DC.data.filledimage.g, DC.data.filledimage.UseScaling, DC.data.filledimage.r, DC.data.filledimage.g,
DC.data.filledimage.b, SDL_Screens[DC.data.filledimage.destBuffer], DC.data.filledimage.b, SDL_Screens[DC.data.filledimage.destBuffer]);
DC.data.filledimage.BlendNumerator, DC.data.filledimage.BlendDenominator);
break; break;
} }
case TFB_DRAWCOMMANDTYPE_LINE: case TFB_DRAWCOMMANDTYPE_LINE:
@@ -662,7 +660,7 @@ TFB_FlushGraphics () // Only call from main thread!!
dest.x = 0; dest.x = 0;
dest.y = 0; dest.y = 0;
TFB_BlitSurface(SDL_Screens[DC.data.copytoimage.srcBuffer], &src, DC_image->NormalImg, &dest, DC.data.copytoimage.BlendNumerator, DC.data.copytoimage.BlendDenominator); SDL_BlitSurface(SDL_Screens[DC.data.copytoimage.srcBuffer], &src, DC_image->NormalImg, &dest);
UnlockMutex (DC_image->mutex); UnlockMutex (DC_image->mutex);
break; break;
} }
@@ -678,7 +676,7 @@ TFB_FlushGraphics () // Only call from main thread!!
TFB_BBox_RegisterPoint (src.x + src.w, src.y + src.h); TFB_BBox_RegisterPoint (src.x + src.w, src.y + src.h);
TFB_BlitSurface(SDL_Screens[DC.data.copy.srcBuffer], &src, SDL_Screens[DC.data.copy.destBuffer], &dest, DC.data.copy.BlendNumerator, DC.data.copy.BlendDenominator); SDL_BlitSurface(SDL_Screens[DC.data.copy.srcBuffer], &src, SDL_Screens[DC.data.copy.destBuffer], &dest);
break; break;
} }
case TFB_DRAWCOMMANDTYPE_DELETEIMAGE: case TFB_DRAWCOMMANDTYPE_DELETEIMAGE:
sc2/src/sc2code/libs/graphics/tfb_draw.c
+2 -14
View File
@@ -115,8 +115,6 @@ TFB_DrawScreen_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette
} }
DC.data.image.destBuffer = dest; DC.data.image.destBuffer = dest;
DC.data.image.BlendNumerator = BlendNumerator;
DC.data.image.BlendDenominator = BlendDenominator;
TFB_EnqueueDrawCommand (&DC); TFB_EnqueueDrawCommand (&DC);
Unlock_DCQ (); Unlock_DCQ ();
@@ -136,8 +134,6 @@ TFB_DrawScreen_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r,
DC.data.filledimage.g = g; DC.data.filledimage.g = g;
DC.data.filledimage.b = b; DC.data.filledimage.b = b;
DC.data.filledimage.destBuffer = dest; DC.data.filledimage.destBuffer = dest;
DC.data.filledimage.BlendNumerator = BlendNumerator;
DC.data.filledimage.BlendDenominator = BlendDenominator;
TFB_EnqueueDrawCommand (&DC); TFB_EnqueueDrawCommand (&DC);
} }
@@ -155,9 +151,6 @@ TFB_DrawScreen_CopyToImage (TFB_Image *img, PRECT lpRect, SCREEN src)
DC.data.copytoimage.image = img; DC.data.copytoimage.image = img;
DC.data.copytoimage.srcBuffer = src; DC.data.copytoimage.srcBuffer = src;
DC.data.copytoimage.BlendNumerator = BlendNumerator;
DC.data.copytoimage.BlendDenominator = BlendDenominator;
TFB_EnqueueDrawCommand (&DC); TFB_EnqueueDrawCommand (&DC);
} }
@@ -183,9 +176,6 @@ TFB_DrawScreen_Copy (PRECT r, SCREEN src, SCREEN dest)
DC.data.copy.srcBuffer = src; DC.data.copy.srcBuffer = src;
DC.data.copy.destBuffer = dest; DC.data.copy.destBuffer = dest;
DC.data.copy.BlendNumerator = BlendNumerator;
DC.data.copy.BlendDenominator = BlendDenominator;
TFB_EnqueueDrawCommand (&DC); TFB_EnqueueDrawCommand (&DC);
} }
@@ -217,8 +207,6 @@ TFB_DrawScreen_WaitForSignal (void)
WaitForSignal (); WaitForSignal ();
} }
/* These don't compile until I write the DrawCanvas commands. */
void void
TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Image *dest) TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Image *dest)
{ {
@@ -241,7 +229,7 @@ void
TFB_DrawImage_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Image *target) TFB_DrawImage_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Image *target)
{ {
LockMutex (target->mutex); LockMutex (target->mutex);
TFB_DrawCanvas_Image (img, x, y, scaled, palette, target->NormalImg, 4, 4); TFB_DrawCanvas_Image (img, x, y, scaled, palette, target->NormalImg);
target->dirty = TRUE; target->dirty = TRUE;
UnlockMutex (target->mutex); UnlockMutex (target->mutex);
} }
@@ -250,7 +238,7 @@ void
TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Image *target) TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Image *target)
{ {
LockMutex (target->mutex); LockMutex (target->mutex);
TFB_DrawCanvas_FilledImage (img, x, y, scaled, r, g, b, target->NormalImg, 4, 4); TFB_DrawCanvas_FilledImage (img, x, y, scaled, r, g, b, target->NormalImg);
target->dirty = TRUE; target->dirty = TRUE;
UnlockMutex (target->mutex); UnlockMutex (target->mutex);
} }
sc2/src/sc2code/libs/graphics/tfb_draw.h
+2 -2
View File
@@ -69,7 +69,7 @@ void TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, in
void TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Canvas dest); void TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Canvas dest);
void TFB_DrawCanvas_Rect (PRECT rect, int r, int g, int b, TFB_Canvas image); void TFB_DrawCanvas_Rect (PRECT rect, int r, int g, int b, TFB_Canvas image);
void TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Canvas target, int bn, int bd); void TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, BOOLEAN scaled, TFB_Palette *palette, TFB_Canvas target);
void TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Canvas target, int bn, int bd); void TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, BOOLEAN scaled, int r, int g, int b, TFB_Canvas target);
#endif #endif
sc2/src/sc2code/libs/sound/mixsdl/sound_mixsdl.c
+1 -1
View File
@@ -130,4 +130,4 @@ TFB_UninitSound (void)
mixSDL_CloseAudio (); mixSDL_CloseAudio ();
} }
#endif #endif