X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=82f2be14f94a8b48690bc135734901d91b018b48;hb=254041134b399e948e554ae99171174a7087ae40;hp=54dc90b1056959eaea23d8229b80c579086a3791;hpb=a4f25c41dfd783a925aa2dab4b9b84753d5c3f18;p=d2df-sdl.git diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index 54dc90b..82f2be1 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -21,7 +21,7 @@ interface 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; @@ -96,6 +96,7 @@ operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean; var g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF}; + g_holmes_ui_scale: Single = 1.0; implementation @@ -113,14 +114,16 @@ var 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} @@ -650,6 +653,7 @@ var laserSet: Boolean = false; laserX0, laserY0, laserX1, laserY1: Integer; monMarkedUID: Integer = -1; + platMarkedGUID: Integer = -1; procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer); @@ -672,8 +676,8 @@ begin end; -function pmsCurMapX (): Integer; inline; begin result := msX+vpx; end; -function pmsCurMapY (): Integer; inline; begin result := msY+vpy; end; +function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+vpx; end; +function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end; procedure plrDebugMouse (var ev: THMouseEvent); @@ -905,6 +909,50 @@ procedure plrDebugDraw (); 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); @@ -1039,14 +1087,25 @@ procedure plrDebugDraw (); 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 (var parr: TPanelArray; idx: Integer); + procedure drawPanelDest (pguid: Integer); var pan: TPanel; begin - if (idx < 0) or (idx >= Length(parr)) then exit; - pan := parr[idx]; + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; drawLine( trig.trigCenter.x, trig.trigCenter.y, pan.x+pan.width div 2, pan.y+pan.height div 2, @@ -1065,32 +1124,36 @@ procedure plrDebugDraw (); tx := trig.x+(trig.width-Length(trig.mapId)*6) div 2; darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64); drawText6(tx, trig.y-19, trig.mapId, 255, 255, 0); + drawPanelDest(trig.trigPanelGUID); case trig.TriggerType of TRIGGER_NONE: begin end; TRIGGER_EXIT: begin end; TRIGGER_TELEPORT: begin end; - TRIGGER_OPENDOOR: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_CLOSEDOOR: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_DOOR: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_DOOR5: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_CLOSETRAP: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_TRAP: begin drawPanelDest(gWalls, trig.trigPanelId); end; + TRIGGER_OPENDOOR: begin end; + TRIGGER_CLOSEDOOR: begin end; + TRIGGER_DOOR: begin end; + TRIGGER_DOOR5: begin end; + TRIGGER_CLOSETRAP: begin end; + TRIGGER_TRAP: begin end; TRIGGER_SECRET: begin end; - TRIGGER_LIFTUP: begin drawPanelDest(gLifts, trig.trigPanelId); end; - TRIGGER_LIFTDOWN: begin drawPanelDest(gLifts, trig.trigPanelId); end; - TRIGGER_LIFT: begin drawPanelDest(gLifts, trig.trigPanelId); end; + TRIGGER_LIFTUP: begin end; + TRIGGER_LIFTDOWN: begin end; + TRIGGER_LIFT: begin end; TRIGGER_TEXTURE: begin end; TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF, TRIGGER_PRESS: begin - fillRect( - trig.trigData.trigTX, trig.trigData.trigTY, - trig.trigData.trigTWidth, trig.trigData.trigTHeight, - 0, 255, 255, 42); - drawLine( - trig.trigCenter.x, trig.trigCenter.y, - trig.trigData.trigTX+trig.trigData.trigTWidth div 2, - trig.trigData.trigTY+trig.trigData.trigTHeight div 2, - 255, 0, 255, 220); + if (trig.trigData.trigTWidth > 0) and (trig.trigData.trigTHeight > 0) then + begin + fillRect( + trig.trigData.trigTX, trig.trigData.trigTY, + trig.trigData.trigTWidth, trig.trigData.trigTHeight, + 0, 255, 255, 42); + drawLine( + trig.trigCenter.x, trig.trigCenter.y, + trig.trigData.trigTX+trig.trigData.trigTWidth div 2, + trig.trigData.trigTY+trig.trigData.trigTHeight div 2, + 255, 0, 255, 220); + end; end; TRIGGER_SOUND: begin end; TRIGGER_SPAWNMONSTER: begin end; @@ -1116,6 +1179,23 @@ procedure plrDebugDraw (); 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; @@ -1126,7 +1206,7 @@ begin glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph); glPushMatrix(); - if g_dbg_scale_05 then glScalef(0.5, 0.5, 1.0); + glScalef(g_dbg_scale, g_dbg_scale, 1.0); glTranslatef(-vpx, -vpy, 0); if (showGrid) then drawTileGrid(); @@ -1145,8 +1225,15 @@ begin 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(); @@ -1158,16 +1245,21 @@ end; // ////////////////////////////////////////////////////////////////////////// // 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; @@ -1258,14 +1350,20 @@ 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; @@ -1274,6 +1372,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; @@ -1297,6 +1409,8 @@ begin 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 @@ -1343,7 +1457,8 @@ procedure cbAtcurDumpWalls (); 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 @@ -1351,6 +1466,7 @@ 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); @@ -1374,7 +1490,7 @@ procedure cbAtcurToggleWalls (); begin result := false; // don't stop //e_WriteLog(Format('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]), MSG_NOTIFY); - if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx); + if pan.Enabled then g_Map_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid); end; begin //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY); @@ -1396,7 +1512,12 @@ begin 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'); @@ -1408,6 +1529,8 @@ begin 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; @@ -1434,12 +1557,18 @@ begin 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'); @@ -1486,4 +1615,6 @@ begin end; +begin + conRegVar('hlm_ui_scale', @g_holmes_ui_scale, 0.01, 5.0, 'Holmes UI scale', '', false); end.