diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index c518ca11f404a40bb59fda5495113515c79728f1..3a50ffaba189b0355483ab7aa86d5eb26f4a009a 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
procedure g_Holmes_WindowBlured ();
procedure g_Holmes_Draw ();
+procedure g_Holmes_DrawUI ();
-function g_Holmes_mouseEvent (var ev: THMouseEvent): Boolean; // returns `true` if event was eaten
+function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean; // returns `true` if event was eaten
function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean; // returns `true` if event was eaten
// hooks for player
// ////////////////////////////////////////////////////////////////////////// //
{$INCLUDE g_holmes.inc}
+{$INCLUDE g_holmes_ui.inc}
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+var
+ g_ol_nice: Boolean = false;
+ g_ol_rlayer_back: Boolean = false;
+ g_ol_rlayer_step: Boolean = false;
+ g_ol_rlayer_wall: Boolean = false;
+ g_ol_rlayer_door: Boolean = false;
+ g_ol_rlayer_acid1: Boolean = false;
+ g_ol_rlayer_acid2: Boolean = false;
+ g_ol_rlayer_water: Boolean = false;
+ g_ol_rlayer_fore: Boolean = false;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+var
+ winOptions: THTopWindow = nil;
+ winLayers: THTopWindow = nil;
+ winOutlines: THTopWindow = nil;
+
+
+procedure createOptionsWindow ();
+var
+ llb: THCtlCBListBox;
+begin
+ llb := THCtlCBListBox.Create(0, 0);
+ llb.appendItem('map grid', @showGrid);
+ llb.appendItem('cursor position on map', @showMapCurPos);
+ llb.appendItem('monster info', @showMonsInfo);
+ llb.appendItem('monster LOS to player', @showMonsLOS2Plr);
+ llb.appendItem('monster cells (SLOW!)', @showAllMonsCells);
+ winOptions := THTopWindow.Create('Holmes Options', 100, 100);
+ winOptions.escClose := true;
+ winOptions.appendChild(llb);
+end;
+
+
+procedure createLayersWindow ();
+var
+ llb: THCtlCBListBox;
+begin
+ llb := THCtlCBListBox.Create(0, 0);
+ llb.appendItem('background', @g_rlayer_back);
+ llb.appendItem('steps', @g_rlayer_step);
+ llb.appendItem('walls', @g_rlayer_wall);
+ llb.appendItem('doors', @g_rlayer_door);
+ llb.appendItem('acid1', @g_rlayer_acid1);
+ llb.appendItem('acid2', @g_rlayer_acid2);
+ llb.appendItem('water', @g_rlayer_water);
+ llb.appendItem('foreground', @g_rlayer_fore);
+ winLayers := THTopWindow.Create('visible', 10, 10);
+ winLayers.escClose := true;
+ winLayers.appendChild(llb);
+end;
+
+
+procedure createOutlinesWindow ();
+var
+ llb: THCtlCBListBox;
+begin
+ llb := THCtlCBListBox.Create(0, 0);
+ llb.appendItem('background', @g_ol_rlayer_back);
+ llb.appendItem('steps', @g_ol_rlayer_step);
+ llb.appendItem('walls', @g_ol_rlayer_wall);
+ llb.appendItem('doors', @g_ol_rlayer_door);
+ llb.appendItem('acid1', @g_ol_rlayer_acid1);
+ llb.appendItem('acid2', @g_ol_rlayer_acid2);
+ llb.appendItem('water', @g_ol_rlayer_water);
+ llb.appendItem('foreground', @g_ol_rlayer_fore);
+ llb.appendItem('', nil);
+ llb.appendItem('slow''n''nice', @g_ol_nice);
+ winOutlines := THTopWindow.Create('outlines', 100, 10);
+ winOutlines.escClose := true;
+ winOutlines.appendChild(llb);
+end;
// ////////////////////////////////////////////////////////////////////////// //
end;
+var
+ olEdgeL: array of Boolean = nil;
+ olEdgeR: array of Boolean = nil;
+ olEdgeU: array of Boolean = nil;
+ olEdgeD: array of Boolean = nil;
+
+procedure drawOutlines ();
+begin
+end;
+
+
procedure plrDebugDraw ();
procedure drawTileGrid ();
var
x, y: Integer;
begin
- y := mapGrid.gridY0;
- while (y < mapGrid.gridY0+mapGrid.gridHeight) do
+ for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
begin
- x := mapGrid.gridX0;
- while (x < mapGrid.gridX0+mapGrid.gridWidth) do
- begin
- if (x+mapGrid.tileSize > vpx) and (y+mapGrid.tileSize > vpy) and
- (x < vpx+vpw) and (y < vpy+vph) then
- begin
- //e_DrawQuad(x, y, x+mapGrid.tileSize-1, y+mapGrid.tileSize-1, 96, 96, 96, 96);
- drawRect(x, y, mapGrid.tileSize, mapGrid.tileSize, 96, 96, 96, 255);
- end;
- Inc(x, mapGrid.tileSize);
- end;
- Inc(y, mapGrid.tileSize);
+ drawLine(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize, 96, 96, 96, 255);
+ end;
+
+ for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
+ begin
+ drawLine(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight, 96, 96, 96, 255);
end;
end;
if showMonsInfo then
begin
//fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
- shadeRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
+ darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
my -= 8;
my -= 2;
mon: TMonster;
mx, my, mw, mh: Integer;
begin
- //e_DrawPoint(4, plrMouseX, plrMouseY, 255, 0, 255);
if (gPlayer1 = nil) then exit;
- //e_WriteLog(Format('(%d,%d)-(%d,%d)', [laserX0, laserY0, laserX1, laserY1]), MSG_NOTIFY);
+ glEnable(GL_SCISSOR_TEST);
+ glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
glPushMatrix();
glTranslatef(-vpx, -vpy, 0);
+ drawOutlines();
+
if (showGrid) then drawTileGrid();
if (laserSet) then g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
glPopMatrix();
+ glDisable(GL_SCISSOR_TEST);
+
if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), 255, 255, 0);
end;
// ////////////////////////////////////////////////////////////////////////// //
-function g_Holmes_mouseEvent (var ev: THMouseEvent): Boolean;
+function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
begin
result := true;
msX := ev.x;
msB := ev.bstate;
kbS := ev.kstate;
msB := msB;
- plrDebugMouse(ev);
+ if not uiMouseEvent(ev) then plrDebugMouse(ev);
end;
pan: TPanel;
x, y, w, h: Integer;
ex, ey: Integer;
+ dx, dy: Integer;
procedure dummyWallTrc (cx, cy: Integer);
begin
SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
result := true;
end;
+ if uiKeyEvent(ev) then begin result := true; exit; end;
// press
if (ev.kind = THKeyEvent.Press) then
begin
showGrid := not showGrid;
exit;
end;
- // C-DOWN: trace down 10 pixels from cursor
- if (ev.scan = SDL_SCANCODE_DOWN) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ // C-L: toggle layers window
+ if (ev.scan = SDL_SCANCODE_L) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ begin
+ result := true;
+ if (winLayers = nil) then createLayersWindow();
+ if not uiVisibleWindow(winLayers) then uiAddWindow(winLayers) else uiRemoveWindow(winLayers);
+ exit;
+ end;
+ // C-O: toggle outlines window
+ if (ev.scan = SDL_SCANCODE_O) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ begin
+ result := true;
+ if (winOutlines = nil) then createOutlinesWindow();
+ if not uiVisibleWindow(winOutlines) then uiAddWindow(winOutlines) else uiRemoveWindow(winOutlines);
+ exit;
+ end;
+ // F1: toggle options window
+ if (ev.scan = SDL_SCANCODE_F1) and (ev.kstate = 0) then
begin
result := true;
+ if (winOptions = nil) then createOptionsWindow();
+ if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions);
+ exit;
+ end;
+ // C-UP, C-DOWN, C-LEFT, C-RIGHT: trace 10 pixels from cursor in the respective direction
+ if ((ev.scan = SDL_SCANCODE_UP) or (ev.scan = SDL_SCANCODE_DOWN) or (ev.scan = SDL_SCANCODE_LEFT) or (ev.scan = SDL_SCANCODE_RIGHT)) and
+ ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+ begin
+ result := true;
+ dx := pmsCurMapX;
+ dy := pmsCurMapY;
+ case ev.scan of
+ SDL_SCANCODE_UP: dy -= 120;
+ SDL_SCANCODE_DOWN: dy += 120;
+ SDL_SCANCODE_LEFT: dx -= 120;
+ SDL_SCANCODE_RIGHT: dx += 120;
+ end;
{$IF DEFINED(D2F_DEBUG)}
- mapGrid.dbgRayTraceTileHitCB := dummyWallTrc;
+ //mapGrid.dbgRayTraceTileHitCB := dummyWallTrc;
+ mapGrid.dbgShowTraceLog := true;
{$ENDIF}
- pan := g_Map_traceToNearest(pmsCurMapX, pmsCurMapY, pmsCurMapX, pmsCurMapY+10, (GridTagWall or GridTagDoor or GridTagStep or GridTagAcid1 or GridTagAcid2 or GridTagWater), @ex, @ey);
+ pan := g_Map_traceToNearest(pmsCurMapX, pmsCurMapY, dx, dy, (GridTagWall or GridTagDoor or GridTagStep or GridTagAcid1 or GridTagAcid2 or GridTagWater), @ex, @ey);
{$IF DEFINED(D2F_DEBUG)}
- mapGrid.dbgRayTraceTileHitCB := nil;
+ //mapGrid.dbgRayTraceTileHitCB := nil;
+ mapGrid.dbgShowTraceLog := false;
{$ENDIF}
- e_LogWritefln('v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, pmsCurMapX, pmsCurMapY+10, ex, ey, (pan <> nil)]);
- //conwritefln('!!!v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, pmsCurMapX, pmsCurMapY+10, ex, ey, (pan <> nil)]);
+ e_LogWritefln('v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, dx, dy, ex, ey, (pan <> nil)]);
exit;
end;
end;
plrDebugDraw();
end;
- //drawText6Prop(10, 10, 'Hi there, I''m Holmes!', 255, 255, 0);
- //drawText8Prop(10, 20, 'Hi there, I''m Holmes!', 255, 255, 0);
+ laserSet := false;
+end;
- drawCursor();
- laserSet := false;
+procedure g_Holmes_DrawUI ();
+begin
+ uiDraw();
+ drawCursor();
end;