Reimplemented lines and particles rendering with nanoGL

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

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index 99d63e3a3fa22c9dff4a07fe26bd0c4e6eaa6146..18e4c1a676a81416360fc4c950bd25f4081ae864 100644 (file)
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -385,7 +385,7 @@ begin
  Result.Width := w;
  Result.Height := h;
 
-{$IFNDEF USE_NANOGL}
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support glGetTexImage
  if e_NoGraphics then Exit;
 
  data := GetMemory(w*h*4);
@@ -466,7 +466,7 @@ begin
  end;
 
  FreeMemory(data);
-{$ENDIF USE_NANOGL}
+{$ENDIF}
 end;
 
 procedure e_ResizeWindow(Width, Height: Integer);
@@ -958,6 +958,7 @@ procedure e_DrawQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue: Byte; Alpha: Byt
 var
   nX1, nY1, nX2, nY2: Integer;
 begin
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support glBegin(GL_LINES)
   if e_NoGraphics then Exit;
   // Only top-left/bottom-right quad
   if X1 > X2 then
@@ -1013,6 +1014,7 @@ begin
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
 
   glDisable(GL_BLEND);
+{$ENDIF}
 end;
 
 procedure e_DrawFillQuad(X1, Y1, X2, Y2: Integer; Red, Green, Blue, Alpha: Byte;
@@ -1083,6 +1085,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
@@ -1100,10 +1106,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);
 
@@ -1578,7 +1594,7 @@ begin
   id := High(e_TextureFonts);
  end;
 
-{$IFNDEF USE_NANOGL}
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
  with e_TextureFonts[id] do
  begin
   Base := glGenLists(XCount*YCount);
@@ -1622,7 +1638,7 @@ end;
 procedure e_TextureFontKill(FontID: DWORD);
 begin
   if e_NoGraphics then Exit;
-{$IFNDEF USE_NANOGL}
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
   glDeleteLists(e_TextureFonts[FontID].Base, 256);
 {$ENDIF}
   e_TextureFonts[FontID].Base := 0;
@@ -1630,6 +1646,7 @@ end;
 
 procedure e_TextureFontPrint(X, Y: GLint; Text: string; FontID: DWORD);
 begin
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
   if e_NoGraphics then Exit;
   if Integer(FontID) > High(e_TextureFonts) then Exit;
   if Text = '' then Exit;
@@ -1639,7 +1656,6 @@ begin
 
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
 
-{$IFNDEF USE_NANOGL}
   glPushMatrix;
   glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
   glEnable(GL_TEXTURE_2D);
@@ -1648,18 +1664,18 @@ begin
   glCallLists(Length(Text), GL_UNSIGNED_BYTE, PChar(Text));
   glDisable(GL_TEXTURE_2D);
   glPopMatrix;
-{$ENDIF}
 
   glDisable(GL_BLEND);
+{$ENDIF}
 end;
 
 // god forgive me for this, but i cannot figure out how to do it without lists
 procedure e_TextureFontPrintChar(X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False);
 begin
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
   if e_NoGraphics then Exit;
   glPushMatrix;
 
-{$IFNDEF USE_NANOGL}
   if Shadow then
   begin
    glColor4ub(0, 0, 0, 128);
@@ -1672,9 +1688,9 @@ begin
   glColor4ub(e_Colors.R, e_Colors.G, e_Colors.B, 255);
   glTranslated(X, Y, 0);
   glCallLists(1, GL_UNSIGNED_BYTE, @Ch);
-{$ENDIF}
 
   glPopMatrix;
+{$ENDIF}
 end;
 
 procedure e_TextureFontPrintCharEx (X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False);
@@ -1701,6 +1717,7 @@ var
   tc, c: TRGB;
   w: Word;
 begin
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
   if e_NoGraphics then Exit;
   if Text = '' then Exit;
   if e_TextureFonts = nil then Exit;
@@ -1716,7 +1733,6 @@ begin
 
   w := e_TextureFonts[FontID].CharWidth;
 
-{$IFNDEF USE_NANOGL}
   with e_TextureFonts[FontID] do
   begin
     glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
@@ -1793,10 +1809,10 @@ end;
 procedure e_TextureFontPrintEx(X, Y: GLint; Text: string; FontID: DWORD; Red, Green,
                     Blue: Byte; Scale: Single; Shadow: Boolean = False);
 begin
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
   if e_NoGraphics then Exit;
   if Text = '' then Exit;
 
-{$IFNDEF USE_NANOGL}
   glPushMatrix;
   glBindTexture(GL_TEXTURE_2D, e_TextureFonts[FontID].TextureID);
   glEnable(GL_TEXTURE_2D);
@@ -1848,7 +1864,7 @@ begin
  for i := 0 to High(e_TextureFonts) do
   if e_TextureFonts[i].Base <> 0 then
   begin
-{$IFNDEF USE_NANOGL}
+{$IFNDEF USE_NANOGL} // FIXIT: nanoGL doesn't support gl-lists
    glDeleteLists(e_TextureFonts[i].Base, 256);
 {$ENDIF}
    e_TextureFonts[i].Base := 0;