X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_graphics.pas;h=ca6dcf17bcbbb5565476c63f14b30e8fe3c8f2a2;hb=ff17260e083bdf4461154b916a716cd9b61126b1;hp=47e69d602a1cec3e3a93ba2e13a8d7bc32d449ed;hpb=563e770b462d67b2c8265b0e2b53384152afb7c1;p=d2df-sdl.git

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index 47e69d6..ca6dcf1 100644
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,12 @@ unit e_graphics;
 interface
 
 uses
-  SysUtils, Classes, Math, e_log, e_texture, SDL2, GL, GLExt, MAPDEF, ImagingTypes, Imaging, ImagingUtility;
+  {$INCLUDE ../nogl/noGLuses.inc}
+  {$IFDEF USE_SDL2}
+    SDL2,
+  {$ENDIF}
+  SysUtils, Classes, Math, e_log, e_texture,
+  MAPDEF, ImagingTypes, Imaging, ImagingUtility;
 
 type
   TMirrorType=(None, Horizontal, Vertical);
@@ -90,7 +94,6 @@ function e_CreateTextureEx(FileName: string; var ID: DWORD; fX, fY, fWidth, fHei
 function e_CreateTextureMem(pData: Pointer; dataSize: LongInt; var ID: DWORD): Boolean;
 function e_CreateTextureMemEx(pData: Pointer; dataSize: LongInt; var ID: DWORD; fX, fY, fWidth, fHeight: Word): Boolean;
 procedure e_GetTextureSize(ID: DWORD; Width, Height: PWord);
-function e_GetTextureSize2(ID: DWORD): TRectWH;
 procedure e_DeleteTexture(ID: DWORD);
 procedure e_RemoveAllTextures();
 
@@ -115,7 +118,8 @@ procedure e_TextureFontKill(FontID: DWORD);
 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_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD;
+                                Shadow: Boolean = False; Newlines: Boolean = False);
 procedure e_TextureFontGetSize(ID: DWORD; out CharWidth, CharHeight: Byte);
 procedure e_RemoveAllTextureFont();
 
@@ -128,8 +132,10 @@ procedure e_Clear(Mask: TGLbitfield; Red, Green, Blue: Single); overload;
 procedure e_Clear(); overload;
 procedure e_EndRender();
 
+{$IFDEF USE_SDL2}
 function e_GetGamma(win: PSDL_Window): Byte;
 procedure e_SetGamma(win: PSDL_Window;Gamma: Byte);
+{$ENDIF}
 
 procedure e_MakeScreenshot(st: TStream; Width, Height: Word);
 
@@ -164,7 +170,8 @@ type
    Base:        Uint32;
    CharWidth:   Byte;
    CharHeight:  Byte;
-   XC, YC, SPC: Word;
+   XC, YC:      WORD;
+   SPC:         ShortInt;
   end;
 
   TCharFont = record
@@ -364,104 +371,6 @@ begin
  if Height <> nil then Height^ := e_Textures[ID].tx.Height;
 end;
 
-function e_GetTextureSize2(ID: DWORD): TRectWH;
-var
-  data: PChar;
-  x, y: Integer;
-  w, h: Word;
-  a: Boolean;
-  lastline: Integer;
-begin
- w := e_Textures[ID].tx.Width;
- h := e_Textures[ID].tx.Height;
-
- Result.Y := 0;
- Result.X := 0;
- Result.Width := w;
- Result.Height := h;
-
- if e_NoGraphics then Exit;
-
- data := GetMemory(w*h*4);
- glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, e_Textures[ID].tx.id);
- glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-
- for y := h-1 downto 0 do
- begin
-  lastline := y;
-  a := True;
-
-  for x := 1 to w-4 do
-  begin
-   a := Byte((data+y*w*4+x*4+3)^) <> 0;
-   if a then Break;
-  end;
-
-  if a then
-  begin
-   Result.Y := h-lastline;
-   Break;
-  end;
- end;
-
- for y := 0 to h-1 do
- begin
-  lastline := y;
-  a := True;
-
-  for x := 1 to w-4 do
-  begin
-   a := Byte((data+y*w*4+x*4+3)^) <> 0;
-   if a then Break;
-  end;
-
-  if a then
-  begin
-   Result.Height := h-lastline-Result.Y;
-   Break;
-  end;
- end;
-
- for x := 0 to w-1 do
- begin
-  lastline := x;
-  a := True;
-
-  for y := 1 to h-4 do
-  begin
-   a := Byte((data+y*w*4+x*4+3)^) <> 0;
-   if a then Break;
-  end;
-
-  if a then
-  begin
-   Result.X := lastline+1;
-   Break;
-  end;
- end;
-
- for x := w-1 downto 0 do
- begin
-  lastline := x;
-  a := True;
-
-  for y := 1 to h-4 do
-  begin
-   a := Byte((data+y*w*4+x*4+3)^) <> 0;
-   if a then Break;
-  end;
-
-  if a then
-  begin
-   Result.Width := lastline-Result.X+1;
-   Break;
-  end;
- end;
-
- FreeMemory(data);
-end;
-
 procedure e_ResizeWindow(Width, Height: Integer);
 begin
   if Height = 0 then
@@ -950,6 +859,9 @@ end;
 procedure e_DrawQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0);
 var
   nX1, nY1, nX2, nY2: Integer;
+{$IFDEF USE_NANOGL}
+  v: array [0..15] of GLfloat;
+{$ENDIF}
 begin
   if e_NoGraphics then Exit;
   // Only top-left/bottom-right quad
@@ -976,7 +888,34 @@ begin
   glDisable(GL_TEXTURE_2D);
   glColor4ub(Red, Green, Blue, 255-Alpha);
   glLineWidth(1);
-
+{$IFDEF USE_NANOGL}
+  nX1 := X1; nY1 := Y1;
+  nX2 := X2; nY2 := Y1;
+  e_LineCorrection(nX1, nY1, nX2, nY2);
+  v[0] := nX1; v[1] := nY1; v[2] := nX2; v[3] := nY2;
+
+  nX1 := X2; nY1 := Y1;
+  nX2 := X2; nY2 := Y2;
+  e_LineCorrection(nX1, nY1, nX2, nY2);
+  v[4] := nX1; v[5] := nY1; v[6] := nX2; v[7] := nY2;
+
+  nX1 := X2; nY1 := Y2;
+  nX2 := X1; nY2 := Y2;
+  e_LineCorrection(nX1, nY1, nX2, nY2);
+  v[8] := nX1; v[9] := nY1; v[10] := nX2; v[11] := nY2;
+
+  nX1 := X1; nY1 := Y2;
+  nX2 := X1; nY2 := Y1;
+  e_LineCorrection(nX1, nY1, nX2, nY2);
+  v[12] := nX1; v[13] := nY1; v[14] := nX2; v[15] := nY2;
+
+  glVertexPointer(2, GL_FLOAT, 0, @v[0]);
+  glEnableClientState(GL_VERTEX_ARRAY);
+  glDisableClientState(GL_COLOR_ARRAY);
+  glDisableClientState(GL_NORMAL_ARRAY);
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+  glDrawArrays(GL_LINES, 0, 16);
+{$ELSE}
   glBegin(GL_LINES);
     nX1 := X1; nY1 := Y1;
     nX2 := X2; nY2 := Y1;
@@ -1002,6 +941,7 @@ begin
     glVertex2i(nX1, nY1);
     glVertex2i(nX2, nY2);
   glEnd();
+{$ENDIF}
 
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
 
@@ -1076,6 +1016,10 @@ end;
 
 
 procedure e_DrawLine(Width: Byte; X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byte = 0);
+{$IFDEF USE_NANOGL}
+  var
+    v: array [0..3] of GLfloat;
+{$ENDIF}
 begin
   if e_NoGraphics then Exit;
   // Pixel-perfect lines
@@ -1093,10 +1037,20 @@ begin
   glColor4ub(Red, Green, Blue, 255-Alpha);
   glLineWidth(Width);
 
+{$IFDEF USE_NANOGL}
+  v[0] := X1; v[1] := Y1; v[2] := X2; v[3] := Y2;
+  glVertexPointer(2, GL_FLOAT, 0, @v[0]);
+  glEnableClientState(GL_VERTEX_ARRAY);
+  glDisableClientState(GL_COLOR_ARRAY);
+  glDisableClientState(GL_NORMAL_ARRAY);
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+  glDrawArrays(GL_LINES, 0, 4);
+{$ELSE}
   glBegin(GL_LINES);
     glVertex2i(X1, Y1);
     glVertex2i(X2, Y2);
   glEnd();
+{$ENDIF}
 
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
 
@@ -1165,6 +1119,7 @@ begin
   glPopMatrix();
 end;
 
+{$IFDEF USE_SDL2}
 function e_GetGamma(win: PSDL_Window): Byte;
 var
   ramp: array [0..256*3-1] of Word;
@@ -1227,6 +1182,7 @@ begin
 
  SDL_SetWindowGammaRamp(win, @ramp[0], @ramp[256], @ramp[512]);
 end;
+{$ENDIF}
 
 function e_CharFont_Create(sp: ShortInt=0): DWORD;
 var
@@ -1447,11 +1403,12 @@ end;
 procedure e_CharFont_GetSizeFmt(FontID: DWORD; Text: string; var w, h: Word);
 var
   a, lines, len: Integer;
-  h2, w2: Word;
+  h2, w2, tw, th: Word;
 begin
   w2 := 0;
-  w := 0;
-  h := 0;
+  h2 := 0;
+  tw := 0;
+  th := 0;
 
   if Text = '' then Exit;
   if e_CharFonts = nil then Exit;
@@ -1467,29 +1424,26 @@ begin
       if Text[a] = #10 then
       begin
         Inc(lines);
-        if w2 > w then
-        begin
-          w := w2;
-          w2 := 0;
-        end;
-        continue;
-      end
-      else if Text[a] in [#1, #2, #3, #4, #18, #19, #20, #21] then
+        if w2 > tw then tw := w2;
+        w2 := 0;
         continue;
+      end;
 
       with Chars[Ord(Text[a])] do
-      if TextureID <> -1 then
-      begin
-        w2 := w2 + Width + IfThen(a = len, 0, Space);
-        e_GetTextureSize(TextureID, nil, @h2);
-        if h2 > h then h := h2;
-      end;
+        if TextureID <> -1 then
+        begin
+          w2 := w2 + Width + IfThen(a = len, 0, Space);
+          e_GetTextureSize(TextureID, nil, @h2);
+          if h2 > th then th := h2;
+        end;
     end;
   end;
 
-  if w2 > w then
-    w := w2;
-  h := h * lines;
+  if w2 > tw then
+    tw := w2;
+
+  w := tw;
+  h := th * lines;
 end;
 
 function e_CharFont_GetMaxWidth(FontID: DWORD): Word;
@@ -1550,8 +1504,10 @@ end;
 procedure e_TextureFontBuild(Tex: DWORD; var FontID: DWORD; XCount, YCount: Word;
                              Space: ShortInt=0);
 var
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
   loop1 : GLuint;
   cx, cy : real;
+{$ENDIF}
   i, id: DWORD;
 begin
  if e_NoGraphics then Exit;
@@ -1575,7 +1531,9 @@ begin
 
  with e_TextureFonts[id] do
  begin
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
   Base := glGenLists(XCount*YCount);
+{$ENDIF}
   TextureID := e_Textures[Tex].tx.id;
   CharWidth := (e_Textures[Tex].tx.Width div XCount)+Space;
   CharHeight := e_Textures[Tex].tx.Height div YCount;
@@ -1585,6 +1543,7 @@ begin
   SPC := Space;
  end;
 
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
  glBindTexture(GL_TEXTURE_2D, e_Textures[Tex].tx.id);
  for loop1 := 0 to XCount*YCount-1 do
  begin
@@ -1608,6 +1567,7 @@ begin
    glTranslated((e_Textures[Tex].tx.Width div XCount)+Space, 0, 0);
   glEndList();
  end;
+{$ENDIF}
 
  FontID := id;
 end;
@@ -1615,10 +1575,51 @@ end;
 procedure e_TextureFontKill(FontID: DWORD);
 begin
   if e_NoGraphics then Exit;
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
   glDeleteLists(e_TextureFonts[FontID].Base, 256);
+{$ENDIF}
   e_TextureFonts[FontID].Base := 0;
 end;
 
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+procedure e_TextureFontDrawChar(ch: Char; FontID: DWORD);
+  var
+    index: Integer;
+    cx, cy: GLfloat;
+    Tex: Integer;
+    Width, Height: Integer;
+    XCount, YCount: Integer;
+begin
+  index := Ord(ch) - 32;
+  Tex := e_TextureFonts[FontID].Texture;
+  Width := e_Textures[Tex].tx.Width;
+  Height := e_Textures[Tex].tx.Height;
+  XCount := e_TextureFonts[FontID].XC;
+  YCount := e_TextureFonts[FontID].YC;
+  cx := (index mod XCount)/XCount;
+  cy := (index div YCount)/YCount;
+  glBegin(GL_QUADS);
+    glTexCoord2f(cx, 1 - cy - 1/YCount);
+    glVertex2i(0, Height div YCount);
+    glTexCoord2f(cx + 1/XCount, 1 - cy - 1/YCount);
+    glVertex2i(Width div XCount, Height div YCount);
+    glTexCoord2f(cx + 1/XCount, 1 - cy);
+    glVertex2i(Width div XCount, 0);
+    glTexCoord2f(cx, 1 - cy);
+    glVertex2i(0, 0);
+  glEnd();
+  glTranslatef((e_Textures[Tex].tx.Width div XCount) + e_TextureFonts[FontID].SPC, 0, 0);
+end;
+
+procedure e_TextureFontDrawString(Text: String; FontID: DWORD);
+  var
+    i: Integer;
+begin
+  for i := 1 to High(Text) do
+    e_TextureFontDrawChar(Text[i], FontID);
+end;
+{$ENDIF}
+
 procedure e_TextureFontPrint(X, Y: GLint; Text: string; FontID: DWORD);
 begin
   if e_NoGraphics then Exit;
@@ -1633,9 +1634,13 @@ begin
   glPushMatrix;
   glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
   glEnable(GL_TEXTURE_2D);
-  glTranslated(x, y, 0);
+  glTranslatef(x, y, 0);
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+  e_TextureFontDrawString(Text, FontID);
+{$ELSE}
   glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32));
   glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text));
+{$ENDIF}
   glDisable(GL_TEXTURE_2D);
   glPopMatrix;
 
@@ -1651,15 +1656,23 @@ begin
   if Shadow then
   begin
    glColor4ub(0, 0, 0, 128);
-   glTranslated(X+1, Y+1, 0);
+   glTranslatef(X+1, Y+1, 0);
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+   e_TextureFontDrawChar(Ch, FontID);
+{$ELSE}
    glCallLists(1, GL_UNSIGNED_BYTE, @Ch);
+{$ENDIF}
    glPopMatrix;
    glPushMatrix;
   end;
 
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
-  glTranslated(X, Y, 0);
+  glTranslatef(X, Y, 0);
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+  e_TextureFontDrawChar(Ch, FontID);
+{$ELSE}
   glCallLists(1, GL_UNSIGNED_BYTE, @Ch);
+{$ENDIF}
 
   glPopMatrix;
 end;
@@ -1682,11 +1695,12 @@ begin
   result := e_TextureFonts[FontID].CharWidth;
 end;
 
-procedure e_TextureFontPrintFmt(X, Y: Integer; Text: string; FontID: DWORD; Shadow: Boolean = False);
+procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD;
+                                Shadow: Boolean = False; Newlines: Boolean = False);
 var
   a, TX, TY, len: Integer;
   tc, c: TRGB;
-  w: Word;
+  w, h: Word;
 begin
   if e_NoGraphics then Exit;
   if Text = '' then Exit;
@@ -1702,12 +1716,16 @@ begin
   len := Length(Text);
 
   w := e_TextureFonts[FontID].CharWidth;
+  h := e_TextureFonts[FontID].CharHeight;
 
   with e_TextureFonts[FontID] do
   begin
     glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
     glEnable(GL_TEXTURE_2D);
+
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
     glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32));
+{$ENDIF}
 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_BLEND);
@@ -1715,12 +1733,15 @@ begin
     for a := 1 to len do
     begin
       case Text[a] of
-        {#10: // line feed
+        #10: // line feed
         begin
-          TX := X;
-          TY := TY + h;
-          continue;
-        end;}
+          if Newlines then
+          begin
+            TX := X;
+            TY := TY + h;
+            continue;
+          end;
+        end;
         #1: // black
         begin
           c.R := 0; c.G := 0; c.B := 0;
@@ -1784,7 +1805,10 @@ begin
   glPushMatrix;
   glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
   glEnable(GL_TEXTURE_2D);
+
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
   glListBase(DWORD(Integer(e_TextureFonts[FontID].Base)-32));
+{$ENDIF}
 
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glEnable(GL_BLEND);
@@ -1792,17 +1816,25 @@ begin
   if Shadow then
   begin
    glColor4ub(0, 0, 0, 128);
-   glTranslated(x+1, y+1, 0);
+   glTranslatef(x+1, y+1, 0);
    glScalef(Scale, Scale, 0);
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+   e_TextureFontDrawString(Text, FontID);
+{$ELSE}
    glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text));
+{$ENDIF}
    glPopMatrix;
    glPushMatrix;
   end;
 
   glColor4ub(Red, Green, Blue, 255);
-  glTranslated(x, y, 0);
+  glTranslatef(x, y, 0);
   glScalef(Scale, Scale, 0);
+{$IF DEFINED(USE_NANOGL) or DEFINED(USE_NOGL)}
+  e_TextureFontDrawString(Text, FontID);
+{$ELSE}
   glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text));
+{$ENDIF}
 
   glDisable(GL_TEXTURE_2D);
   glPopMatrix;
@@ -1831,7 +1863,9 @@ begin
  for i := 0 to High(e_TextureFonts) do
   if e_TextureFonts[i].Base <> 0 then
   begin
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}  
    glDeleteLists(e_TextureFonts[i].Base, 256);
+{$ENDIF}
    e_TextureFonts[i].Base := 0;
   end;