X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=ef0e1537d83bd8801336dab3e861d7de980bfa14;hb=61c3da024802ecc0268bab42d7499fc0346e4fd3;hp=649a258a86bc98a7694f162db566e9e9bd49fe2c;hpb=cfaefce799e67af6d8352f516a99d121b10d0cf6;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 649a258a..ef0e1537 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -27,16 +27,29 @@ (8 - frame) * ply[p].y) * TILEY / 8 \ - ((SCR_FIELDY - 1) * TILEY) / 2) +#define USE_EXTENDED_GRAPHICS_ENGINE 1 -int frame; /* current screen frame */ -int screen_x; /* current scroll position */ -int screen_y; + +#if 0 +int TILEX = ORIG_TILEX * ZOOM_FACTOR; +int TILEY = ORIG_TILEY * ZOOM_FACTOR; +#endif + +int frame; /* current screen frame */ +int screen_x, screen_y; /* current scroll position */ /* tiles currently on screen */ +#if 1 +static int screentiles[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2]; +static int crumbled_state[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2]; + +static boolean redraw[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; +#else static int screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; static int crumbled_state[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; static boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; +#endif #if 0 #if 1 @@ -52,7 +65,63 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) { int x = screen_x % (MAX_BUF_XSIZE * TILEX); int y = screen_y % (MAX_BUF_YSIZE * TILEY); + int sx, sy, sxsize, sysize; + int xsize = SXSIZE; + int ysize = SYSIZE; + int full_xsize = lev.width * TILEX; + int full_ysize = lev.height * TILEY; + + sxsize = (full_xsize < xsize ? full_xsize : xsize); + sysize = (full_ysize < ysize ? full_ysize : ysize); + sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + +#if 0 + printf("::: %d, %d\n", screenBitmap->width, screenBitmap->height); + BlitBitmap(screenBitmap, target_bitmap, 0, 0, 544, 544, SX, SY); + return; +#endif +#if 1 + if (x < 2 * TILEX && y < 2 * TILEY) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, + sxsize, sysize, sx, sy); + } + else if (x < 2 * TILEX && y >= 2 * TILEY) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, + sxsize, MAX_BUF_YSIZE * TILEY - y, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, x, 0, + sxsize, y - 2 * TILEY, + sx, sy + MAX_BUF_YSIZE * TILEY - y); + } + else if (x >= 2 * TILEX && y < 2 * TILEY) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, + MAX_BUF_XSIZE * TILEX - x, sysize, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, 0, y, + x - 2 * TILEX, sysize, + sx + MAX_BUF_XSIZE * TILEX - x, sy); + } + else + { + BlitBitmap(screenBitmap, target_bitmap, x, y, + MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, 0, y, + x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y, + sx + MAX_BUF_XSIZE * TILEX - x, sy); + BlitBitmap(screenBitmap, target_bitmap, x, 0, + MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY, + sx, sy + MAX_BUF_YSIZE * TILEY - y); + BlitBitmap(screenBitmap, target_bitmap, 0, 0, + x - 2 * TILEX, y - 2 * TILEY, + sx + MAX_BUF_XSIZE * TILEX - x, sy + MAX_BUF_YSIZE * TILEY - y); + } +#else if (x < 2 * TILEX && y < 2 * TILEY) { BlitBitmap(screenBitmap, target_bitmap, x, y, @@ -91,16 +160,28 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) x - 2 * TILEX, y - 2 * TILEY, SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y); } +#endif } -void blitscreen(void) +void BackToFront_EM(void) { + static int screen_x_last = -1, screen_y_last = -1; static boolean scrolling_last = FALSE; int left = screen_x / TILEX; int top = screen_y / TILEY; +#if 1 + boolean scrolling = (screen_x != screen_x_last || screen_y != screen_y_last); +#else boolean scrolling = (screen_x % TILEX != 0 || screen_y % TILEY != 0); +#endif int x, y; +#if 0 + printf("::: %d, %d\n", screen_x, screen_y); +#endif + + SyncDisplay(); + if (redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last) { /* blit all (up to four) parts of the scroll buffer to the backbuffer */ @@ -111,6 +192,61 @@ void blitscreen(void) } else { +#if 1 +#if 1 + boolean half_shifted_x = (screen_x % TILEX != 0); + boolean half_shifted_y = (screen_y % TILEY != 0); +#else + boolean half_shifted_x = (EVEN(SCR_FIELDX) && screen_x % TILEX != 0); + boolean half_shifted_y = (EVEN(SCR_FIELDY) && screen_y % TILEY != 0); +#endif + + int sx, sy, sxsize, sysize; + int xsize = SXSIZE; + int ysize = SYSIZE; + int full_xsize = lev.width * TILEX; + int full_ysize = lev.height * TILEY; + + sxsize = (full_xsize < xsize ? full_xsize : xsize); + sysize = (full_ysize < ysize ? full_ysize : ysize); + sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + +#if 0 +#if 1 + printf("::: %d, %d\n", EVEN(SCR_FIELDX), screen_x); +#else + half_shifted_x = TRUE; + half_shifted_y = FALSE; +#endif +#endif + + int x1 = 0, x2 = SCR_FIELDX - (half_shifted_x ? 0 : 1); + int y1 = 0, y2 = SCR_FIELDY - (half_shifted_y ? 0 : 1); + int scroll_xoffset = (half_shifted_x ? TILEX / 2 : 0); + int scroll_yoffset = (half_shifted_y ? TILEY / 2 : 0); + + InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE); + + for (x = x1; x <= x2; x++) + { + for (y = y1; y <= y2; y++) + { + int xx = (left + x) % MAX_BUF_XSIZE; + int yy = (top + y) % MAX_BUF_YSIZE; + + if (redraw[xx][yy]) + BlitBitmap(screenBitmap, window, + xx * TILEX, yy * TILEY, TILEX, TILEY, + sx + x * TILEX - scroll_xoffset, + sy + y * TILEY - scroll_yoffset); + } + } + + InitGfxClipRegion(FALSE, -1, -1, -1, -1); + +#else + for (x = 0; x < SCR_FIELDX; x++) { for (y = 0; y < SCR_FIELDY; y++) @@ -124,27 +260,66 @@ void blitscreen(void) SX + x * TILEX, SY + y * TILEY); } } +#endif } + FlushDisplay(); + for (x = 0; x < MAX_BUF_XSIZE; x++) for (y = 0; y < MAX_BUF_YSIZE; y++) redraw[x][y] = FALSE; redraw_tiles = 0; + screen_x_last = screen_x; + screen_y_last = screen_y; scrolling_last = scrolling; } -static void DrawLevelField_EM(int x, int y, int sx, int sy, - boolean draw_masked) +void blitscreen(void) +{ + BackToFront_EM(); +} + +static struct GraphicInfo_EM *getObjectGraphic(int x, int y) { int tile = Draw[y][x]; struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; + + if (!game.use_native_emc_graphics_engine) + getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - 2, y - 2); + + return g; +} + +static struct GraphicInfo_EM *getPlayerGraphic(int player_nr, int anim) +{ + struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; + + if (!game.use_native_emc_graphics_engine) + getGraphicSourcePlayerExt_EM(g, player_nr, anim, 7 - frame); + + return g; +} + +static void DrawLevelField_EM(int x, int y, int sx, int sy, + boolean draw_masked) +{ + struct GraphicInfo_EM *g = getObjectGraphic(x, y); +#if NEW_TILESIZE + int src_x = g->src_x + g->src_offset_x * TILESIZE_VAR / TILESIZE; + int src_y = g->src_y + g->src_offset_y * TILESIZE_VAR / TILESIZE; + int dst_x = sx * TILEX + g->dst_offset_x * TILESIZE_VAR / TILESIZE; + int dst_y = sy * TILEY + g->dst_offset_y * TILESIZE_VAR / TILESIZE; + int width = g->width * TILESIZE_VAR / TILESIZE; + int height = g->height * TILESIZE_VAR / TILESIZE; +#else int src_x = g->src_x + g->src_offset_x; int src_y = g->src_y + g->src_offset_y; int dst_x = sx * TILEX + g->dst_offset_x; int dst_y = sy * TILEY + g->dst_offset_y; int width = g->width; int height = g->height; +#endif int left = screen_x / TILEX; int top = screen_y / TILEY; @@ -177,8 +352,12 @@ static void DrawLevelField_EM(int x, int y, int sx, int sy, static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, int crm, boolean draw_masked) { - int tile = Draw[y][x]; - struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; +#if 1 + struct GraphicInfo_EM *g; +#else + struct GraphicInfo_EM *g = getObjectGraphic(x, y); +#endif + int crumbled_border_size; int left = screen_x / TILEX; int top = screen_y / TILEY; int i; @@ -191,6 +370,23 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, if (crm == 0) /* no crumbled edges for this tile */ return; +#if 1 + g = getObjectGraphic(x, y); +#endif + + crumbled_border_size = g->crumbled_border_size; + +#if NEW_TILESIZE + crumbled_border_size = crumbled_border_size * TILESIZE_VAR / TILESIZE; +#endif + +#if 0 + if (x == 3 && y == 3 && frame == 0) + printf("::: %d, %d\n", + graphic_info_em_object[207][0].crumbled_src_x, + graphic_info_em_object[207][0].crumbled_src_y); +#endif + for (i = 0; i < 4; i++) { if (crm & (1 << i)) @@ -199,17 +395,17 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, if (i == 1 || i == 2) { - width = g->crumbled_border_size; + width = crumbled_border_size; height = TILEY; - cx = (i == 2 ? TILEX - g->crumbled_border_size : 0); + cx = (i == 2 ? TILEX - crumbled_border_size : 0); cy = 0; } else { width = TILEX; - height = g->crumbled_border_size; + height = crumbled_border_size; cx = 0; - cy = (i == 3 ? TILEY - g->crumbled_border_size : 0); + cy = (i == 3 ? TILEY - crumbled_border_size : 0); } if (width > 0 && height > 0) @@ -237,8 +433,7 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim, boolean draw_masked) { - struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; - + struct GraphicInfo_EM *g = getPlayerGraphic(player_nr, anim); int src_x = g->src_x, src_y = g->src_y; int dst_x, dst_y; @@ -316,6 +511,12 @@ static void animscreen(void) { 0, +1 } }; + if (!game.use_native_emc_graphics_engine) + for (y = 2; y < EM_MAX_CAVE_HEIGHT - 2; y++) + for (x = 2; x < EM_MAX_CAVE_WIDTH - 2; x++) + SetGfxAnimation_EM(&graphic_info_em_object[Draw[y][x]][frame], + Draw[y][x], 7 - frame, x - 2, y - 2); + for (y = top; y < top + MAX_BUF_YSIZE; y++) { for (x = left; x < left + MAX_BUF_XSIZE; x++) @@ -326,6 +527,7 @@ static void animscreen(void) struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; int obj = g->unique_identifier; int crm = 0; + boolean redraw_screen_tile = FALSE; /* re-calculate crumbled state of this tile */ if (g->has_crumbled_graphics) @@ -347,8 +549,17 @@ static void animscreen(void) } } + redraw_screen_tile = (screentiles[sy][sx] != obj || + crumbled_state[sy][sx] != crm); + +#if 0 + /* !!! TEST ONLY -- CHANGE THIS !!! */ + if (!game.use_native_emc_graphics_engine) + redraw_screen_tile = TRUE; +#endif + /* only redraw screen tiles if they (or their crumbled state) changed */ - if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm) + if (redraw_screen_tile) { DrawLevelField_EM(x, y, sx, sy, FALSE); DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); @@ -382,6 +593,10 @@ static void blitplayer(struct PLAYER *ply) x2 = x1 + TILEX - 1; y2 = y1 + TILEY - 1; +#if 0 + printf("::: %d, %d\n", x1, y1); +#endif + if ((int)(x2 - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) && (int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1)) { @@ -443,9 +658,14 @@ static void blitplayer(struct PLAYER *ply) DrawLevelField_EM(new_x, new_y, new_sx, new_sy, TRUE); } - /* mark screen tiles as dirty */ + /* redraw screen tiles in the next frame (player may have left the tiles) */ screentiles[old_sy][old_sx] = -1; screentiles[new_sy][new_sx] = -1; + + /* mark screen tiles as dirty (force screen refresh with changed content) */ + redraw[old_sx][old_sy] = TRUE; + redraw[new_sx][new_sy] = TRUE; + redraw_tiles += 2; } } @@ -492,7 +712,7 @@ void DrawRelocatePlayer(struct PlayerInfo *player, boolean quick_relocation) if (quick_relocation) { - int offset = (setup.scroll_delay ? 3 : 0); + int offset = game.scroll_delay_value; if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) { @@ -690,12 +910,13 @@ void RedrawPlayfield_EM(boolean force_redraw) int game.centered_player_nr_next = getCenteredPlayerNr_EM(); #endif #if 1 - int player_nr = getMaxCenterDistancePlayerNr(screen_x, screen_y); + int max_center_distance_player_nr = + getMaxCenterDistancePlayerNr(screen_x, screen_y); #else int player_nr = game_em.last_moving_player; #endif int stepsize = TILEX / 8; - int offset = (setup.scroll_delay ? 3 : 0) * TILEX; + int offset = game.scroll_delay_value * TILEX; int offset_x = offset; int offset_y = offset; int screen_x_old = screen_x; @@ -757,8 +978,8 @@ void RedrawPlayfield_EM(boolean force_redraw) else { #if 1 - sx = PLAYER_SCREEN_X(player_nr); - sy = PLAYER_SCREEN_Y(player_nr); + sx = PLAYER_SCREEN_X(max_center_distance_player_nr); + sy = PLAYER_SCREEN_Y(max_center_distance_player_nr); #else sx = PLAYER_SCREEN_X(game_em.last_moving_player); sy = PLAYER_SCREEN_Y(game_em.last_moving_player); @@ -787,9 +1008,9 @@ void RedrawPlayfield_EM(boolean force_redraw) if (draw_new_player_location && !quick_relocation) { #if 1 - unsigned long game_frame_delay_value = getGameFrameDelay_EM(20); + unsigned int game_frame_delay_value = getGameFrameDelay_EM(20); #else - unsigned long game_frame_delay_value = getGameFrameDelay_EM(25); + unsigned int game_frame_delay_value = getGameFrameDelay_EM(25); #endif int wait_delay_value = game_frame_delay_value; int screen_xx = VALID_SCREEN_X(sx); @@ -868,14 +1089,16 @@ void RedrawPlayfield_EM(boolean force_redraw) blitplayer(&ply[i]); blitscreen(); - FlushDisplay(); + Delay(wait_delay_value); /* scroll second step to align at full tile size */ screen_x -= dxx; screen_y -= dyy; +#if 0 SyncDisplay(); +#endif animscreen(); @@ -883,7 +1106,7 @@ void RedrawPlayfield_EM(boolean force_redraw) blitplayer(&ply[i]); blitscreen(); - FlushDisplay(); + Delay(wait_delay_value); } @@ -911,7 +1134,36 @@ void RedrawPlayfield_EM(boolean force_redraw) sy - offset_y > screen_y ? sy - offset_y : screen_y); +#if 0 + printf("::: (%d, %d) => (%d, %d) [(%d, %d), (%d, %d)] [%d, %d] [%d / %d]\n", + screen_x_old, screen_y_old, + screen_x, screen_y, + ply[max_center_distance_player_nr].oldx, + ply[max_center_distance_player_nr].x, + ply[max_center_distance_player_nr].oldy, + ply[max_center_distance_player_nr].y, + sx, sy, + ABS(screen_x - screen_x_old), + ABS(screen_y - screen_y_old)); +#endif + +#if 1 + #if 1 + /* prevent scrolling further than double player step size when scrolling */ + if (ABS(screen_x - screen_x_old) > 2 * stepsize) + { + int dx = SIGN(screen_x - screen_x_old); + + screen_x = screen_x_old + dx * 2 * stepsize; + } + if (ABS(screen_y - screen_y_old) > 2 * stepsize) + { + int dy = SIGN(screen_y - screen_y_old); + + screen_y = screen_y_old + dy * 2 * stepsize; + } +#else /* prevent scrolling further than double player step size when scrolling */ if (ABS(screen_x - screen_x_old) > 2 * stepsize || ABS(screen_y - screen_y_old) > 2 * stepsize) @@ -922,6 +1174,8 @@ void RedrawPlayfield_EM(boolean force_redraw) screen_x = screen_x_old + dx * 2 * stepsize; screen_y = screen_y_old + dy * 2 * stepsize; } +#endif + #else /* prevent scrolling further than player step size when scrolling */ if (ABS(screen_x - screen_x_old) > stepsize || @@ -976,6 +1230,8 @@ void RedrawPlayfield_EM(boolean force_redraw) #if 0 int player_nr = game_em.last_moving_player; #endif + int player_nr = (game.centered_player_nr == -1 ? + max_center_distance_player_nr : game.centered_player_nr); int player_move_dir = game_em.last_player_direction[player_nr]; int dx = SIGN(screen_x - screen_x_old); int dy = SIGN(screen_y - screen_y_old); @@ -994,11 +1250,13 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); +#if 0 +#if 0 SyncDisplay(); +#endif blitscreen(); - - FlushDisplay(); +#endif } void game_animscreen(void) @@ -1008,12 +1266,47 @@ void game_animscreen(void) void DrawGameDoorValues_EM() { +#if 1 + int dynamite_state; + int key_state; +#else int dynamite_state = ply[0].dynamite; /* !!! ONLY PLAYER 1 !!! */ - int all_keys_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; + int key_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; +#endif + +#if 1 + if (game.centered_player_nr == -1) + { +#if 1 + int i; + + dynamite_state = 0; + key_state = 0; + + for (i = 0; i < MAX_PLAYERS; i++) + { + dynamite_state += ply[i].dynamite; + key_state |= ply[i].keys; + } + +#else + + dynamite_state = ply[0].dynamite; /* !!! ONLY PLAYER 1 !!! */ + key_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; +#endif + } + else + { + int player_nr = game.centered_player_nr; + + dynamite_state = ply[player_nr].dynamite; + key_state = ply[player_nr].keys; + } +#endif #if 1 DrawAllGameValues(lev.required, dynamite_state, lev.score, - lev.time, all_keys_state); + lev.time, key_state); #else DrawAllGameValues(lev.required, ply1.dynamite, lev.score, DISPLAY_TIME(lev.time), ply1.keys | ply2.keys);