index 2ca87d7ec2431ca5bfe12c71a1f3c533f469641a..f27043e12a0cb26addf19793eddde58ad44bb6ba 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
+ UseAccel: Boolean;
+ DebugFrames: Boolean;
+ DebugHealth: Boolean;
DebugCameraScale: Single;
+ FillOutsizeArea: Boolean;
SkyTexture: TGLTexture;
RenTextures: array of record
spec: LongInt;
class function TBinHeapPanelDrawCmp.less (const a, b: TPanel): Boolean; inline;
begin
- if a.tag < b.tag then begin result := true; exit; end;
- if a.tag > b.tag then begin result := false; exit; end;
- result := a.arrIdx < b.arrIdx;
+ if a.tag < b.tag then result := true
+ else if a.tag > b.tag then result := false
+ else result := a.arrIdx < b.arrIdx;
end;
procedure r_Map_Initialize;
procedure r_Map_Finalize;
begin
- plist.Free;
+ r_Common_FreeAndNil(plist);
FlagFrame := 0;
end;
begin
for a := A_STAND to A_LAST do
begin
- if Models[i].anim[d, a].base <> nil then
- Models[i].anim[d, a].base.Free;
- if Models[i].anim[d, a].mask <> nil then
- Models[i].anim[d, a].mask.Free;
- Models[i].anim[d, a].base := nil;
- Models[i].anim[d, a].mask := nil;
+ r_Common_FreeAndNil(Models[i].anim[d, a].base);
+ r_Common_FreeAndNil(Models[i].anim[d, a].mask);
end;
end;
{$IFDEF ENABLE_GIBS}
if Models[i].gibs.base <> nil then
for a := 0 to High(Models[i].gibs.base) do
- Models[i].gibs.base[a].Free;
+ r_Common_FreeAndNil(Models[i].gibs.base[a]);
if Models[i].gibs.mask <> nil then
for a := 0 to High(Models[i].gibs.mask) do
- Models[i].gibs.mask[a].Free;
+ r_Common_FreeAndNil(Models[i].gibs.mask[a]);
Models[i].gibs.base := nil;
Models[i].gibs.mask := nil;
Models[i].gibs.rect := nil;
Models[i].anim[d, a].base := nil;
Models[i].anim[d, a].mask := nil;
if m.anim[d, a].resource <> '' then
- Models[i].anim[d, a].base := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].resource, 64, 64, m.anim[d, a].frames, true);
+ Models[i].anim[d, a].base := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].resource, 64, 64, m.anim[d, a].frames, [TGLHints.txNoRepeat], true);
if m.anim[d, a].mask <> '' then
- Models[i].anim[d, a].mask := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].mask, 64, 64, m.anim[d, a].frames, true);
+ Models[i].anim[d, a].mask := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].mask, 64, 64, m.anim[d, a].frames, [TGLHints.txNoRepeat], true);
end
end;
{$IFDEF ENABLE_GIBS}
SetLength(Models[i].gibs.rect, m.GibsCount);
for a := 0 to m.GibsCount - 1 do
Models[i].gibs.rect[a] := DefaultGibSize;
- if r_Textures_LoadStreamFromFile(prefix + m.GibsResource, 32, 32, m.GibsCount, m.GibsCount, Models[i].gibs.base, Models[i].gibs.rect) then
+ if r_Textures_LoadStreamFromFile(prefix + m.GibsResource, 32, 32, m.GibsCount, m.GibsCount, Models[i].gibs.base, Models[i].gibs.rect, [TGLHints.txNoRepeat]) then
begin
- if r_Textures_LoadStreamFromFile(prefix + m.GibsMask, 32, 32, m.GibsCount, m.GibsCount, Models[i].gibs.mask, nil) then
+ if r_Textures_LoadStreamFromFile(prefix + m.GibsMask, 32, 32, m.GibsCount, m.GibsCount, Models[i].gibs.mask, nil, [TGLHints.txNoRepeat]) then
begin
// ok
end;
w,
h,
count,
+ [TGLHints.txNoRepeat],
False
);
end
ItemAnim[i].w,
ItemAnim[i].h,
ItemAnim[i].anim.frames,
+ [TGLHints.txNoRepeat],
false
);
Items[i].frame := 0;
r_Map_LoadMonsterAnim(i, j, d);
r_Common_StepLoading(1);
end;
- VileFire := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/FIRE', 64, 128, VileFireAnim.frames);
+ VileFire := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/FIRE', 64, 128, VileFireAnim.frames, [TGLHints.txNoRepeat]);
// --------- player models --------- //
if PlayerModelsArray <> nil then
begin
begin
for j := 0 to W_POS_LAST do
for k := 0 to W_ACT_LAST do
- WeapTextures[i, j, k] := r_Textures_LoadFromFile(GameWAD + ':WEAPONS\' + WeapName[i] + WeapPos[j] + WeapAct[k]);
+ WeapTextures[i, j, k] := r_Textures_LoadFromFile(GameWAD + ':WEAPONS\' + WeapName[i] + WeapPos[j] + WeapAct[k], [TGLHints.txNoRepeat]);
r_Common_StepLoading(1);
end;
// --------- gfx animations --------- //
for i := 1 to R_GFX_LAST do
begin
if GFXAnim[i].anim.frames > 0 then
- GFXTextures[i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/' + GFXAnim[i].name, GFXAnim[i].w, GFXAnim[i].h, GFXAnim[i].anim.frames);
+ GFXTextures[i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/' + GFXAnim[i].name, GFXAnim[i].w, GFXAnim[i].h, GFXAnim[i].anim.frames, [TGLHints.txNoRepeat]);
end;
{$ENDIF}
// --------- shots --------- //
for i := 0 to WEAPON_LAST do
begin
if ShotAnim[i].anim.frames > 0 then
- ShotTextures[i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/' + ShotAnim[i].name, ShotAnim[i].w, ShotAnim[i].h, ShotAnim[i].anim.frames);
+ ShotTextures[i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/' + ShotAnim[i].name, ShotAnim[i].w, ShotAnim[i].h, ShotAnim[i].anim.frames, [TGLHints.txNoRepeat]);
end;
// --------- flags --------- //
r_Common_SetLoading('Flags', 2);
FlagTextures[FLAG_NONE] := nil;
- FlagTextures[FLAG_RED] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGRED', 64, 64, 5);
- FlagTextures[FLAG_BLUE] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGBLUE', 64, 64, 5);
- // FlagTextures[FLAG_DOM] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGDOM', 64, 64, 8);
+ FlagTextures[FLAG_RED] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGRED', 64, 64, 5, [TGLHints.txNoRepeat]);
+ FlagTextures[FLAG_BLUE] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGBLUE', 64, 64, 5, [TGLHints.txNoRepeat]);
+ // FlagTextures[FLAG_DOM] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGDOM', 64, 64, 8, [TGLHints.txNoRepeat]);
// --------- shells --------- //
{$IFDEF ENABLE_SHELLS}
r_Common_SetLoading('Shells', SHELL_LAST + 1);
for i := 0 to SHELL_LAST do
- ShellTextures[i] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/' + ShellAnim[i].name);
+ ShellTextures[i] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/' + ShellAnim[i].name, [TGLHints.txNoRepeat]);
{$ENDIF}
// --------- other --------- //
r_Common_SetLoading('Effects', 3 * 2 + 3);
for b := false to true do
begin
for i := 0 to 2 do
- PunchTextures[b, i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':WEAPONS/' + PunchName[b] + WeapPos[i], 64, 64, PunchAnim.frames);
+ PunchTextures[b, i] := r_Common_LoadTextureMultiFromFileAndInfo(GameWad + ':WEAPONS/' + PunchName[b] + WeapPos[i], 64, 64, PunchAnim.frames, [TGLHints.txNoRepeat]);
end;
- InvulPenta := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/PENTA');
- IndicatorTexture := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/PLRIND');
- TalkTexture := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/TALKBUBBLE');
+ InvulPenta := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/PENTA', [TGLHints.txNoRepeat]);
+ IndicatorTexture := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/PLRIND', [TGLHints.txNoRepeat]);
+ TalkTexture := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/TALKBUBBLE', [TGLHints.txNoRepeat]);
end;
procedure r_Map_Free;
var i, j, k: Integer; d: TDirection; b: Boolean;
begin
- if TalkTexture <> nil then
- TalkTexture.Free;
- if IndicatorTexture <> nil then
- IndicatorTexture.Free;
- if InvulPenta <> nil then
- InvulPenta.Free;
- InvulPenta := nil;
+ r_Common_FreeAndNil(TalkTexture);
+ r_Common_FreeAndNil(IndicatorTexture);
+ r_Common_FreeAndNil(InvulPenta);
for b := false to true do
- begin
for i := 0 to 2 do
- begin
- if PunchTextures[b, i] <> nil then
- PunchTextures[b, i].Free;
- PunchTextures[b, i] := nil;
- end;
- end;
+ r_Common_FreeAndNil(PunchTextures[b, i]);
{$IFDEF ENABLE_SHELLS}
for i := 0 to SHELL_LAST do
- begin
- if ShellTextures[i] <> nil then
- ShellTextures[i].Free;
- ShellTextures[i] := nil;
- end;
+ r_Common_FreeAndNil(ShellTextures[i]);
{$ENDIF}
for i := 0 to FLAG_LAST do
- begin
- if FlagTextures[i] <> nil then
- FlagTextures[i].Free;
- FlagTextures[i] := nil;
- end;
+ r_Common_FreeAndNil(FlagTextures[i]);
for i := 0 to WEAPON_LAST do
- begin
- if ShotTextures[i] <> nil then
- ShotTextures[i].Free;
- ShotTextures[i] := nil;
- end;
+ r_Common_FreeAndNil(ShotTextures[i]);
{$IFDEF ENABLE_GFX}
- gfxlist := nil;
+ SetLength(gfxlist, 0);
for i := 0 to R_GFX_LAST do
- begin
- if GFXTextures[i] <> nil then
- GFXTextures[i].Free;
- GFXTextures[i] := nil;
- end;
+ r_Common_FreeAndNil(GFXTextures[i]);
{$ENDIF}
for i := 1 to WP_LAST do
- begin
for j := 0 to W_POS_LAST do
- begin
for k := 0 to W_ACT_LAST do
- begin
- if WeapTextures[i, j, k] <> nil then
- WeapTextures[i, j, k].Free;
- WeapTextures[i, j, k] := nil;
- end;
- end;
- end;
+ r_Common_FreeAndNil(WeapTextures[i, j, k]);
if Models <> nil then
for i := 0 to High(Models) do
r_Map_FreeModel(i);
for i := MONSTER_DEMON to MONSTER_MAN do
- begin
for j := 0 to ANIM_LAST do
- begin
for d := TDirection.D_LEFT to TDirection.D_RIGHT do
- begin
- if MonTextures[i, j, d] <> nil then
- MonTextures[i, j, d].Free;
- MonTextures[i, j, d] := nil;
- end;
- end;
- end;
+ r_Common_FreeAndNil(MonTextures[i, j, d]);
for i := 0 to ITEM_LAST do
- begin
- if Items[i].tex <> nil then
- Items[i].tex.Free;
- Items[i].tex := nil;
- end;
+ 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;
TEXTURE_NAME_ACID2: RenTextures[i].spec := TEXTURE_SPECIAL_ACID2;
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
+ RenTextures[i].tex := r_Textures_LoadMultiTextFromFile(Textures[i].FullName, txt, []);
+ 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
begin
r_Common_SetLoading(_lc[I_LOAD_SKY], 1);
- SkyTexture := r_Common_LoadTextureFromFile(gMapInfo.SkyFullName);
+ SkyTexture := r_Common_LoadTextureFromFile(gMapInfo.SkyFullName, [TGLHints.txNoRepeat]);
end;
plist.Clear;
end;
- procedure r_Map_FreeTextures;
- var i: Integer;
- begin
- plist.Clear;
- if SkyTexture <> nil then
- SkyTexture.Free;
- SkyTexture := nil;
- if RenTextures <> nil then
- for i := 0 to High(RenTextures) do
- if RenTextures[i].tex <> nil then
- RenTextures[i].tex.Free;
- RenTextures := nil;
- end;
-
procedure r_Map_DrawPanel (p: TPanel);
- var Texture: Integer; t: TGLMultiTexture; tex: TGLTexture; count, frame: LongInt; a: TAnimInfo;
+ var Texture, x, y, w, h: Integer; t: TGLMultiTexture; count, frame: LongInt; a: TAnimInfo;
begin
ASSERT(p <> nil);
+ ASSERT(p.FCurTexture >= -1); (* p.FCurTexture = -1 -> invisible texture *)
if p.FCurTexture >= 0 then
begin
+ r_Common_GetPanelPos(p, x, y, w, h);
+ 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
+ ASSERT(Texture >= -1); (* Texture = -1 -> texture not found *)
+ if Texture >= 0 then
begin
- 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;
+ ASSERT(Texture <= High(RenTextures));
+ t := RenTextures[Texture].tex;
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);
+ 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;
+ r_Draw_TextureRepeat(t.GetTexture(frame), x, y, w, h, 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);
+ else if RenTextures[Texture].spec = 0 then
+ begin
+ r_Draw_TextureRepeat(nil, x, y, w, h, false, 255, 255, 255, 255, false);
+ end;
+ case RenTextures[Texture].spec of
+ TEXTURE_SPECIAL_WATER: r_Draw_Filter(x, y, x + w, y + h, 0, 0, 255, 255);
+ TEXTURE_SPECIAL_ACID1: r_Draw_Filter(x, y, x + w, y + h, 0, 230, 0, 255);
+ TEXTURE_SPECIAL_ACID2: r_Draw_Filter(x, y, x + w, y + h, 230, 0, 0, 255);
+ end;
+ end
+ else
+ begin
+ r_Draw_TextureRepeat(nil, x, y, w, h, false, 255, 255, 255, 255, false);
end;
+ end;
+ end;
- if t = nil then
+ procedure r_Map_DrawPanels (constref panels: TPanelArray; drawDoors: Boolean = false);
+ var i: Integer; p: TPanel;
+ begin
+ if panels <> nil then
+ begin
+ for i := 0 to High(panels) do
begin
- case RenTextures[Texture].spec of
- TEXTURE_SPECIAL_WATER: r_Draw_Filter(p.x, p.y, p.x + p.width, p.y + p.height, 0, 0, 255, 255);
- TEXTURE_SPECIAL_ACID1: r_Draw_Filter(p.x, p.y, p.x + p.width, p.y + p.height, 0, 230, 0, 255);
- TEXTURE_SPECIAL_ACID2: r_Draw_Filter(p.x, p.y, p.x + p.width, p.y + p.height, 230, 0, 0, 255);
- end
- end
- end
+ p := panels[i];
+ if p.enabled and not (drawDoors xor p.door) then
+ r_Map_DrawPanel(p);
+ end;
+ end;
end;
procedure r_Map_DrawPanelType (panelTyp: DWORD);
- var tagMask, i: Integer; p: TPanel;
+ var tagMask: Integer; p: TPanel;
begin
- i := 0;
- tagMask := PanelTypeToTag(panelTyp);
- while plist.count > 0 do
+ if UseAccel then
begin
- p := TPanel(plist.Front());
- if (p.tag and tagMask) = 0 then
- break;
- r_Map_DrawPanel(p);
- Inc(i);
- plist.PopFront
+ tagMask := PanelTypeToTag(panelTyp);
+ while plist.count > 0 do
+ begin
+ p := TPanel(plist.Front());
+ if (p.tag and tagMask) = 0 then
+ break;
+ r_Map_DrawPanel(p);
+ plist.PopFront;
+ end;
+ end
+ else
+ begin
+ case panelTyp of
+ PANEL_BACK: if g_rlayer_back then r_Map_DrawPanels(gRenderBackgrounds);
+ PANEL_STEP: if g_rlayer_step then r_Map_DrawPanels(gSteps);
+ PANEL_WALL: if g_rlayer_wall then r_Map_DrawPanels(gWalls);
+ PANEL_CLOSEDOOR: if g_rlayer_door then r_Map_DrawPanels(gWalls, True);
+ PANEL_ACID1: if g_rlayer_acid1 then r_Map_DrawPanels(gAcid1);
+ PANEL_ACID2: if g_rlayer_acid2 then r_Map_DrawPanels(gAcid2);
+ PANEL_WATER: if g_rlayer_water then r_Map_DrawPanels(gWater);
+ PANEL_FORE: if g_rlayer_fore then r_Map_DrawPanels(gRenderForegrounds);
+ end;
end;
end;
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;
- // var c: Integer;
+ var w: Integer;
begin
t := nil; dx := 0; dy := 0; flip := false;
result := MonTextures[m, a, d] <> nil;
end;
if flip then
begin
-// c := (MONSTERTABLE[MonsterType].Rect.X - dx) + MONSTERTABLE[MonsterType].Rect.Width;
-// dx := MTABLE[m].width - c - MONSTERTABLE[MonsterType].Rect.X;
- dx := -dx;
+ if (m = MONSTER_SOUL) and (a = ANIM_DIE) then w := 64 else w := 0;
+ dx := -dx - w;
end;
end;
end;
end;
procedure r_Map_DrawMonster (constref mon: TMonster);
- var m, a, xx, yy, dx, dy: Integer; d: TDirection; flip: Boolean; t: TGLMultiTexture;
+ var m, a, xx, yy, dx, dy: Integer; d, da: TDirection; flip: Boolean; t: TGLMultiTexture;
begin
m := mon.MonsterType;
a := mon.MonsterAnim;
d := mon.GameDirection;
+ (* hack: barrel tracks player, fix it in game logic *)
+ if m = MONSTER_BARREL then d := TDirection.D_LEFT;
+
+ 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);
+ da := mon.GameDirection;
+ r_Draw_MultiTextureRepeat(t, mon.DirAnim[a, da], false, xx + dx, yy + dy, t.width, t.height, flip, 255, 255, 255, 255, false);
+ end;
+ 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;
+ if DebugHealth and mon.alive then
+ begin
+ r_Common_DrawText(
+ IntToStr(mon.MonsterHealth),
+ xx + mon.obj.rect.x + mon.obj.rect.width div 2,
+ yy + mon.obj.rect.y,
+ 255, 255, 255, 255,
+ stdfont,
+ TBasePoint.BP_DOWN
+ );
end;
-
- // TODO draw g_debug_frames
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 DebugHealth and p.alive then
+ begin
+ r_Common_DrawText(
+ IntToStr(p.health) + '/' + IntToStr(p.armor),
+ x + p.obj.rect.x + p.obj.rect.width div 2,
+ y - 24,
+ 255, 255, 255, 255,
+ stdfont,
+ TBasePoint.BP_DOWN
+ );
+ 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
- glDisable(GL_TEXTURE_2D);
- if (g_dbg_scale < 0.6) then
+ r_Draw_EnableTexture2D(false);
+ 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
fx := nlerp(Particles[i].oldX, Particles[i].x, gLerpFactor);
fy := nlerp(Particles[i].oldY, Particles[i].y, gLerpFactor);
glColor4ub(Particles[i].red, Particles[i].green, Particles[i].blue, Particles[i].alpha);
- glVertex2f(fx, fy);
+ glVertex2i(fx, fy);
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;
+ function r_Map_GetDrawableGridMask (): Integer;
+ var mask: Integer;
begin
- r_Draw_GetRect(l, t, r, b);
- r_Draw_SetRect(x, y, x + w, y + h);
- glTranslatef(x, y, 0);
+ mask := 0;
+ if g_rlayer_back then mask := mask or GridTagBack;
+ if g_rlayer_step then mask := mask or GridTagStep;
+ if g_rlayer_wall then mask := mask or GridTagWall;
+ if g_rlayer_door then mask := mask or GridTagDoor;
+ if g_rlayer_acid1 then mask := mask or GridTagAcid1;
+ if g_rlayer_acid2 then mask := mask or GridTagAcid2;
+ if g_rlayer_water then mask := mask or GridTagWater;
+ if g_rlayer_fore then mask := mask or GridTagFore;
+ result := mask;
+ end;
+ 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
+ if UseAccel then
+ begin
+ plist.Clear;
+ iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, r_Map_GetDrawableGridMask());
+ for p in iter do
+ if ((p^.tag and GridTagDoor) <> 0) = p^.door then
+ plist.Insert(p^);
+ iter.Release;
+ end;
+
+ 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);
+ 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);
glTranslatef(-w div 2, -h div 2, 0);
end;
- if SkyTexture <> nil then
+ if gDrawBackGround and (SkyTexture <> nil) then
begin
r_Map_CalcSkyParallax(cx, cy, w, h, SkyTexture.width, SkyTexture.height, gMapInfo.Width, gMapInfo.Height, sx, sy, sw, sh);
r_Draw_Texture(SkyTexture, sx, sy, sw, sh, false, 255, 255, 255, 255, false);
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;
+
+ if gGameSettings.GameMode <> GM_SINGLE then
+ begin
+ glTranslatef(-cx, -cy, 0);
+ r_Map_DrawPlayerIndicators(player, cx, cy, cw, ch);
+ end;
+
+ //glTranslatef(-x, -y, 0);
+ r_Draw_SetRect(l, t, r, b);
glPopMatrix;
r_Map_DrawScreenEffects(x, y, w, h, player);
+ end;
- // TODO draw g_debug_player
-
- glTranslatef(-x, -y, 0);
- r_Draw_SetRect(l, t, r, b);
+ procedure r_Map_Reset;
+ begin
+ {$IFDEF ENABLE_GFX}
+ r_Map_ResetGFX;
+ {$ENDIF}
end;
procedure r_Map_Update;
end;
initialization
+ conRegVar('r_sq_draw', @UseAccel, 'accelerated spatial queries in rendering', 'accelerated rendering');
conRegVar('r_debug_camera_scale', @DebugCameraScale, 0.0001, 1000.0, '', '');
+ conRegVar('r_gl_fill_outside', @FillOutsizeArea, '', '');
+ conRegVar('d_frames', @DebugFrames, '', '');
+ conRegVar('d_health', @DebugHealth, '', '');
+ UseAccel := true;
DebugCameraScale := 1.0;
+ FillOutsizeArea := true;
+ DebugFrames := false;
+ DebugHealth := false;
end.