no more old mapreader: use textmap reader both for text and for binary maps

[d2df-sdl.git] / src / engine / e_graphics.pas

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index d3cb67e0d7e221191a3f367026351f06be8a0e4f..b7ddd2c5f06a46d8834afe1dcce0cbb54964aa3a 100644 (file)
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -13,13 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_graphics;
 
 interface
 
 uses
-  SysUtils, Classes, Math, e_log, e_textures, SDL2, GL, GLExt, MAPDEF, ImagingTypes, Imaging, ImagingUtility;
+  SysUtils, Classes, Math, e_log, e_texture, SDL2, GL, GLExt, MAPDEF, ImagingTypes, Imaging, ImagingUtility;
 
 type
   TMirrorType=(M_NONE, M_HORIZONTAL, M_VERTICAL);
@@ -29,9 +29,6 @@ type
     X, Y: Integer;
   end;
 
-  TPoint = MAPDEF.TPoint; // TODO: create an utiltypes.pas or something
-                          //       for other types like rect as well
-
   TPoint2f = record
     X, Y: Double;
   end;
@@ -49,7 +46,7 @@ type
    R, G, B: Byte;
   end;
 
-  PPoint = ^TPoint;
+  PDFPoint = ^TDFPoint;
   PPoint2f = ^TPoint2f;
   PRect = ^TRect;
   PRectWH = ^TRectWH;
@@ -65,7 +62,7 @@ procedure e_ResizeWindow(Width, Height: Integer);
 procedure e_Draw(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
                  Blending: Boolean; Mirror: TMirrorType = M_NONE);
 procedure e_DrawAdv(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
-                    Blending: Boolean; Angle: Single; RC: PPoint; Mirror: TMirrorType = M_NONE);
+                    Blending: Boolean; Angle: Single; RC: PDFPoint; Mirror: TMirrorType = M_NONE);
 procedure e_DrawSize(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
                      Blending: Boolean; Width, Height: Word; Mirror: TMirrorType = M_NONE);
 procedure e_DrawSizeMirror(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
@@ -77,6 +74,8 @@ procedure e_DrawLine(Width: Byte; X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byt
 procedure e_DrawQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0);
 procedure e_DrawFillQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue, Alpha: Byte;
                          Blending: TBlending = B_NONE);
+procedure e_DarkenQuad (x0, y0, x1, y1: Integer; a: Integer);
+procedure e_DarkenQuadWH (x, y, w, h: Integer; a: Integer);
 
 function e_CreateTextureImg (var img: TImageData; var ID: DWORD): Boolean;
 function e_CreateTexture(FileName: string; var ID: DWORD): Boolean;
@@ -110,7 +109,7 @@ procedure e_TextureFontPrint(X, Y: GLint; Text: string; FontID: DWORD);
 procedure e_TextureFontPrintEx(X, Y: GLint; Text: string; FontID: DWORD; Red, Green,
                                Blue: Byte; Scale: Single; Shadow: Boolean = False);
 procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD; Shadow: Boolean = False);
-procedure e_TextureFontGetSize(ID: DWORD; var CharWidth, CharHeight: Byte);
+procedure e_TextureFontGetSize(ID: DWORD; out CharWidth, CharHeight: Byte);
 procedure e_RemoveAllTextureFont();
 
 function e_TextureFontCharWidth (ch: Char; FontID: DWORD): Integer;
@@ -681,7 +680,7 @@ begin
 end;
 
 procedure e_DrawAdv(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
-                    Blending: Boolean; Angle: Single; RC: PPoint; Mirror: TMirrorType = M_NONE);
+                    Blending: Boolean; Angle: Single; RC: PDFPoint; Mirror: TMirrorType = M_NONE);
 begin
   if e_NoGraphics then Exit;
 
@@ -861,6 +860,34 @@ begin
   glDisable(GL_BLEND);
 end;
 
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure e_DarkenQuad (x0, y0, x1, y1: Integer; a: Integer);
+begin
+  if (a < 0) then a := 0;
+  if (a > 255) then a := 255;
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
+  glDisable(GL_TEXTURE_2D);
+  glColor4ub(0, 0, 0, Byte(255-a));
+  glBegin(GL_QUADS);
+    glVertex2i(x0, y0);
+    glVertex2i(x1, y0);
+    glVertex2i(x1, y1);
+    glVertex2i(x0, y1);
+  glEnd();
+  //glRect(x, y, x+w, y+h);
+  glColor4ub(1, 1, 1, 1);
+  glDisable(GL_BLEND);
+  //glBlendEquation(GL_FUNC_ADD);
+end;
+
+procedure e_DarkenQuadWH (x, y, w, h: Integer; a: Integer);
+begin
+  if (w > 0) and (h > 0) then e_DarkenQuad(x, y, x+w, y+h, a);
+end;
+
+
 procedure e_DrawLine(Width: Byte; X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0);
 begin
   if e_NoGraphics then Exit;
@@ -1596,7 +1623,7 @@ begin
   glDisable(GL_BLEND);
 end;
 
-procedure e_TextureFontGetSize(ID: DWORD; var CharWidth, CharHeight: Byte);
+procedure e_TextureFontGetSize(ID: DWORD; out CharWidth, CharHeight: Byte);
 begin
   CharWidth := 16;
   CharHeight := 16;
@@ -1739,7 +1766,7 @@ begin
         sign[2] := 68;
         sign[3] := 82;
         st.writeBuffer(sign, 4);
-        crc := crc32(0, @sign, 4);
+        crc := crc32(0, @sign[0], 4);
         hbuf[0] := 0;
         hbuf[1] := 0;
         hbuf[2] := (Width shr 8) and $ff;
@@ -1753,7 +1780,7 @@ begin
         hbuf[10] := 0; // compression method
         hbuf[11] := 0; // filter method
         hbuf[12] := 0; // no interlace
-        crc := crc32(crc, @hbuf, 13);
+        crc := crc32(crc, @hbuf[0], 13);
         st.writeBuffer(hbuf, 13);
         writeIntBE(st, crc);
         //e_WriteLog('PNG: header written', MSG_NOTIFY);
@@ -1765,7 +1792,7 @@ begin
         sign[2] := 65;
         sign[3] := 84;
         st.writeBuffer(sign, 4);
-        crc := crc32(0, @sign, 4);
+        crc := crc32(0, @sign[0], 4);
         crc := crc32(crc, obuf, dlen);
         st.writeBuffer(obuf^, dlen);
         writeIntBE(st, crc);
@@ -1778,7 +1805,7 @@ begin
         sign[2] := 78;
         sign[3] := 68;
         st.writeBuffer(sign, 4);
-        crc := crc32(0, @sign, 4);
+        crc := crc32(0, @sign[0], 4);
         writeIntBE(st, crc);
         //e_WriteLog('PNG: end marker written', MSG_NOTIFY);
       finally