index a1d781c5bf7f502aee87e3691457fa14f9c97657..c2b65b01dcb39c5d2b2813505cd03aa7537f0f17 100644 (file)
procedure r_Map_DrawPlayerModel (pm: TPlayerModel; x, y: Integer; alpha: Byte);
{$ENDIF}
+ procedure r_Map_Reset;
procedure r_Map_Update;
- procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer);
+ procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer; out acx, acy: Integer);
implementation
uses
+ {$I ../../../nogl/noGLuses.inc}
Math, SysUtils,
- {$IFDEF USE_GLES1}
- GLES11,
- {$ELSE}
- GL, GLEXT,
- {$ENDIF}
e_log,
binheap, MAPDEF, utils,
g_options, g_animations, g_basic, g_phys,
TMonsterAnims = array [0..ANIM_LAST, TDirection] of TGLMultiTexture;
var
+ DebugFrames: Boolean;
DebugCameraScale: Single;
+ FillOutsizeArea: Boolean;
SkyTexture: TGLTexture;
RenTextures: array of record
spec: LongInt;
r_Common_FreeAndNil(Items[i].tex);
end;
+ procedure r_Map_FreeTextures;
+ var i: Integer;
+ begin
+ plist.Clear;
+ r_Common_FreeAndNil(SkyTexture);
+ if RenTextures <> nil then
+ for i := 0 to High(RenTextures) do
+ r_Common_FreeAndNil(RenTextures[i].tex);
+ SetLength(RenTextures, 0);
+ end;
+
procedure r_Map_LoadTextures;
const DefaultAnimInfo: TAnimInfo = (loop: true; delay: 1; frames: 1; back: false);
var i, n: Integer; txt: TAnimTextInfo;
begin
+ r_Map_FreeTextures;
if Textures <> nil then
begin
n := Length(Textures);
r_Common_SetLoading(_lc[I_LOAD_TEXTURES], n);
for i := 0 to n - 1 do
begin
- txt.anim := DefaultAnimInfo;
RenTextures[i].tex := nil;
+ RenTextures[i].anim := DefaultAnimInfo;
case Textures[i].TextureName of
TEXTURE_NAME_WATER: RenTextures[i].spec := TEXTURE_SPECIAL_WATER;
TEXTURE_NAME_ACID1: RenTextures[i].spec := TEXTURE_SPECIAL_ACID1;
else
RenTextures[i].spec := 0;
RenTextures[i].tex := r_Textures_LoadMultiTextFromFile(Textures[i].FullName, txt, []);
- if RenTextures[i].tex = nil then
- e_LogWritefln('r_Map_LoadTextures: failed to load texture: %s', [Textures[i].FullName])
- else
+ if RenTextures[i].tex <> nil then
+ begin
+ RenTextures[i].anim := txt.anim;
r_Common_StepLoading(1);
+ end
+ else
+ begin
+ e_LogWritefln('r_Map_LoadTextures: failed to load texture: %s', [Textures[i].FullName]);
+ end;
end;
- RenTextures[i].anim := txt.anim;
+ ASSERT(RenTextures[i].anim.frames > 0);
+ ASSERT(RenTextures[i].anim.delay > 0);
end;
end;
if gMapInfo.SkyFullName <> '' then
plist.Clear;
end;
- procedure r_Map_FreeTextures;
- var i: Integer;
- begin
- plist.Clear;
- r_Common_FreeAndNil(SkyTexture);
- if RenTextures <> nil then
- for i := 0 to High(RenTextures) do
- r_Common_FreeAndNil(RenTextures[i].tex);
- SetLength(RenTextures, 0);
- end;
-
procedure r_Map_DrawPanel (p: TPanel);
var Texture: Integer; t: TGLMultiTexture; tex: TGLTexture; count, frame: LongInt; a: TAnimInfo;
begin
ASSERT(p <> nil);
if p.FCurTexture >= 0 then
begin
+ ASSERT(p.FCurTexture <= High(p.TextureIDs));
Texture := p.TextureIDs[p.FCurTexture].Texture;
- t := RenTextures[Texture].tex;
- if (RenTextures[Texture].spec = 0) or (t <> nil) then
+ t := nil;
+ ASSERT(Texture >= -1);
+ ASSERT(Texture <= High(RenTextures));
+ if Texture >= 0 then
begin
- count := 0; frame := 0;
- if p.AnimTime <= gTime then
+ t := RenTextures[Texture].tex;
+ if (RenTextures[Texture].spec = 0) or (t <> nil) then
begin
- a := RenTextures[Texture].anim;
- a.loop := p.AnimLoop;
- g_Anim_GetFrameByTime(a, (gTime - p.AnimTime) DIV GAME_TICK, count, frame);
+ count := 0; frame := 0;
+ if p.AnimTime <= gTime then
+ begin
+ a := RenTextures[Texture].anim;
+ a.loop := p.AnimLoop;
+ g_Anim_GetFrameByTime(a, (gTime - p.AnimTime) DIV GAME_TICK, count, frame);
+ end;
+ if t <> nil then
+ begin
+ tex := t.GetTexture(frame);
+ r_Draw_TextureRepeat(tex, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255 - p.alpha, p.blending);
+ end
+ else
+ r_Draw_TextureRepeat(nil, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255, false);
end;
- if t <> nil then
- begin
- tex := t.GetTexture(frame);
- r_Draw_TextureRepeat(tex, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255 - p.alpha, p.blending);
- end
- else
- r_Draw_TextureRepeat(nil, p.x, p.y, p.width, p.height, false, 255, 255, 255, 255, false);
end;
if t = nil then
r_Common_GetObjectPos(it.obj, xx, yy);
tex := t.GetTexture(Items[it.ItemType].frame);
r_Draw_TextureRepeat(tex, xx, yy, tex.width, tex.height, false, 255, 255, 255, 255, false);
+ if DebugFrames then
+ begin
+ r_Draw_Rect(
+ xx + it.obj.rect.x, // it.obj.x + it.obj.rect.x,
+ yy + it.obj.rect.y, // it.obj.y + it.obj.rect.y,
+ xx + it.obj.rect.x + it.obj.rect.width, // it.obj.x + it.obj.rect.x + it.obj.rect.width,
+ yy + it.obj.rect.y + it.obj.rect.height, // it.obj.y + it.obj.rect.y + it.obj.rect.height,
+ 0, 255, 0, 255
+ );
+ end;
end;
end;
end;
end;
- // TODO draw g_debug_frames
end;
function r_Map_GetMonsterTexture (m, a: Integer; d: TDirection; out t: TGLMultiTexture; out dx, dy: Integer; out flip: Boolean): Boolean;
a := mon.MonsterAnim;
d := mon.GameDirection;
+ r_Common_GetObjectPos(mon.obj, xx, yy);
if r_Map_GetMonsterTexture(m, a, d, t, dx, dy, flip) then
begin
- r_Common_GetObjectPos(mon.obj, xx, yy);
r_Draw_MultiTextureRepeat(t, mon.DirAnim[a, d], false, xx + dx, yy + dy, t.width, t.height, flip, 255, 255, 255, 255, false);
end;
-
- // TODO draw g_debug_frames
+ if DebugFrames then
+ begin
+ r_Draw_Rect(
+ xx + mon.obj.rect.x, // mon.obj.x + mon.obj.rect.x,
+ yy + mon.obj.rect.y, // mon.obj.y + mon.obj.rect.y,
+ xx + mon.obj.rect.x + mon.obj.rect.width, // mon.obj.x + mon.obj.rect.x + mon.obj.rect.width,
+ yy + mon.obj.rect.y + mon.obj.rect.height, // mon.obj.y + mon.obj.rect.y + mon.obj.rect.height,
+ 0, 255, 0, 255
+ );
+ end;
end;
procedure r_Map_DrawMonsters (x, y, w, h: Integer);
end;
procedure r_Map_DrawBubble (x, y: Integer; cb, cf: TRGB);
- var dot: Integer;
+ const w = 20; h = 14;
+ const dx = 6; dy = 8; dot = 6; size = 2;
+ const tx = 6; ty = h - 1;
begin
- // Outer borders
- r_Draw_Rect(x + 1, y, x + 18, y + 13, cb.R, cb.G, cb.B, 255);
- r_Draw_Rect(x, y + 1, x + 19, y + 12, cb.R, cb.G, cb.B, 255);
+ // Outer box (top/down)
+ r_Draw_FillRect(x + 1, y, x + w - 1, y + 1, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + 1, y + h - 1, x + w - 1, y + h, cb.R, cb.G, cb.B, 255);
+ // Outer box (left/right)
+ r_Draw_FillRect(x, y + 1, x + 1, y + h - 1, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + w - 1, y + 1, x + w, y + h - 1, cb.R, cb.G, cb.B, 255);
+ // Outer tail
+ r_Draw_FillRect(x + tx - 1, y + ty + 0, x + tx + 3 + 1, y + ty + 1, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + tx - 1, y + ty + 1, x + tx + 2 + 1, y + ty + 2, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + tx - 1, y + ty + 2, x + tx + 1 + 1, y + ty + 3, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + tx - 1, y + ty + 3, x + tx + 0 + 1, y + ty + 4, cb.R, cb.G, cb.B, 255);
+ // Inner tail
+ r_Draw_FillRect(x + tx, y + ty + 0, x + tx + 3, y + ty + 1, cf.R, cf.G, cf.B, 255);
+ r_Draw_FillRect(x + tx, y + ty + 1, x + tx + 2, y + ty + 2, cf.R, cf.G, cf.B, 255);
+ r_Draw_FillRect(x + tx, y + ty + 2, x + tx + 1, y + ty + 3, cf.R, cf.G, cf.B, 255);
// Inner box
- r_Draw_FillRect(x + 1, y + 1, x + 18, y + 12, cf.R, cf.G, cf.B, 255);
- // TODO Tail
+ r_Draw_FillRect(x + 1, y + 1, x + w - 1, y + h - 1, cf.R, cf.G, cf.B, 255);
// Dots
- dot := 6;
- r_Draw_FillRect(x + dot + 0, y + 8, x + dot + 0 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255);
- r_Draw_FillRect(x + dot + 3, y + 8, x + dot + 3 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255);
- r_Draw_FillRect(x + dot + 6, y + 8, x + dot + 6 + 1 + 1, y + 9 + 1, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + dx + 0*3, y + dy, x + dx + 0*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + dx + 1*3, y + dy, x + dx + 1*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255);
+ r_Draw_FillRect(x + dx + 2*3, y + dy, x + dx + 2*3 + size, y + dy + size, cb.R, cb.G, cb.B, 255);
end;
procedure r_Map_DrawTalkBubble (p: TPlayer);
r_Map_DrawPlayerModel(p.Model, x, y, alpha);
end;
- // TODO draw g_debug_frames
+
+ if DebugFrames then
+ begin
+ r_Draw_Rect(
+ x + p.obj.rect.x, // p.obj.x + p.obj.rect.x,
+ y + p.obj.rect.y, // p.obj.y + p.obj.rect.y,
+ x + p.obj.rect.x + p.obj.rect.width, // p.obj.x + p.obj.rect.x + p.obj.rect.width,
+ y + p.obj.rect.y + p.obj.rect.height, // p.obj.y + p.obj.rect.y + p.obj.rect.height,
+ 0, 255, 0, 255
+ );
+ end;
if (gChatBubble > 0) and p.FKeys[KEY_CHAT].Pressed and (p.Ghost = false) then
if (p.FMegaRulez[MR_INVIS] <= gTime) or ((drawed <> nil) and ((p = drawed) or (p.Team = drawed.Team) and (gGameSettings.GameMode <> GM_DM))) then
end;
end;
end;
- // TODO draw g_debug_frames
end;
{$ENDIF}
end;
end;
end;
- // TODO draw g_debug_frames
end;
{$ENDIF}
end;
end;
+ procedure r_Map_ResetGFX;
+ begin
+ SetLength(gfxlist, 0);
+ end;
+
procedure r_Map_UpdateGFX (tick: LongWord);
var i: Integer; count: LongInt;
begin
end;
procedure r_Map_DrawParticles (x, y, w, h: Integer);
- var i, fx, fy: Integer;
+ var i, fx, fy: Integer; factor: Single;
begin
if gpart_dbg_enabled and (Particles <> nil) then
begin
r_Draw_EnableTexture2D(false);
- if (g_dbg_scale < 0.6) then
+ factor := r_pixel_scale * g_dbg_scale;
+ if factor < 0.6 then
glPointSize(1)
- else if (g_dbg_scale > 1.3) then
- glPointSize(g_dbg_scale + 1)
+ else if factor > 1.3 then
+ glPointSize(factor + 1)
else
glPointSize(2);
glDisable(GL_POINT_SMOOTH);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ r_Draw_SetColor(255, 255, 255, 255);
glBegin(GL_POINTS);
for i := 0 to High(Particles) do
begin
end;
end;
glEnd;
+ r_Draw_SetColor(0, 0, 0, 255);
glDisable(GL_BLEND);
end;
g_Anim_GetFrameByTime(ShotAnim[typ].anim, (gTime - Shots[i].time) DIV GAME_TICK, count, frame);
tex := t.GetTexture(frame);
r_Draw_TextureRepeatRotate(tex, xx, yy, tex.width, tex.height, false, 255, 255, 255, 255, false, pX, pY, a);
+ if DebugFrames then
+ begin
+ r_Draw_Rect(
+ xx + Shots[i].obj.rect.x, // Shots[i].obj.x + Shots[i].obj.rect.x,
+ yy + Shots[i].obj.rect.y, // Shots[i].obj.y + Shots[i].obj.rect.y,
+ xx + Shots[i].obj.rect.x + Shots[i].obj.rect.width, // Shots[i].obj.x + Shots[i].obj.rect.x + Shots[i].obj.rect.width,
+ yy + Shots[i].obj.rect.y + Shots[i].obj.rect.height, // Shots[i].obj.y + Shots[i].obj.rect.y + Shots[i].obj.rect.height,
+ 0, 255, 0, 255
+ );
+ end;
end;
end;
end;
end;
- // TODO draw g_debug_frames
end;
procedure r_Map_DrawFlags (x, y, w, h: Integer);
if flip then dx := -1 else dx := +1;
t := FlagTextures[i];
tex := t.GetTexture(FlagFrame);
- r_Draw_TextureRepeat(tex, xx + dx, yy + 1, tex.width, tex.height, flip, 255, 255, 255, 255, false)
+ r_Draw_TextureRepeat(tex, xx + dx, yy + 1, tex.width, tex.height, flip, 255, 255, 255, 255, false);
+ if DebugFrames then
+ begin
+ r_Draw_Rect(
+ xx + gFlags[i].obj.rect.x, // gFlags[i].obj.x + gFlags[i].obj.rect.x,
+ yy + gFlags[i].obj.rect.y, // gFlags[i].obj.y + gFlags[i].obj.rect.y,
+ xx + gFlags[i].obj.rect.x + gFlags[i].obj.rect.width, // gFlags[i].obj.x + gFlags[i].obj.rect.x + gFlags[i].obj.rect.width,
+ yy + gFlags[i].obj.rect.y + gFlags[i].obj.rect.height, // gFlags[i].obj.y + gFlags[i].obj.rect.y + gFlags[i].obj.rect.height,
+ 0, 255, 0, 255
+ );
+ end;
end;
end;
end;
- // TODO g_debug_frames
end;
{$IFDEF ENABLE_SHELLS}
end;
end;
- procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer);
- var iter: TPanelGrid.Iter; p: PPanel; cx, cy, cw, ch, xx, yy, ww, hh: 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);
- r_Draw_SetRect(x, y, x + w, y + h);
- 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;
(* camera bounds *)
if g_dbg_ignore_bounds = false then
begin
- if cx + cw > gMapInfo.Width then
- cx := gMapInfo.Width - cw;
- if cy + ch > gMapInfo.Height then
- cy := gMapInfo.Height - ch;
- if cx < 0 then
+ if w > gMapInfo.Width then
+ cx := gMapInfo.Width div 2 - w div 2
+ else if cx + cw > gMapInfo.Width then
+ cx := gMapInfo.Width - cw
+ else if cx < 0 then
cx := 0;
- if cy < 0 then
+
+ if h > gMapInfo.Height then
+ cy := gMapInfo.Height div 2 - h div 2
+ else if cy + ch > gMapInfo.Height then
+ cy := gMapInfo.Height - ch
+ else if cy < 0 then
cy := 0;
end;
+ acx := cx;
+ acy := cy;
+ acw := cw;
+ ach := ch;
+
(* map bounds *)
xx := cx;
yy := cy;
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
+ begin
+ ml := MAX(cx + ml, 0) - cx;
+ mt := MAX(cy + mt, 0) - cy;
+ mr := MIN(cx + mr, gMapInfo.Width - 1) - cx;
+ 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);
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
- if gGameSettings.GameMode <> GM_SINGLE then
- r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch);
+ r_Map_DrawGame(xx, yy, ww, hh, player);
+ if FillOutsizeArea and (DebugCameraScale = 1.0) then
+ begin
+ (* top *) r_Draw_FillRect(0 - limit, 0 - limit, gMapInfo.Width + limit, 0, 0, 0, 0, 255);
+ (* left *) r_Draw_FillRect(0 - limit, 0, 0, gMapInfo.Height + limit, 0, 0, 0, 255);
+ (* right *) r_Draw_FillRect(gMapInfo.Width, 0, gMapInfo.Width + limit, gMapInfo.Height + limit, 0, 0, 0, 255);
+ (* bottom *) 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 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
+ begin
+ glTranslatef(-cx, -cy, 0);
+ r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch);
+ end;
// 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_Reset;
+ begin
+ {$IFDEF ENABLE_GFX}
+ r_Map_ResetGFX;
+ {$ENDIF}
end;
procedure r_Map_Update;
initialization
conRegVar('r_debug_camera_scale', @DebugCameraScale, 0.0001, 1000.0, '', '');
+ conRegVar('r_gl_fill_outside', @FillOutsizeArea, '', '');
+ conRegVar('d_frames', @DebugFrames, '', '');
DebugCameraScale := 1.0;
+ FillOutsizeArea := true;
+ DebugFrames := false;
end.