diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 0ded9ee29d23396011831afa7f8bd08f183dfd68..bcb2cfadb4ed56f09d3816b4121e313213a34b49 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
var
+ hlmContext: TGxContext = nil;
//globalInited: Boolean = false;
msX: Integer = -666;
msY: Integer = -666;
procedure winLayersClosed (me: TUIControl); begin showLayersWindow := false; end;
procedure winOutlinesClosed (me: TUIControl); begin showOutlineWindow := false; end;
-procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean);
+procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean; const aid: AnsiString='');
var
cb: TUICheckBox;
begin
cb.flExpand := true;
cb.setVar(pvar);
cb.text := text;
+ cb.id := aid;
parent.appendChild(cb);
end;
end;
+procedure actionFillWalls (cb: TUIControl);
+begin
+ TUICheckBox(cb).checked := not TUICheckBox(cb).checked;
+ TUICheckBox(cb.topLevel['cbcontour']).enabled := not TUICheckBox(cb).checked;
+end;
+
procedure createLayersWindow ();
var
box: TUIVBox;
box := TUIVBox.Create();
box.hasFrame := true;
box.caption := 'options';
- addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls);
- addCheckBox(box, 'con~tours', @g_ol_nice);
+ addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls, 'cbfill');
+ addCheckBox(box, 'con~tours', @g_ol_nice, 'cbcontour');
winOutlines.appendChild(box);
+ winOutlines.setActionCBFor('cbfill', actionFillWalls);
+
uiLayoutCtl(winOutlines);
end;
g := ag;
b := ab;
if g_ol_nice then clearOliner();
+ hlmContext.color := TGxRGBA.Create(r, g, b);
for f := 0 to High(parr) do
begin
pan := parr[f];
end;
if g_ol_fill_walls then
begin
- fillRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(r, g, b));
+ hlmContext.fillRect(pan.X, pan.Y, pan.Width, pan.Height);
end
else if not g_ol_nice then
begin
- drawRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(r, g, b));
+ hlmContext.rect(pan.X, pan.Y, pan.Width, pan.Height);
end;
end;
if g_ol_nice then
var
x, y: Integer;
begin
+ hlmContext.color := TGxRGBA.Create(96, 96, 96);
for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
begin
- drawLine(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize, TGxRGBA.Create(96, 96, 96));
+ hlmContext.line(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize);
end;
+ hlmContext.color := TGxRGBA.Create(96, 96, 96);
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, TGxRGBA.Create(96, 96, 96));
+ hlmContext.line(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight);
end;
end;
var
x, y: Integer;
begin
+ hlmContext.color := TGxRGBA.Create(128, 0, 128, 64);
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, TGxRGBA.Create(128, 0, 128, 64));
+ hlmContext.fillRect(x*mapGrid.tileSize++mapGrid.gridX0, y*mapGrid.tileSize++mapGrid.gridY0, monsGrid.tileSize, monsGrid.tileSize);
end;
end;
end;
plr := gPlayers[0];
if (plr = nil) then exit;
plr.getMapBox(px, py, pw, ph);
- drawRect(px, py, pw, ph, TGxRGBA.Create(255, 0, 255, 200));
+ hlmContext.color := TGxRGBA.Create(255, 0, 255, 200);
+ hlmContext.rect(px, py, pw, ph);
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, TGxRGBA.Create(255, 0, 255, 200));
+ hlmContext.color := TGxRGBA.Create(255, 0, 255, 200);
+ hlmContext.line(px+pw div 2, py+ph div 2, px+pw div 2+pdx, py+ph div 2+pdy);
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, TGxRGBA.Create(255, 255, 255, 180));
+ hlmContext.color := TGxRGBA.Create(255, 255, 255, 180);
+ hlmContext.rect(px+pdx, py+pdy, pw, ph);
end
else
begin
- drawRect(px+pdx, py+pdy, pw, ph, TGxRGBA.Create(255, 255, 0, 180));
+ hlmContext.color := TGxRGBA.Create(255, 255, 0, 180);
+ hlmContext.rect(px+pdx, py+pdy, pw, ph);
end;
- drawRect(ex, ey, pw, ph, TGxRGBA.Create(255, 127, 0, 180));
+ hlmContext.color := TGxRGBA.Create(255, 127, 0, 180);
+ hlmContext.rect(ex, ey, pw, ph);
end;
procedure hilightCell (cx, cy: Integer);
begin
- fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, TGxRGBA.Create(0, 128, 0, 64));
+ hlmContext.color := TGxRGBA.Create(0, 128, 0, 64);
+ hlmContext.fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize);
end;
procedure hilightCell1 (cx, cy: Integer);
//e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
cx := cx and (not (monsGrid.tileSize-1));
cy := cy and (not (monsGrid.tileSize-1));
- fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, TGxRGBA.Create(255, 255, 0, 92));
+ hlmContext.color := TGxRGBA.Create(255, 255, 0, 92);
+ hlmContext.fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize);
end;
function hilightWallTrc (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
result := false; // don't stop
if (pan = nil) then exit; // cell completion, ignore
//e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
- fillRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(0, 128, 128, 64));
+ hlmContext.color := TGxRGBA.Create(0, 128, 128, 64);
+ hlmContext.fillRect(pan.X, pan.Y, pan.Width, pan.Height);
end;
function monsCollector (mon: TMonster; tag: Integer): Boolean;
begin
result := false;
mon.getMapBox(mx, my, mw, mh);
- e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
+ hlmContext.color := TGxRGBA.Create(255, 255, 0, 160);
+ hlmContext.rect(mx, my, mw, mh);
+ //e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
if lineAABBIntersects(laserX0, laserY0, laserX1, laserY1, mx, my, mw, mh, ex, ey) then
begin
- e_DrawPoint(8, ex, ey, 0, 255, 0);
+ //e_DrawPoint(8, ex, ey, 0, 255, 0);
+ hlmContext.color := TGxRGBA.Create(0, 255, 0, 220);
+ hlmContext.fillRect(ex-2, ey-2, 7, 7);
end;
end;
exit;
end;
mon.getMapBox(mx, my, mw, mh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, TGxRGBA.Create(255, 0, 0));
+ hlmContext.color := TGxRGBA.Create(255, 0, 0);
+ hlmContext.line(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2);
if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
begin
- drawLine(mx+mw div 2, my+mh div 2, ex, ey, TGxRGBA.Create(0, 255, 0));
+ hlmContext.color := TGxRGBA.Create(0, 255, 0);
+ hlmContext.line(mx+mw div 2, my+mh div 2, ex, ey);
end;
end;
if (eplr = nil) then exit;
eplr.getMapBox(emx, emy, emw, emh);
mon.getMapBox(mx, my, mw, mh);
- drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, TGxRGBA.Create(255, 0, 0));
+ hlmContext.color := TGxRGBA.Create(255, 0, 0);
+ hlmContext.line(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2);
{$IF DEFINED(D2F_DEBUG)}
mapGrid.dbgRayTraceTileHitCB := hilightCell1;
{$ENDIF}
if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
//if (mapGrid.traceRay(ex, ey, mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, hilightWallTrc, (GridTagWall or GridTagDoor)) <> nil) then
begin
- drawLine(mx+mw div 2, my+mh div 2, ex, ey, TGxRGBA.Create(0, 255, 0));
+ hlmContext.color := TGxRGBA.Create(0, 255, 0);
+ hlmContext.line(mx+mw div 2, my+mh div 2, ex, ey);
end;
{$IF DEFINED(D2F_DEBUG)}
mapGrid.dbgRayTraceTileHitCB := nil;
if showMonsInfo then
begin
//fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
- darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
+ hlmContext.font := 'msx';
+ hlmContext.color := TGxRGBA.Create(255, 127, 0);
+
+ hlmContext.darkenRect(mx-4, my-7*hlmContext.charWidth(' ')-6, 110, 7*hlmContext.charWidth(' ')+6, 128);
my -= 8;
my -= 2;
// type
- drawText6(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID])); my -= hlmContext.charWidth(' ');
// beh
- drawText6(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)])); my -= hlmContext.charWidth(' ');
// state
- drawText6(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep])); my -= hlmContext.charWidth(' ');
// health
- drawText6(mx, my, Format('Health:%d', [mon.MonsterHealth]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('Health:%d', [mon.MonsterHealth])); my -= hlmContext.charWidth(' ');
// ammo
- drawText6(mx, my, Format('Ammo:%d', [mon.MonsterAmmo]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('Ammo:%d', [mon.MonsterAmmo])); my -= hlmContext.charWidth(' ');
// target
- drawText6(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID]), TGxRGBA.Create(255, 127, 0)); my -= 8;
- drawText6(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+ hlmContext.drawText(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID])); my -= hlmContext.charWidth(' ');
+ hlmContext.drawText(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime])); my -= hlmContext.charWidth(' ');
end;
drawMonsterTargetLine();
pan := g_Map_PanelByGUID(platMarkedGUID);
if (pan = nil) then exit;
mapGrid.forEachBodyCell(pan.proxyId, hilightCell);
- drawRect(pan.x, pan.y, pan.width, pan.height, TGxRGBA.Create(0, 200, 0, 200));
+ hlmContext.color := TGxRGBA.Create(0, 200, 0, 200);
+ hlmContext.rect(pan.x, pan.y, pan.width, pan.height);
end;
procedure drawTrigger (var trig: TTrigger);
begin
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,
- TGxRGBA.Create(255, 0, 255, 220));
+ hlmContext.color := TGxRGBA.Create(255, 0, 255, 220);
+ hlmContext.line(trig.trigCenter.x, trig.trigCenter.y, pan.x+pan.width div 2, pan.y+pan.height div 2);
end;
var
tts: AnsiString;
tx: Integer;
begin
- fillRect(trig.x, trig.y, trig.width, trig.height, TGxRGBA.Create(255, 0, 255, 96));
+ hlmContext.font := 'msx';
+ hlmContext.color := TGxRGBA.Create(255, 0, 255, 96);
+ hlmContext.fillRect(trig.x, trig.y, trig.width, trig.height);
tts := trigType2Str(trig.TriggerType);
tx := trig.x+(trig.width-Length(tts)*6) div 2;
- darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64);
- drawText6(tx, trig.y-9, tts, TGxRGBA.Create(255, 127, 0));
+ hlmContext.darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64);
+ hlmContext.color := TGxRGBA.Create(255, 127, 0);
+ hlmContext.drawText(tx, trig.y-9, tts);
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, TGxRGBA.Create(255, 255, 0));
+ hlmContext.darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64);
+ hlmContext.color := TGxRGBA.Create(255, 255, 0);
+ hlmContext.drawText(tx, trig.y-19, trig.mapId);
drawPanelDest(trig.trigPanelGUID);
case trig.TriggerType of
TRIGGER_NONE: begin end;
begin
if (trig.trigDataRec.trigTWidth > 0) and (trig.trigDataRec.trigTHeight > 0) then
begin
- fillRect(
+ hlmContext.color := TGxRGBA.Create(0, 255, 255, 42);
+ hlmContext.fillRect(
trig.trigDataRec.trigTX, trig.trigDataRec.trigTY,
- trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight,
- TGxRGBA.Create(0, 255, 255, 42));
- drawLine(
+ trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight);
+ hlmContext.color := TGxRGBA.Create(255, 0, 255, 220);
+ hlmContext.line(
trig.trigCenter.x, trig.trigCenter.y,
trig.trigDataRec.trigTX+trig.trigDataRec.trigTWidth div 2,
- trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2,
- TGxRGBA.Create(255, 0, 255, 220));
+ trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2);
end;
end;
TRIGGER_SOUND: begin end;
if gib.alive then
begin
gib.getMapBox(px, py, pw, ph);
- drawRect(px, py, pw, ph, TGxRGBA.Create(255, 0, 255));
+ hlmContext.color := TGxRGBA.Create(255, 0, 255);
+ hlmContext.rect(px, py, pw, ph);
end;
end;
end;
var
- scisave: TScissorSave;
mon: TMonster;
mx, my, mw, mh: Integer;
//pan: TPanel;
begin
if (gPlayer1 = nil) then exit;
- scisave.save(true); // enable scissoring
- glPushMatrix();
+ if (hlmContext = nil) then hlmContext := TGxContext.Create();
+
+ gxSetContext(hlmContext);
try
//glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
- glScissor(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
+ //hlmContext.clip := TGxRect.Create(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
+ {
glScalef(g_dbg_scale, g_dbg_scale, 1.0);
glTranslatef(-vpx, -vpy, 0);
+ }
+ hlmContext.glSetScaleTrans(g_dbg_scale, -vpx, -vpy);
+ glEnable(GL_SCISSOR_TEST);
+ glScissor(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
if (showGrid) then drawTileGrid();
drawOutlines();
if (mon <> nil) then
begin
mon.getMapBox(mx, my, mw, mh);
- e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
+ //e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
+ hlmContext.color := TGxRGBA.Create(255, 0, 0, 220);
+ hlmContext.rect(mx, my, mw, mh);
drawMonsterInfo(mon);
end;
end;
*)
finally
- glPopMatrix();
- scisave.restore();
+ gxSetContext(nil);
end;
- if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), TGxRGBA.Create(255, 255, 0));
+ if showMapCurPos then
+ begin
+ gxSetContext(hlmContext);
+ hlmContext.font := 'dos';
+ hlmContext.color := TGxRGBA.Create(255, 255, 0);
+ hlmContext.drawText(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]));
+ gxSetContext(nil);
+ end;
end;