Draw the oscilloscope using gfxlib calls; dodges the ignored colormap bug

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3435 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/libs/gfxlib.h

@@ -347,7 +347,11 @@ extern FRAME SetEquFrameIndex (FRAME DstFrame, FRAME SrcFrame);
 extern FRAME IncFrameIndex (FRAME Frame);
 extern FRAME DecFrameIndex (FRAME Frame);
 extern DRAWABLE RotateFrame (FRAME Frame, int angle_deg);
-extern void SetFrameTransparentColor (FRAME Frame, Color c32k);
+extern void SetFrameTransparentColor (FRAME, Color);
+
+// If the frame is an active SCREEN_DRAWABLE, this call must be
+// preceeded by FlushGraphics() for draw commands to have taken effect
+extern Color GetFramePixel (FRAME, POINT pixelPt);
 
 extern FRAME CaptureDrawable (DRAWABLE Drawable);
 extern DRAWABLE ReleaseDrawable (FRAME Frame);

sc2/src/libs/graphics/drawable.c

@@ -257,3 +257,9 @@ SetFrameTransparentColor (FRAME Frame, Color color)
 			FALSE);
 }
 
+Color
+GetFramePixel (FRAME frame, POINT pixelPt)
+{
+	return TFB_DrawCanvas_GetPixel (frame->image->NormalImg,
+			pixelPt.x, pixelPt.y);
+}

sc2/src/libs/graphics/sdl/canvas.c

@@ -1608,20 +1608,24 @@ TFB_DrawCanvas_GetLine (TFB_Canvas canvas, int line)
 	return (uint8 *)surf->pixels + surf->pitch * line;
 }
 
-void
+Color
-TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y, Color *color)
+TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y)
 {
 	SDL_Surface* surf = (SDL_Surface *)canvas;
-	Uint8 ur, ug, ub;
 	Uint32 pixel;
 	GetPixelFn getpixel;
+	Color c = {0, 0, 0, 0};
+
+	if (x < 0 || x >= surf->w || y < 0 || y >= surf->h)
+	{	// outside bounds, return 0
+		return c;
+	}
 
 	getpixel = getpixel_for(surf);
 	pixel = (*getpixel)(surf, x, y);
-	SDL_GetRGB (pixel, surf->format, &ur, &ug, &ub);
+	SDL_GetRGBA (pixel, surf->format, &c.r, &c.g, &c.b, &c.a);
-	color->r = ur;
+
-	color->g = ug;
+	return c;
-	color->b = ub;
 }
 
 void

sc2/src/libs/graphics/tfb_draw.h

@@ -169,7 +169,7 @@ void TFB_DrawCanvas_Unlock (TFB_Canvas canvas);
 void TFB_DrawCanvas_GetScreenFormat (TFB_PixelFormat *fmt);
 int TFB_DrawCanvas_GetStride (TFB_Canvas canvas);
 void *TFB_DrawCanvas_GetLine (TFB_Canvas canvas, int line);
-void TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y, Color *color);
+Color TFB_DrawCanvas_GetPixel (TFB_Canvas canvas, int x, int y);
 
 TFB_Canvas TFB_GetScreenCanvas (SCREEN screen);
 

sc2/src/uqm/oscill.c

@@ -21,6 +21,8 @@
 // XXX: we should not refer to units.h here because we should not be
 //   using RADAR_WIDTH constants!
 #include "units.h"
+#include "setup.h"
+		// for OffScreenContext
 #include "libs/graphics/gfx_common.h"
 #include "libs/graphics/drawable.h"
 #include "libs/sound/sound.h"
@@ -29,9 +31,8 @@
 
 static FRAME scope_frame;
 static int scope_init = 0;
-static TFB_Image *scope_bg = NULL;
+static FRAME scopeWork;
-static TFB_Image *scope_surf = NULL;
+static Color scopeColor;
-static UBYTE scope_data[RADAR_WIDTH - 2];
 BOOLEAN oscillDisabled = FALSE;
 
 void
@@ -40,26 +41,16 @@ InitOscilloscope (DWORD x, DWORD y, DWORD width, DWORD height, FRAME f)
 	scope_frame = f;
 	if (!scope_init)
 	{
-		TFB_Canvas scope_bg_canvas, scope_surf_canvas;
+		EXTENT size = GetFrameBounds (scope_frame);
-		// TODO: this scope image copying does not properly account for
+		POINT midPt = {size.width / 2, size.height / 2};
-		//   the loaded colormaps. This should use regular primitives.
+
-		if (TFB_DrawCanvas_IsPaletted (scope_frame->image->NormalImg))
+		// mid-image pixel defines the color of scope lines
-		{
+		scopeColor = GetFramePixel (scope_frame, midPt);
-			scope_bg_canvas = TFB_DrawCanvas_New_Paletted (width, height,
+		
-					scope_frame->image->Palette, -1);
+		scopeWork = CaptureDrawable (CreateDrawable (
-			scope_surf_canvas = TFB_DrawCanvas_New_Paletted (width, height,
+				WANT_PIXMAP | MAPPED_TO_DISPLAY,
-					scope_frame->image->Palette, -1);
+				size.width, size.height, 1));
-		}
+
-		else
-		{
-			scope_bg_canvas = TFB_DrawCanvas_New_ForScreen (width, height,
-					FALSE);
-			scope_surf_canvas = TFB_DrawCanvas_New_ForScreen (width, height,
-					FALSE);
-		}
-		scope_bg = TFB_DrawImage_New (scope_bg_canvas);
-		scope_surf = TFB_DrawImage_New (scope_surf_canvas);
-		TFB_DrawImage_Image (scope_frame->image, 0, 0, 0, NULL, scope_bg);
 		scope_init = 1;
 	}
 	/* remove compiler warnings */
@@ -71,16 +62,8 @@ void
 UninitOscilloscope (void)
 {
 	// XXX: Is never called (BUG?)
-	if (scope_bg)
+	DestroyDrawable (ReleaseDrawable (scopeWork));
-	{
+	scopeWork = NULL;
-		TFB_DrawImage_Delete (scope_bg);
-		scope_bg = NULL;
-	}
-	if (scope_surf)
-	{
-		TFB_DrawImage_Delete (scope_surf);
-		scope_surf = NULL;
-	}
 	scope_init = 0;
 }
 
@@ -89,26 +72,49 @@ void
 DrawOscilloscope (void)
 {
 	STAMP s;
+	BYTE scope_data[RADAR_WIDTH - 2];
 
 	if (oscillDisabled)
 		return;
 
-	TFB_DrawImage_Image (scope_bg, 0, 0, 0, NULL, scope_surf);
 	if (GraphForegroundStream (scope_data, RADAR_WIDTH - 2, RADAR_HEIGHT - 2)) 
 	{
 		int i;
-		Color color;
+		CONTEXT oldContext;
 
-		TFB_DrawCanvas_GetPixel (scope_bg->NormalImg,
+		oldContext = SetContext (OffScreenContext);
-				scope_bg->extent.width / 2, scope_bg->extent.height / 2,
+		SetContextFGFrame (scopeWork);
-				&color);
+		SetContextClipRect (NULL);
-		for (i = 0; i < RADAR_WIDTH - 3; ++i)
-			TFB_DrawImage_Line (i + 1, scope_data[i] + 1, i + 2,
-					scope_data[i + 1] + 1, color, scope_surf);
-	}
-	TFB_DrawImage_Image (scope_surf, 0, 0, 0, NULL, scope_frame->image);
 		
+		// draw the background image
+		s.origin.x = 0;
+		s.origin.y = 0;
 		s.frame = scope_frame;
+		DrawStamp (&s);
+
+		// draw the scope lines
+		SetContextForeGroundColor (scopeColor);
+		for (i = 0; i < RADAR_WIDTH - 3; ++i)
+		{
+			LINE line;
+
+			line.first.x = i + 1;
+			line.first.y = scope_data[i] + 1;
+			line.second.x = i + 2;
+			line.second.y = scope_data[i + 1] + 1;
+			DrawLine (&line);
+		}
+
+		SetContext (oldContext);
+
+		s.frame = scopeWork;
+	}
+	else
+	{	// no data -- draw blank scope background
+		s.frame = scope_frame;
+	}
+
+	// draw the final scope image to screen
 	s.origin.x = 0;
 	s.origin.y = 0;
 	DrawStamp (&s);