From d1eb03c63b0eaa2fd1bfa97d4b68ef678aa07bd2 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 17 Jun 2010 01:42:32 +0200 Subject: [PATCH] rnd-20100617-1-src * added tape panel graphics and screen positions to graphics config --- ChangeLog | 3 + src/conf_gfx.c | 8 +-- src/conftime.h | 2 +- src/tape.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 157 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 491cf301..1c841f25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2010-06-16 + * added tape panel graphics and screen positions to graphics config + 2010-06-15 * added compatibility stuff for redefined "global.door" (which affects all parts of that image that have their own graphics definition now) diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1e318e41..45987920 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -6590,7 +6590,7 @@ struct ConfigInfo image_config[] = { "tape.symbol.pause.x", "40" }, { "tape.symbol.pause.y", "41" }, { "tape.symbol.record.x", "25" }, - { "tape.symbol.record.y", "5" }, + { "tape.symbol.record.y", "41" }, { "tape.symbol.play.x", "57" }, { "tape.symbol.play.y", "41" }, { "tape.symbol.fast_forward.x", "39" }, @@ -6611,13 +6611,13 @@ struct ConfigInfo image_config[] = { "tape.label.pause.x", "5" }, { "tape.label.pause.y", "61" }, { "tape.label.record.x", "5" }, - { "tape.label.record.y", "5" }, + { "tape.label.record.y", "41" }, { "tape.label.play.x", "70" }, { "tape.label.play.y", "41" }, { "tape.label.fast_forward.x", "5" }, { "tape.label.fast_forward.y", "42" }, - { "tape.label.warp_forward.x", "5" }, - { "tape.label.warp_forward.y", "42" }, + { "tape.label.warp_forward.x", "-1" }, + { "tape.label.warp_forward.y", "-1" }, { "tape.label.warp_forward_blind.x", "5" }, { "tape.label.warp_forward_blind.y", "42" }, { "tape.label.pause_before_end.x", "5" }, diff --git a/src/conftime.h b/src/conftime.h index 8fce68a3..21a2f126 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2010-06-16 16:44" +#define COMPILE_DATE_STRING "2010-06-17 01:39" diff --git a/src/tape.c b/src/tape.c index e9868159..bc258b66 100644 --- a/src/tape.c +++ b/src/tape.c @@ -194,6 +194,8 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" }; + +#if 0 static struct { int gd_x1, gd_y1; @@ -344,9 +346,129 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) } }, }; +#endif + +#if 1 + static struct + { + int graphic; + struct Rect *pos; + } + video_pos[NUM_TAPE_FUNCTIONS][NUM_TAPE_FUNCTION_PARTS] = + { + { + { IMG_TAPE_LABEL_GFX_PLAY, &tape.label.play }, + { IMG_TAPE_SYMBOL_GFX_PLAY, &tape.symbol.play }, + }, + { + { IMG_TAPE_LABEL_GFX_RECORD, &tape.label.record }, + { IMG_TAPE_SYMBOL_GFX_RECORD, &tape.symbol.record }, + }, + { + { IMG_TAPE_LABEL_GFX_PAUSE, &tape.label.pause }, + { IMG_TAPE_SYMBOL_GFX_PAUSE, &tape.symbol.pause }, + }, + { + { IMG_TAPE_LABEL_GFX_DATE, &tape.label.date }, + { -1, NULL }, + }, + { + { IMG_TAPE_LABEL_GFX_TIME, &tape.label.time }, + { -1, NULL }, + }, + { + { IMG_TAPE_LABEL_GFX_FAST_FORWARD, &tape.label.fast_forward }, + { IMG_TAPE_SYMBOL_GFX_FAST_FORWARD, &tape.symbol.fast_forward }, + }, + { + { IMG_TAPE_LABEL_GFX_PAUSE_BEFORE_END, &tape.label.pause_before_end }, + { IMG_TAPE_SYMBOL_GFX_PAUSE_BEFORE_END, &tape.symbol.pause_before_end }, + }, + { + { IMG_TAPE_LABEL_GFX_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind}, + { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind}, + }, + { + { IMG_TAPE_LABEL_GFX_WARP_FORWARD, &tape.label.warp_forward }, + { IMG_TAPE_SYMBOL_GFX_WARP_FORWARD, &tape.symbol.warp_forward }, + }, + { + { IMG_TAPE_LABEL_GFX_SINGLE_STEP, &tape.label.single_step }, + { IMG_TAPE_SYMBOL_GFX_SINGLE_STEP, &tape.symbol.single_step }, + }, + }; + + for (k = 0; k < NUM_TAPE_FUNCTION_STATES; k++) /* on or off states */ + { + for (i = 0; i < NUM_TAPE_FUNCTIONS; i++) /* record, play, ... */ + { + for (j = 0; j < NUM_TAPE_FUNCTION_PARTS; j++) /* label or symbol */ + { + if (video_pos[i][j].graphic == -1 || + video_pos[i][j].pos->x < 0 || + video_pos[i][j].pos->y < 0) + continue; #if 0 - /* !!! ADD NEW STUFF HERE :-) !!! */ + printf("::: %d: %d, %ld\n", + i, + video_pos[i][j].graphic, + graphic_info[video_pos[i][j].graphic].bitmap); +#endif + +#if 0 + if (i < 9) + continue; +#endif + + if (state & (1 << (i * 2 + k))) + { + struct GraphicInfo *gfx_bg = &graphic_info[IMG_BACKGROUND_TAPE]; + struct GraphicInfo *gfx = &graphic_info[video_pos[i][j].graphic]; + struct Rect *pos = video_pos[i][j].pos; + Bitmap *gd_bitmap; + int gd_x, gd_y; + int skip_value = + (j == 0 ? VIDEO_DISPLAY_SYMBOL_ONLY : VIDEO_DISPLAY_LABEL_ONLY); + + if (value == skip_value) + continue; + + if (k == 1) /* on */ + { + gd_bitmap = gfx->bitmap; + gd_x = gfx->src_x; + gd_y = gfx->src_y; + } + else /* off */ + { + gd_bitmap = gfx_bg->bitmap; + gd_x = gfx_bg->src_x + pos->x; + gd_y = gfx_bg->src_y + pos->y; + } + +#if 0 + printf("::: %d (%d): %d, %ld - %d [%d] [%d] [%d]\n", + i, k, + video_pos[i][j].graphic, + graphic_info[video_pos[i][j].graphic].bitmap, + gfx->bitmap, + gd_bitmap, + (gd_bitmap == NULL), + 0); + + if (gd_bitmap == NULL) + printf("::: gfx %d skipped\n", video_pos[i][j].graphic); +#endif + + /* some tape graphics may be undefined -- only draw if defined */ + if (gd_bitmap != NULL) + BlitBitmap(gd_bitmap, drawto, gd_x, gd_y, gfx->width, gfx->height, + VX + pos->x, VY + pos->y); + } + } + } + } #else @@ -386,6 +508,31 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) } #endif +#if 1 + if (state & VIDEO_STATE_DATE_ON) + { + struct TextPosInfo *pos = &tape.text.date; + int tag = value % 100; + int monat = (value/100) % 100; + int jahr = (value/10000); + + DrawText(VX + pos->x, VY + pos->y, int2str(tag, 2), pos->font); + DrawText(VX + pos->x + 27, VY + pos->y, monatsname[monat], pos->font); + DrawText(VX + pos->x + 64, VY + pos->y, int2str(jahr, 2), pos->font); + } + + if (state & VIDEO_STATE_TIME_ON) + { + struct TextPosInfo *pos = &tape.text.time; + int min = value / 60; + int sec = value % 60; + + DrawText(VX + pos->x, VY + pos->y, int2str(min, 2), pos->font); + DrawText(VX + pos->x + 27, VY + pos->y, int2str(sec, 2), pos->font); + } + +#else + if (state & VIDEO_STATE_DATE_ON) { int tag = value % 100; @@ -410,6 +557,7 @@ void DrawVideoDisplay(unsigned long state, unsigned long value) DrawText(VX + VIDEO_TIME_XPOS + 27, VY + VIDEO_TIME_YPOS, int2str(sec, 2), FONT_TAPE_RECORDER); } +#endif redraw_mask |= REDRAW_DOOR_2; } -- 2.34.1