diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 2f643136c929aa4ab98848e0f5398ce34de69735..9d215455e8fbbafe8c72f0ed67d3e9c1042fae61 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
uses
e_log, e_input,
g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters,
- g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console,
+ g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx,
xprofiler;
function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean; // returns `true` if event was eaten
// hooks for player
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
+procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer);
+procedure g_Holmes_plrViewSize (viewPortW, viewPortH: Integer);
procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
var
g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
+ g_holmes_ui_scale: Single = 1.0;
implementation
msY: Integer = -666;
msB: Word = 0; // button state
kbS: Word = 0; // keyboard modifiers state
- showGrid: Boolean = true;
+ showGrid: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
showMonsInfo: Boolean = false;
showMonsLOS2Plr: Boolean = false;
showAllMonsCells: Boolean = false;
showMapCurPos: Boolean = false;
showLayersWindow: Boolean = false;
showOutlineWindow: Boolean = false;
- showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
+ showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+ showTraceBox: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+
// ////////////////////////////////////////////////////////////////////////// //
{$INCLUDE g_holmes.inc}
laserSet: Boolean = false;
laserX0, laserY0, laserX1, laserY1: Integer;
monMarkedUID: Integer = -1;
+ platMarkedGUID: Integer = -1;
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
+procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer);
begin
vpSet := true;
vpx := viewPortX;
vpy := viewPortY;
+end;
+
+procedure g_Holmes_plrViewSize (viewPortW, viewPortH: Integer);
+begin
+ vpSet := true;
vpw := viewPortW;
vph := viewPortH;
end;
end;
end;
+ procedure drawAwakeCells ();
+ var
+ x, y: Integer;
+ begin
+ for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
+ begin
+ for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
+ begin
+ if awmIsSetHolmes(x*mapGrid.tileSize+mapGrid.gridX0+1, y*mapGrid.tileSize++mapGrid.gridY0+1) then
+ begin
+ fillRect(x*mapGrid.tileSize++mapGrid.gridX0, y*mapGrid.tileSize++mapGrid.gridY0, monsGrid.tileSize, monsGrid.tileSize, 128, 0, 128, 64);
+ end;
+ end;
+ end;
+ end;
+
+ procedure drawTraceBox ();
+ var
+ plr: TPlayer;
+ px, py, pw, ph: Integer;
+ pdx, pdy: Integer;
+ ex, ey: Integer;
+ pan: TPanel;
+ begin
+ if (Length(gPlayers) < 1) then exit;
+ plr := gPlayers[0];
+ if (plr = nil) then exit;
+ plr.getMapBox(px, py, pw, ph);
+ drawRect(px, py, pw, ph, 255, 0, 255, 200);
+ pdx := pmsCurMapX-(px+pw div 2);
+ pdy := pmsCurMapY-(py+ph div 2);
+ drawLine(px+pw div 2, py+ph div 2, px+pw div 2+pdx, py+ph div 2+pdy, 255, 0, 255, 200);
+ pan := mapGrid.traceBox(ex, ey, px, py, pw, ph, pdx, pdy, nil, GridTagObstacle);
+ if (pan = nil) then
+ begin
+ drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 255, 180);
+ end
+ else
+ begin
+ drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 0, 180);
+ end;
+ drawRect(ex, ey, pw, ph, 255, 127, 0, 180);
+ end;
+
procedure hilightCell (cx, cy: Integer);
begin
fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64);
monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
end;
+ procedure drawSelectedPlatformCells ();
+ var
+ pan: TPanel;
+ begin
+ if not showGrid then exit;
+ pan := g_Map_PanelByGUID(platMarkedGUID);
+ if (pan = nil) then exit;
+ mapGrid.forEachBodyCell(pan.proxyId, hilightCell);
+ drawRect(pan.x, pan.y, pan.width, pan.height, 0, 200, 0, 200);
+ end;
+
procedure drawTrigger (var trig: TTrigger);
procedure drawPanelDest (pguid: Integer);
for f := 0 to High(gTriggers) do drawTrigger(gTriggers[f]);
end;
+ procedure drawGibsBoxes ();
+ var
+ f: Integer;
+ px, py, pw, ph: Integer;
+ gib: PGib;
+ begin
+ for f := 0 to High(gGibs) do
+ begin
+ gib := @gGibs[f];
+ if gib.alive then
+ begin
+ gib.getMapBox(px, py, pw, ph);
+ drawRect(px, py, pw, ph, 255, 0, 255);
+ end;
+ end;
+ end;
+
var
mon: TMonster;
mx, my, mw, mh: Integer;
end;
end;
- if showAllMonsCells then g_Mons_ForEach(highlightAllMonsterCells);
+ if showAllMonsCells and showGrid then g_Mons_ForEach(highlightAllMonsterCells);
if showTriggers then drawTriggers();
+ if showGrid then drawSelectedPlatformCells();
+
+ //drawAwakeCells();
+
+ if showTraceBox then drawTraceBox();
+
+ //drawGibsBoxes();
glPopMatrix();
// ////////////////////////////////////////////////////////////////////////// //
function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
+var
+ he: THMouseEvent;
begin
holmesInitCommands();
holmesInitBinds();
result := true;
- msX := ev.x;
- msY := ev.y;
+ msX := trunc(ev.x/g_holmes_ui_scale);
+ msY := trunc(ev.y/g_holmes_ui_scale);
msB := ev.bstate;
kbS := ev.kstate;
msB := msB;
- if not uiMouseEvent(ev) then plrDebugMouse(ev);
+ he := ev;
+ he.x := trunc(he.x/g_holmes_ui_scale);
+ he.y := trunc(he.y/g_holmes_ui_scale);
+ if not uiMouseEvent(he) then plrDebugMouse(he);
end;
procedure g_Holmes_DrawUI ();
begin
{$IF not DEFINED(HEADLESS)}
+ glPushMatrix();
+ glScalef(g_holmes_ui_scale, g_holmes_ui_scale, 1.0);
uiDraw();
drawCursor();
+ glPopMatrix();
{$ENDIF}
end;
// ////////////////////////////////////////////////////////////////////////// //
procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_one_think_step := true; end;
+procedure bcOneMPlatThinkStep (); begin g_dbgpan_mplat_active := false; g_dbgpan_mplat_step := true; end;
+procedure bcMPlatToggle (); begin g_dbgpan_mplat_active := not g_dbgpan_mplat_active; end;
+
procedure bcToggleMonsterInfo (arg: Integer=-1); begin if (arg < 0) then showMonsInfo := not showMonsInfo else showMonsInfo := (arg > 0); end;
procedure bcToggleMonsterLOSPlr (arg: Integer=-1); begin if (arg < 0) then showMonsLOS2Plr := not showMonsLOS2Plr else showMonsLOS2Plr := (arg > 0); end;
procedure bcToggleMonsterCells (arg: Integer=-1); begin if (arg < 0) then showAllMonsCells := not showAllMonsCells else showAllMonsCells := (arg > 0); end;
@@ -1278,6 +1378,20 @@ procedure bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTr
procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end;
procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end;
+procedure bcMonsterSpawn (s: AnsiString);
+var
+ mon: TMonster;
+begin
+ if not gGameOn or g_Game_IsClient then
+ begin
+ conwriteln('cannot spawn monster in this mode');
+ exit;
+ end;
+ mon := g_Mons_SpawnAt(s, pmsCurMapX, pmsCurMapY);
+ if (mon = nil) then begin conwritefln('unknown monster id: ''%s''', [s]); exit; end;
+ monMarkedUID := mon.UID;
+end;
+
procedure bcMonsterWakeup ();
var
mon: TMonster;
end;
end;
+procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end;
+
procedure cbAtcurSelectMonster ();
function monsAtDump (mon: TMonster; tag: Integer): Boolean;
begin
function wallToggle (pan: TPanel; tag: Integer): Boolean;
begin
result := false; // don't stop
- e_LogWritefln('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
+ if (platMarkedGUID = -1) then platMarkedGUID := pan.guid;
+ e_LogWritefln('wall ''%s'' #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.mapId, pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
dumpPublishedProperties(pan);
end;
var
f: Integer;
trig: PTrigger;
begin
+ platMarkedGUID := -1;
e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
cmdAdd('mon_info', bcToggleMonsterInfo, 'toggle monster info', 'monster control');
cmdAdd('mon_los_plr', bcToggleMonsterLOSPlr, 'toggle monster LOS to player', 'monster control');
cmdAdd('mon_cells', bcToggleMonsterCells, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
- cmdAdd('mon_wakeup', bcMonsterWakeup, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
+ cmdAdd('mon_wakeup', bcMonsterWakeup, 'wake up selected monster', 'monster control');
+
+ cmdAdd('mon_spawn', bcMonsterSpawn, 'spawn monster', 'monster control');
+
+ cmdAdd('mplat_step', bcOneMPlatThinkStep, 'one mplat think step', 'mplat control');
+ cmdAdd('mplat_toggle', bcMPlatToggle, 'activate/deactivate moving platforms', 'mplat control');
cmdAdd('plr_teleport', bcPlayerTeleport, 'teleport player', 'player control');
cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control');
cmdAdd('atcur_dump_walls', cbAtcurDumpWalls, 'dump walls in cell', 'wall control');
cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control');
+
+ cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control');
end;
keybindAdd('M-G', 'mon_cells');
keybindAdd('M-A', 'mon_wakeup');
+ keybindAdd('M-P', 'mplat_step');
+ keybindAdd('M-O', 'mplat_toggle');
+
keybindAdd('C-T', 'plr_teleport');
+ keybindAdd('M-T', 'dbg_tracebox');
keybindAdd('C-P', 'dbg_curpos');
keybindAdd('C-G', 'dbg_grid');
keybindAdd('C-X', 'dbg_triggers');
+ keybindAdd('C-1', 'mon_spawn zombie');
+
// mouse
msbindAdd('LMB', 'atcur_select_monster');
msbindAdd('M-LMB', 'atcur_dump_monsters');
end;
+begin
+ conRegVar('hlm_ui_scale', @g_holmes_ui_scale, 0.01, 5.0, 'Holmes UI scale', '', false);
end.