diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index e75af88921d5fc2306767f98df5921c0241e76d2..567fb5f5d6e66ff87e9cba272861948e65650cc9 100644 (file)
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
-(* 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
const
BLOOD_NORMAL = 0;
BLOOD_SPARKS = 1;
+ BLOOD_CSPARKS = 2;
+ BLOOD_COMBINE = 3;
ONCEANIM_NONE = 0;
ONCEANIM_SMOKE = 1;
implementation
uses
- g_map, g_panel, g_basic, Math, e_graphics, GL, GLExt,
+ {$INCLUDE ../nogl/noGLuses.inc}
+ 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;
particleType: TPartType;
red, green, blue: Byte;
alpha: Byte;
- time, liveTime: Word;
+ time, liveTime, waitTime: Word;
stickDX: Integer; // STATE_STICK: -1,1: stuck to a wall; 0: stuck to ceiling
justSticked: Boolean; // not used
floorY: Integer; // actually, floor-1; `Unknown`: unknown
begin
if (env = TEnvType.ELiquid) then
begin
- time += 1;
+ if waitTime > 0 then
+ waitTime -= 1
+ else
+ time += 1;
if (liveTime <= 0) then begin die(); exit; end;
ex := 255-trunc(255.0*time/liveTime);
if (ex <= 10) then begin die(); exit; end;
begin
// water will disappear in any liquid
if (env = TEnvType.ELiquid) then begin die(); exit; end;
- time += 1;
+ if waitTime > 0 then
+ waitTime -= 1
+ else
+ time += 1;
// dry water
if (liveTime <= 0) then begin die(); exit; end;
ex := 255-trunc(255.0*time/liveTime);
begin
g_GFX_SparkVel(fX, fY, 2+Random(2), -vx div 2, -vy div 2, devX, devY);
exit;
+ end
+ else if (kind = BLOOD_CSPARKS) OR (kind = BLOOD_COMBINE) then
+ begin
+ g_GFX_SparkVel(fX, fY, count, -vx div 2, -vy div 2, devX, devY);
+ if kind <> BLOOD_COMBINE then exit
end;
l := Length(Particles);
state := TPartState.Normal;
time := 0;
liveTime := 120+Random(40);
+ waitTime := 20;
floorY := Unknown;
ceilingY := Unknown;
end;
state := TPartState.Normal;
time := 0;
liveTime := 60+Random(60);
+ waitTime := 120;
floorY := Unknown;
ceilingY := Unknown;
end;
if (velY > -4) then velY += accelY;
- time += 1;
+ if waitTime > 0 then
+ waitTime -= 1
+ else
+ time += 1;
end;
// 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}
particleType := TPartType.Bubbles;
time := 0;
liveTime := 65535;
+ waitTime := 0;
end;
if (CurrentParticle >= MaxParticles-1) then CurrentParticle := 0 else CurrentParticle += 1;
//writeln('spark1: pos=(', x, ',', y, '); delta=(', velX:6:3, ',', velY:6:3, '); state=', state, '; ceilingY=', ceilingY, '; floorY=', floorY);
- time += 1;
+ if waitTime > 0 then
+ waitTime -= 1
+ else
+ time += 1;
end;
state := TPartState.Normal;
time := 0;
liveTime := 30+Random(60);
+ waitTime := 0;
floorY := Unknown;
ceilingY := Unknown;
end;
state := TPartState.Normal;
time := 0;
liveTime := 30+Random(60);
+ waitTime := 0;
floorY := Unknown;
ceilingY := Unknown;
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);
end;
glEnd();
+{$ENDIF}
glDisable(GL_BLEND);
end;
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;