diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index ff7089b46f31177abfc89971a3f66a28b8838e36..e4c46f199d17a9bf74a2180be95d1ff5e4fc0c4c 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;
ex: Integer;
begin
state := TPartState.Stuck;
- if (dX > 0) then stickDX := 1 else stickDX := -1;
+ if (dx > 0) then stickDX := 1 else stickDX := -1;
freeze();
// find next floor transition
findFloor();
_done, _gravityagain, _stuckagain;
var
pan: TPanel;
- dX, dY: SmallInt;
+ dx, dy: SmallInt;
ex, ey: Integer;
checkEnv: Boolean;
floorJustTraced: Boolean;
oldFloorY: Integer;
{$ENDIF}
begin
- if not gpart_dbg_phys_enabled then goto _done;
+ if not gpart_dbg_phys_enabled then begin x += round(velX); y += round(velY); goto _done; end;
if gAdvBlood then
begin
end;
// it is important to have it here
- dX := round(velX);
- dY := round(velY);
+ dx := round(velX);
+ dy := round(velY);
if (state = TPartState.Normal) then checkAirStreams();
end;
// trace movement
- if (dX <> 0) then
+ if (dx <> 0) then
begin
// has some horizontal velocity
- pan := g_Map_traceToNearest(x, y, x+dX, y+dY, GridTagObstacle, @ex, @ey);
+ pan := g_Map_traceToNearest(x, y, x+dx, y+dy, GridTagObstacle, @ex, @ey);
checkEnv := (x <> ex);
x := ex;
y := ey;
// we stuck
// the only case when we can have both ceiling and wall is corner; stick to wall in this case
// check if we stuck to a wall
- if (dX < 0) then dX := -1 else dX := 1;
- if (g_Map_PanelAtPoint(x+dX, y, GridTagObstacle) <> nil) then
+ if (dx < 0) then dx := -1 else dx := 1;
+ if (g_Map_PanelAtPoint(x+dx, y, GridTagObstacle) <> nil) then
begin
// stuck to a wall
- stickToWall(dX);
+ stickToWall(dx);
end
else
begin
end;
end;
end
- else if (dY <> 0) then
+ else if (dy <> 0) then
begin
// has only vertical velocity
- if (dY < 0) then
+ if (dy < 0) then
begin
// flying up
if (ceilingY = Unknown) then findCeiling(); // need to do this anyway
- y += dY;
+ y += dy;
if (y <= ceilingY) then begin y := ceilingY; stickToCeiling(); end; // oops, hit a ceiling
// environment didn't changed
end
else
begin
- while (dY > 0) do
+ while (dy > 0) do
begin
// falling down
floorJustTraced := (floorY = Unknown);
if floorJustTraced then findFloor();
if (floorType = TFloorType.LiquidOut) then env := TEnvType.ELiquid else env := TEnvType.EAir;
- y += dY;
+ y += dy;
//e_LogWritefln('floorY=%s; newy=%s; dY=%s; floorType=%s', [floorY, y, dY, floorType]);
if (y >= floorY) then
begin
// floor transition
- dY := y-floorY;
+ dy := y-floorY;
y := floorY;
//e_LogWritefln(' HIT FLOORY: floorY=%s; newy=%s; dY=%s; floorType=%s', [floorY, y, dY, floorType]);
case floorType of
else
begin
// simple blood
- dX := round(velX);
- dY := round(velY);
- y += dY;
- x += dX;
+ dx := round(velX);
+ dy := round(velY);
+ y += dy;
+ x += dx;
if (g_Map_PanelAtPoint(x, y, GridTagObstacle) <> nil) then begin die(); exit; end;
end;
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);
// ////////////////////////////////////////////////////////////////////////// //
procedure TParticle.thinkerBubble ();
var
- dY: Integer;
+ dy: Integer;
begin
- dY := round(velY);
+ dy := round(velY);
- if (dY <> 0) then
+ if (dy <> 0) then
begin
- y += dY;
- if (dY < 0) then
+ y += dy;
+ if (dy < 0) then
begin
if (y <= ceilingY) then begin die(); exit; end;
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}
label
_done;
var
- dX, dY: SmallInt;
+ dx, dy: SmallInt;
pan: TPanel;
ex, ey: Integer;
begin
- if not gpart_dbg_phys_enabled then goto _done;
+ if not gpart_dbg_phys_enabled then begin x += round(velX); y += round(velY); goto _done; end;
+
+ dx := round(velX);
+ dy := round(velY);
- dX := round(velX);
- dY := round(velY);
+ //writeln('spark0: pos=(', x, ',', y, '); delta=(', dx, ',', dy, '); state=', state, '; ceilingY=', ceilingY, '; floorY=', floorY);
// apply gravity
if (abs(velX) < 0.1) and (abs(velY) < 0.1) then
end;
// flying
- if (dX <> 0) then
+ if (dx <> 0) then
begin
// has some horizontal velocity
- pan := g_Map_traceToNearest(x, y, x+dX, y+dY, (GridTagObstacle or GridTagLiquid), @ex, @ey);
+ pan := g_Map_traceToNearest(x, y, x+dx, y+dy, (GridTagObstacle or GridTagLiquid), @ex, @ey);
if (x <> ex) then begin floorY := Unknown; ceilingY := Unknown; end; // dunno yet
x := ex;
y := ey;
accelX := 0;
end;
end
- else if (dY <> 0) then
+ else if (dy <> 0) then
begin
// has some vertical velocity
- if (dY < 0) then
+ if (dy < 0) then
begin
// flying up
if (ceilingY = Unknown) then findCeiling(); // need to do this anyway
- y += dY;
+ y += dy;
if (y <= ceilingY) then
begin
// oops, hit a ceiling
begin
// falling down
if (floorY = Unknown) then findFloor(); // need to do this anyway
- y += dY;
+ y += dy;
if (y >= floorY) then
begin
// hit something except a floor?
velY += accelY;
end;
+ //writeln('spark1: pos=(', x, ',', y, '); delta=(', velX:6:3, ',', velY:6:3, '); state=', state, '; ceilingY=', ceilingY, '; floorY=', floorY);
+
time += 1;
end;
procedure g_GFX_Draw ();
-var
- a, len: Integer;
- scaled: Boolean;
+ 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);
- glBegin(GL_POINTS);
+{$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;
- scaled := (g_dbg_scale <> 1.0);
+ 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);
for a := 0 to len do
with Particles[a] do
begin
if not alive then continue;
- if scaled or ((x >= sX) and (y >= sY) and (x <= sX+sWidth) and (sY <= sY+sHeight)) then
+ if (x >= sX) and (y >= sY) and (x <= sX+sWidth) and (sY <= sY+sHeight) then
begin
glColor4ub(red, green, blue, alpha);
glVertex2f(x+0.37, y+0.37);
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;