From f671ef276ead1f6faafaf14bb9cd6be9293908b9 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Tue, 3 Oct 2017 02:19:00 +0300 Subject: [PATCH] Holmes is using new FlexUI renderer now --- src/flexui/fui_ctls.pas | 2 +- src/flexui/fui_gfx_gl.pas | 178 ++++++++++++++++++++++++-------------- src/flexui/fui_style.pas | 8 +- src/game/g_holmes.pas | 160 ++++++++++++++++++++++------------ 4 files changed, 222 insertions(+), 126 deletions(-) diff --git a/src/flexui/fui_ctls.pas b/src/flexui/fui_ctls.pas index c573de8..7969a26 100644 --- a/src/flexui/fui_ctls.pas +++ b/src/flexui/fui_ctls.pas @@ -249,7 +249,7 @@ type procedure close (); // this closes *top-level* control public - property id: AnsiString read mId; + property id: AnsiString read mId write mId; property styleId: AnsiString read mStyleId; property scrollX: Integer read mScrollX write mScrollX; property scrollY: Integer read mScrollY write mScrollY; diff --git a/src/flexui/fui_gfx_gl.pas b/src/flexui/fui_gfx_gl.pas index b0ccd22..f70e789 100644 --- a/src/flexui/fui_gfx_gl.pas +++ b/src/flexui/fui_gfx_gl.pas @@ -114,6 +114,11 @@ type function combineClip (constref aclip: TGxRect): TGxRect; // returns previous clip + public //HACK! + procedure glSetScale (ascale: Single); + procedure glSetTrans (ax, ay: Single); + procedure glSetScaleTrans (ascale, ax, ay: Single); + public property active: Boolean read mActive; property color: TGxRGBA read mColor write setColor; @@ -125,10 +130,12 @@ type // set active context; `ctx` can be `nil` procedure gxSetContext (ctx: TGxContext; ascale: Single=1.0); +procedure gxSetContextNoMatrix (ctx: TGxContext); // setup 2D OpenGL mode; will be called automatically in `glInit()` procedure oglSetup2D (winWidth, winHeight: Integer; upsideDown: Boolean=false); +procedure oglSetup2DState (); // don't modify viewports and matrices procedure oglDrawCursor (); procedure oglDrawCursorAt (msX, msY: Integer); @@ -143,6 +150,33 @@ var implementation +// ////////////////////////////////////////////////////////////////////////// // +// returns `false` if the color is transparent +// returns `false` if the color is transparent +function setupGLColor (constref clr: TGxRGBA): Boolean; +begin + if (clr.a < 255) then + begin + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + end + else + begin + glDisable(GL_BLEND); + end; + glColor4ub(clr.r, clr.g, clr.b, clr.a); + result := (clr.a <> 0); +end; + +function isScaled (): Boolean; +var + mt: packed array [0..15] of Double; +begin + glGetDoublev(GL_MODELVIEW_MATRIX, @mt[0]); + result := (mt[0] <> 1.0) or (mt[1*4+1] <> 1.0); +end; + + // ////////////////////////////////////////////////////////////////////////// // //TODO: OpenGL framebuffers and shaders state type @@ -209,7 +243,9 @@ var // ////////////////////////////////////////////////////////////////////////// // // set active context; `ctx` can be `nil` -procedure gxSetContext (ctx: TGxContext; ascale: Single=1.0); +procedure gxSetContextInternal (ctx: TGxContext; ascale: Single; domatrix: Boolean); +var + mt: packed array [0..15] of Double; begin if (savedGLState.saved) then savedGLState.restore(); @@ -224,15 +260,30 @@ begin begin ctx.mActive := true; savedGLState.save(); - oglSetup2D(fuiScrWdt, fuiScrHgt); - glScalef(ascale, ascale, 1.0); - ctx.mScaled := (ascale <> 1.0); - ctx.mScale := ascale; + if (domatrix) then + begin + oglSetup2D(fuiScrWdt, fuiScrHgt); + glScalef(ascale, ascale, 1.0); + ctx.mScaled := (ascale <> 1.0); + ctx.mScale := ascale; + end + else + begin + // assume uniform scale + glGetDoublev(GL_MODELVIEW_MATRIX, @mt[0]); + ctx.mScaled := (mt[0] <> 1.0) or (mt[1*4+1] <> 1.0); + ctx.mScale := mt[0]; + oglSetup2DState(); + end; ctx.onActivate(); end; end; +procedure gxSetContext (ctx: TGxContext; ascale: Single=1.0); begin gxSetContextInternal(ctx, ascale, true); end; +procedure gxSetContextNoMatrix (ctx: TGxContext); begin gxSetContextInternal(ctx, 1, false); end; + + // ////////////////////////////////////////////////////////////////////////// // type TScissorSave = record @@ -509,10 +560,8 @@ end; // ////////////////////////////////////////////////////////////////////////// // -procedure oglSetup2D (winWidth, winHeight: Integer; upsideDown: Boolean=false); +procedure oglSetup2DState (); begin - glViewport(0, 0, winWidth, winHeight); - glDisable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glDisable(GL_LINE_SMOOTH); @@ -527,6 +576,17 @@ begin glDisable(GL_CULL_FACE); glDisable(GL_ALPHA_TEST); + glClearColor(0, 0, 0, 0); + glColor4f(1, 1, 1, 1); +end; + + +procedure oglSetup2D (winWidth, winHeight: Integer; upsideDown: Boolean=false); +begin + glViewport(0, 0, winWidth, winHeight); + + oglSetup2DState(); + glMatrixMode(GL_TEXTURE); glLoadIdentity(); @@ -546,9 +606,6 @@ begin glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - - glClearColor(0, 0, 0, 0); - glColor4f(1, 1, 1, 1); end; @@ -558,33 +615,6 @@ end; procedure oglDrawCursor (); begin oglDrawCursorAt(fuiMouseX, fuiMouseY); end; -// ////////////////////////////////////////////////////////////////////////// // -// returns `false` if the color is transparent -// returns `false` if the color is transparent -function setupGLColor (constref clr: TGxRGBA): Boolean; -begin - if (clr.a < 255) then - begin - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - end - else - begin - glDisable(GL_BLEND); - end; - glColor4ub(clr.r, clr.g, clr.b, clr.a); - result := (clr.a <> 0); -end; - -function mScaled (): Boolean; -var - mt: packed array [0..15] of Double; -begin - glGetDoublev(GL_MODELVIEW_MATRIX, @mt[0]); - result := (mt[0] <> 1.0) or (mt[1*4+1] <> 1.0); -end; - - // ////////////////////////////////////////////////////////////////////////// // constructor TGxContext.Create (); begin @@ -768,7 +798,7 @@ begin glVertex2f(x+len+0.375, y+0.375); glEnd(); end - else + else if (mScale > 1.0) then begin glBegin(GL_QUADS); glVertex2i(x, y); @@ -776,6 +806,13 @@ begin glVertex2i(x+len, y+1); glVertex2i(x, y+1); glEnd(); + end + else + begin + glPointSize(1); + glBegin(GL_POINTS); + while (len > 0) do begin glVertex2i(x, y); Inc(x); Dec(len); end; + glEnd(); end; end; @@ -792,7 +829,7 @@ begin glVertex2f(x+0.375, y+len+0.375); glEnd(); end - else + else if (mScale > 1.0) then begin glBegin(GL_QUADS); glVertex2i(x, y); @@ -800,33 +837,18 @@ begin glVertex2i(x+1, y+len); glVertex2i(x+1, y); glEnd(); - end; -end; - - -procedure TGxContext.rect (x, y, w, h: Integer); - procedure hlinex (x, y, len: Integer); + end + else begin - if (len < 1) then exit; - glBegin(GL_QUADS); - glVertex2i(x, y); - glVertex2i(x+len, y); - glVertex2i(x+len, y+1); - glVertex2i(x, y+1); + glPointSize(1); + glBegin(GL_POINTS); + while (len > 0) do begin glVertex2i(x, y); Inc(y); Dec(len); end; glEnd(); end; +end; - procedure vlinex (x, y, len: Integer); - begin - if (len < 1) then exit; - glBegin(GL_QUADS); - glVertex2i(x, y); - glVertex2i(x, y+len); - glVertex2i(x+1, y+len); - glVertex2i(x+1, y); - glEnd(); - end; +procedure TGxContext.rect (x, y, w, h: Integer); begin if (not mActive) or (mClipRect.w < 1) or (mClipRect.h < 1) or (mColor.a = 0) then exit; if (w < 0) or (h < 0) then exit; @@ -851,10 +873,10 @@ begin end else begin - hlinex(x, y, w); - hlinex(x, y+h-1, w); - vlinex(x, y+1, h-2); - vlinex(x+w-1, y+1, h-2); + hline(x, y, w); + hline(x, y+h-1, w); + vline(x, y+1, h-2); + vline(x+w-1, y+1, h-2); end; end; end; @@ -993,6 +1015,30 @@ begin end; +procedure TGxContext.glSetScale (ascale: Single); +begin + if (ascale < 0.01) then ascale := 0.01; + glLoadIdentity(); + glScalef(ascale, ascale, 1.0); + mScale := ascale; + mScaled := (ascale <> 1.0); +end; + +procedure TGxContext.glSetTrans (ax, ay: Single); +begin + glLoadIdentity(); + glScalef(mScale, mScale, 1.0); + glTranslatef(ax, ay, 0); +end; + + +procedure TGxContext.glSetScaleTrans (ascale, ax, ay: Single); +begin + glSetScale(ascale); + glTranslatef(ax, ay, 0); +end; + + // ////////////////////////////////////////////////////////////////////////// // (* procedure oglRestoreMode (doClear: Boolean); diff --git a/src/flexui/fui_style.pas b/src/flexui/fui_style.pas index 6392b9f..31bbf21 100644 --- a/src/flexui/fui_style.pas +++ b/src/flexui/fui_style.pas @@ -128,15 +128,15 @@ const defaultStyleStr = 'default {'#10+ ' back-color: #008;'#10+ - ' #active: { text-color: #fff; hot-color: #f00; frame-color: #fff; frame-text-color: #fff; frame-icon-color: #0f0; }'#10+ - ' #inactive: { text-color: #aaa; hot-color: #a00; frame-color: #aaa; frame-text-color: #aaa; frame-icon-color: #0a0; }'#10+ - ' #disabled: { text-color: #666; frame-color: #888; frame-text-color: #888; frame-icon-color: #080; }'#10+ + ' #active: { text-color: #fff; hot-color: #f00; switch-color: #fff; frame-color: #fff; frame-text-color: #fff; frame-icon-color: #0f0; }'#10+ + ' #inactive: { text-color: #aaa; hot-color: #a00; switch-color: #aaa; frame-color: #aaa; frame-text-color: #aaa; frame-icon-color: #0a0; }'#10+ + ' #disabled: { text-color: #666; hot-color: #600; switch-color: #666; frame-color: #888; frame-text-color: #888; frame-icon-color: #080; }'#10+ ' @window: { #inactive(#active): { darken: 128; } }'#10+ ' @button: { back-color: #999; text-color: #000; hot-color: #600; #active: { back-color: #fff; hot-color: #c00; } #disabled: { back-color: #444; text-color: #333; hot-color: #333; } }'#10+ ' @label: { #inactive(#active); }'#10+ ' @static: { text-color: #ff0; #inactive(#active); }'#10+ ' @box: { #inactive(#active); }'#10+ - ' @switchbox: { switch-color: #fff; #active: { back-color: #080; } }'#10+ + ' @switchbox: { #active: { back-color: #080; } #inactive: { switch-color: #fff; } }'#10+ ' @checkbox(@switchbox): {}'#10+ ' @radiobox(@switchbox): {}'#10+ '}'#10+ diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index 0ded9ee..bcb2cfa 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -55,6 +55,7 @@ uses var + hlmContext: TGxContext = nil; //globalInited: Boolean = false; msX: Integer = -666; msY: Integer = -666; @@ -336,7 +337,7 @@ end; 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 @@ -344,6 +345,7 @@ begin cb.flExpand := true; cb.setVar(pvar); cb.text := text; + cb.id := aid; parent.appendChild(cb); end; @@ -359,6 +361,12 @@ begin 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; @@ -414,10 +422,12 @@ begin 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; @@ -849,6 +859,7 @@ var 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]; @@ -863,11 +874,11 @@ var 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 @@ -896,14 +907,16 @@ procedure plrDebugDraw (); 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; @@ -911,13 +924,14 @@ procedure plrDebugDraw (); 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; @@ -935,25 +949,31 @@ procedure plrDebugDraw (); 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); @@ -961,7 +981,8 @@ procedure plrDebugDraw (); //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; @@ -969,7 +990,8 @@ procedure plrDebugDraw (); 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; @@ -979,10 +1001,14 @@ procedure plrDebugDraw (); 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; @@ -1012,10 +1038,12 @@ procedure plrDebugDraw (); 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; @@ -1029,14 +1057,16 @@ procedure plrDebugDraw (); 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; @@ -1053,23 +1083,26 @@ procedure plrDebugDraw (); 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(); @@ -1095,7 +1128,8 @@ procedure plrDebugDraw (); 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); @@ -1106,24 +1140,26 @@ procedure plrDebugDraw (); 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; @@ -1144,15 +1180,15 @@ procedure plrDebugDraw (); 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; @@ -1191,13 +1227,13 @@ procedure plrDebugDraw (); 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; @@ -1205,14 +1241,20 @@ var 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(); @@ -1225,7 +1267,9 @@ begin 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; @@ -1257,11 +1301,17 @@ begin *) 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; -- 2.29.2