From: DeaDDooMER Date: Mon, 13 Feb 2023 13:30:58 +0000 (+0300) Subject: gl: implement r_scale X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=20b4de5ce2b7ff04700fc2b8f421b89dc81a99b5;p=d2df-sdl.git gl: implement r_scale --- diff --git a/src/game/renders/opengl/r_map.pas b/src/game/renders/opengl/r_map.pas index eb69057..d2fa1f3 100644 --- a/src/game/renders/opengl/r_map.pas +++ b/src/game/renders/opengl/r_map.pas @@ -1386,15 +1386,56 @@ implementation end; end; - procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer; out acx, acy: Integer); - var iter: TPanelGrid.Iter; p: PPanel; cx, cy, cw, ch, xx, yy, ww, hh, ml, mt, mr, mb, mcx, mcy: Integer; sx, sy, sw, sh: LongInt; l, t, r, b: Integer; + procedure r_Map_DrawGame (xx, yy, ww, hh: Integer; player: TPlayer); + (* xx/yy/ww/hh are in map units *) + var iter: TPanelGrid.Iter; p: PPanel; begin - r_Draw_GetRect(l, t, r, b); - glTranslatef(x, y, 0); + plist.Clear; + iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, GridDrawableMask); + for p in iter do + if ((p^.tag and GridTagDoor) <> 0) = p^.door then + plist.Insert(p^); + iter.Release; + + r_Map_DrawPanelType(PANEL_BACK); + r_Map_DrawPanelType(PANEL_STEP); + r_Map_DrawItems(xx, yy, ww, hh, false); + r_Map_DrawShots(xx, yy, ww, hh); + {$IFDEF ENABLE_SHELLS} + r_Map_DrawShells(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawPlayers(xx, yy, ww, hh, player); + {$IFDEF ENABLE_GIBS} + r_Map_DrawGibs(xx, yy, ww, hh); + {$ENDIF} + {$IFDEF ENABLE_CORPSES} + r_Map_DrawCorpses(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawPanelType(PANEL_WALL); + r_Map_DrawMonsters(xx, yy, ww, hh); + r_Map_DrawItems(xx, yy, ww, hh, true); + r_Map_DrawPanelType(PANEL_CLOSEDOOR); + {$IFDEF ENABLE_GFX} + r_Map_DrawParticles(xx, yy, ww, hh); + r_Map_DrawGFX(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawFlags(xx, yy, ww, hh); + r_Map_DrawPanelType(PANEL_ACID1); + r_Map_DrawPanelType(PANEL_ACID2); + r_Map_DrawPanelType(PANEL_WATER); + r_Map_DrawPanelType(PANEL_FORE); + // TODO draw monsters health bar + // TODO draw players health bar + end; + procedure r_Map_DrawScaled (w, h, camx, camy: Integer; player: TPlayer; out acx, acy, acw, ach, axx, ayy, aww, ahh: Integer); + (* w/h/camx/camy are in map units (scaled) *) + const limit = 32767; + var cx, cy, cw, ch, xx, yy, ww, hh{, ml, mt, mr, mb}: Integer; sx, sy, sw, sh: LongInt; + begin (* camera rect *) - cx := (camx - w) + w div 2; - cy := (camy - h) + h div 2; + cx := camx - w div 2; + cy := camy - h div 2; cw := w; ch := h; @@ -1418,6 +1459,8 @@ implementation acx := cx; acy := cy; + acw := cw; + ach := ch; (* map bounds *) xx := cx; @@ -1432,7 +1475,12 @@ implementation xx := 0; if yy < 0 then yy := 0; + axx := xx; + ayy := yy; + aww := ww; + ahh := hh; +{ (* view bounds *) ml := x; mt := y; mr := x + w; mb := y + h; if FillOutsizeArea and (DebugCameraScale = 1.0) then @@ -1443,15 +1491,8 @@ implementation mb := MIN(cy + mb, gMapInfo.Height - 1) - cy; end; r_Draw_SetRect(ml, mt, mr, mb); +} - plist.Clear; - iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, GridDrawableMask); - for p in iter do - if ((p^.tag and GridTagDoor) <> 0) = p^.door then - plist.Insert(p^); - iter.Release; - - glPushMatrix; if DebugCameraScale <> 1.0 then begin glTranslatef(cw div 2, ch div 2, 0); @@ -1466,53 +1507,47 @@ implementation end; glTranslatef(-cx, -cy, 0); - r_Map_DrawPanelType(PANEL_BACK); - r_Map_DrawPanelType(PANEL_STEP); - r_Map_DrawItems(xx, yy, ww, hh, false); - r_Map_DrawShots(xx, yy, ww, hh); - {$IFDEF ENABLE_SHELLS} - r_Map_DrawShells(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawPlayers(xx, yy, ww, hh, player); - {$IFDEF ENABLE_GIBS} - r_Map_DrawGibs(xx, yy, ww, hh); - {$ENDIF} - {$IFDEF ENABLE_CORPSES} - r_Map_DrawCorpses(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawPanelType(PANEL_WALL); - r_Map_DrawMonsters(xx, yy, ww, hh); - r_Map_DrawItems(xx, yy, ww, hh, true); - r_Map_DrawPanelType(PANEL_CLOSEDOOR); - {$IFDEF ENABLE_GFX} - r_Map_DrawParticles(xx, yy, ww, hh); - r_Map_DrawGFX(xx, yy, ww, hh); - {$ENDIF} - r_Map_DrawFlags(xx, yy, ww, hh); - r_Map_DrawPanelType(PANEL_ACID1); - r_Map_DrawPanelType(PANEL_ACID2); - r_Map_DrawPanelType(PANEL_WATER); - r_Map_DrawPanelType(PANEL_FORE); - // TODO draw monsters health bar - // TODO draw players health bar + r_Map_DrawGame(xx, yy, ww, hh, player); + if FillOutsizeArea and (DebugCameraScale = 1.0) then + begin + r_Draw_FillRect(0 - limit, 0 - limit, gMapInfo.Width + limit, 0 - 1, 0, 0, 0, 255); + r_Draw_FillRect(0 - limit, 0, 0 - 1, gMapInfo.Height + limit, 0, 0, 0, 255); + r_Draw_FillRect(gMapInfo.Width, 0, gMapInfo.Width + limit, gMapInfo.Height + limit, 0, 0, 0, 255); + r_Draw_FillRect(0 - limit, gMapInfo.Height, gMapInfo.Width + limit, gMapInfo.Height + limit, 0, 0, 0, 255); + end; + glTranslatef(cx, cy, 0); + end; + + procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer; out acx, acy: Integer); + var cx, cy, cw, ch, xx, yy, ww, hh, ml, mt, mr, mb, mcx, mcy: Integer; l, t, r, b: Integer; + begin + glPushMatrix; + r_Draw_GetRect(l, t, r, b); + glTranslatef(x, y, 0); + glScalef(g_dbg_scale, g_dbg_scale, 0); + r_Draw_SetRect(x, y, x + w, y + h); + r_Map_DrawScaled(Round(w / g_dbg_scale), Round(h / g_dbg_scale), camx, camy, player, cx, cy, cw, ch, xx, yy, ww, hh); + acx := cx; + acy := cy; r_Draw_SetRect(x, y, x + w, y + h); - if gGameSettings.GameMode <> GM_SINGLE then - r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch); if DebugCameraScale <> 1.0 then begin - r_Draw_Rect (cx, cy, cx + cw, cy + ch, 0, 255, 0, 255); - r_Draw_Rect (xx, yy, xx + ww, yy + hh, 255, 0, 0, 255); + r_Draw_Rect(0, 0, cw, ch, 0, 255, 0, 255); + r_Draw_Rect(-cx + xx, -cy + yy, -cx + xx + ww, -cy + yy + hh, 255, 0, 0, 255); end; - glPopMatrix; - r_Map_DrawScreenEffects(x, y, w, h, player); + if gGameSettings.GameMode <> GM_SINGLE then + r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch); // TODO draw g_debug_player - glTranslatef(-x, -y, 0); + //glTranslatef(-x, -y, 0); r_Draw_SetRect(l, t, r, b); + glPopMatrix; + + r_Map_DrawScreenEffects(x, y, w, h, player); end; procedure r_Map_Update;