X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gfx.pas;h=df1d3c7590952e9375c783422b56e29efb2027f6;hb=67c6f2778c699f242412be03e2b874d14a7d10c9;hp=e75af88921d5fc2306767f98df5921c0241e76d2;hpb=7934e57057ee8f016b900c0c53c97204ac776244;p=d2df-sdl.git

diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index e75af88..df1d3c7 100644
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
@@ -1,4 +1,4 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * 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
@@ -78,7 +78,12 @@ function awmIsSetHolmes (x, y: Integer): Boolean; inline;
 implementation
 
 uses
-  g_map, g_panel, g_basic, Math, e_graphics, GL, GLExt,
+{$IFDEF USE_NANOGL}
+  nanoGL,
+{$ELSE}
+  GL, GLExt,
+{$ENDIF}
+  g_map, g_panel, g_basic, Math, e_graphics,
   g_options, g_console, SysUtils, g_triggers, MAPDEF,
   g_game, g_language, g_net, utils, xprofiler;
 
@@ -1186,14 +1191,14 @@ begin
       // tracer will return `false` if we started outside of the liquid
 
       {$IF DEFINED(D2F_DEBUG_BUBBLES)}
-      stt := curTimeMicro();
+      stt := getTimeMicro();
       ptr := mapGrid.traceOrthoRayWhileIn(liquidx, liquidTopY, x, y, x, 0, GridTagWater or GridTagAcid1 or GridTagAcid2);
-      stt := curTimeMicro()-stt;
+      stt := getTimeMicro()-stt;
       e_LogWritefln('traceOrthoRayWhileIn: time=%s (%s); liquidTopY=%s', [Integer(stt), ptr, liquidTopY]);
       //
-      stt := curTimeMicro();
+      stt := getTimeMicro();
       nptr := g_Map_TraceLiquidNonPrecise(x, y, 0, -8, liquidx, liquidTopY);
-      stt := curTimeMicro()-stt;
+      stt := getTimeMicro()-stt;
       e_LogWritefln('g_Map_TraceLiquidNonPrecise: time=%s (%s); liquidTopY=%s', [Integer(stt), nptr, liquidTopY]);
       if not nptr then continue;
       {$ELSE}
@@ -1619,19 +1624,60 @@ end;
 
 
 procedure g_GFX_Draw ();
-var
-  a, len: Integer;
+  var
+    a, len: Integer;
+{$IFDEF USE_NANOGL}
+  type
+    Vertex = record
+      x, y: GLfloat;
+      r, g, b, a: GLfloat;
+    end;
+  var
+    count: Integer;
+    v: array of Vertex;
+{$ENDIF}
 begin
   if not gpart_dbg_enabled then exit;
 
   if (Particles <> nil) then
   begin
     glDisable(GL_TEXTURE_2D);
-    glPointSize(2);
+         if (g_dbg_scale < 0.6) then glPointSize(1)
+    else if (g_dbg_scale > 1.3) then glPointSize(g_dbg_scale+1)
+    else glPointSize(2);
+    glDisable(GL_POINT_SMOOTH);
 
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+{$IFDEF USE_NANOGL}
+    count := 0;
+    SetLength(v, Length(Particles));
+    for a := 0 to High(Particles) do
+    begin
+      with Particles[a] do
+      begin
+        if alive and (x >= sX) and (y >= sY) and (x <= sX + sWidth) and (sY <= sY + sHeight) then
+        begin
+          v[count].x := x + 0.37;
+          v[count].y := y + 0.37;
+          v[count].r := red / 255;
+          v[count].g := green / 255;
+          v[count].b := blue / 255;
+          v[count].a := alpha / 255;
+          Inc(count);
+        end;
+      end;
+    end;
+
+    glVertexPointer(2, GL_FLOAT, SizeOf(Vertex), @v[0].x);
+    glColorPointer(4, GL_FLOAT, SizeOf(Vertex), @v[0].r);
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDrawArrays(GL_POINTS, 0, count);
+{$ELSE}
     glBegin(GL_POINTS);
 
     len := High(Particles);
@@ -1649,6 +1695,7 @@ begin
     end;
 
     glEnd();
+{$ENDIF}
 
     glDisable(GL_BLEND);
   end;
@@ -1660,7 +1707,7 @@ begin
     begin
       if (OnceAnims[a].Animation <> nil) then
       begin
-        with OnceAnims[a] do Animation.Draw(x, y, M_NONE);
+        with OnceAnims[a] do Animation.Draw(x, y, TMirrorType.None);
       end;
     end;
   end;