X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gfx.pas;h=3a9c79cf7b7102bce7e6e22e00dcd8e6008a491d;hb=aab9c00a40aebab672c35d10258404b6eea517e7;hp=e92f369d78fd66ce8b8cfd57298003928bb0ef42;hpb=ec44acbac6483348e3fe093921232922541ea889;p=d2df-sdl.git diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas index e92f369..3a9c79c 100644 --- a/src/game/g_gfx.pas +++ b/src/game/g_gfx.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 @@ -65,8 +64,6 @@ procedure g_GFX_OnceAnim (X, Y: Integer; Anim: TAnimation; AnimType: Byte = 0); procedure g_Mark (x, y, Width, Height: Integer; t: Byte; st: Boolean=true); procedure g_GFX_Update (); -procedure g_GFX_Draw (); - var gpart_dbg_enabled: Boolean = true; @@ -76,6 +73,64 @@ var //WARNING: only for Holmes! function awmIsSetHolmes (x, y: Integer): Boolean; inline; + type (* private state *) + TPartType = (Blood, Spark, Bubbles, Water); + TPartState = (Free, Normal, Stuck, Sleeping); + TFloorType = (Wall, LiquidIn, LiquidOut); + // Wall: floorY is just before floor + // LiquidIn: floorY is liquid *start* (i.e. just in a liquid) + // LiquidOut: floorY is liquid *end* (i.e. just out of a liquid) + TEnvType = (EAir, ELiquid, EWall); // where particle is now + + // note: this MUST be record, so we can keep it in + // dynamic array and has sequential memory access pattern + PParticle = ^TParticle; + TParticle = record + x, y: Integer; + oldX, oldY: Integer; + velX, velY: Single; + accelX, accelY: Single; + state: TPartState; + particleType: TPartType; + red, green, blue: Byte; + alpha: Byte; + 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 + floorType: TFloorType; + env: TEnvType; // where particle is now + ceilingY: Integer; // actually, ceiling+1; `Unknown`: unknown + wallEndY: Integer; // if we stuck to a wall, this is where wall ends + + //k8: sorry, i have to emulate virtual methods this way, 'cause i haet `Object` + procedure thinkerBloodAndWater (); + procedure thinkerSpark (); + procedure thinkerBubble (); + + procedure findFloor (force: Boolean=false); // this updates `floorY` if forced or Unknown + procedure findCeiling (force: Boolean=false); // this updates `ceilingY` if forced or Unknown + + procedure freeze (); inline; // remove velocities and acceleration + procedure sleep (); inline; // switch to sleep mode + + function checkAirStreams (): Boolean; // `true`: affected by air stream + + function alive (): Boolean; inline; + procedure die (); inline; + procedure think (); inline; + end; + + TOnceAnim = record + AnimType: Byte; + x, y: Integer; + oldX, oldY: Integer; + Animation: TAnimation; + end; + + var (* private state *) + Particles: array of TParticle = nil; + OnceAnims: array of TOnceAnim = nil; implementation @@ -89,64 +144,7 @@ uses const Unknown = Integer($7fffffff); - -type - TPartType = (Blood, Spark, Bubbles, Water); - TPartState = (Free, Normal, Stuck, Sleeping); - TFloorType = (Wall, LiquidIn, LiquidOut); - // Wall: floorY is just before floor - // LiquidIn: floorY is liquid *start* (i.e. just in a liquid) - // LiquidOut: floorY is liquid *end* (i.e. just out of a liquid) - TEnvType = (EAir, ELiquid, EWall); // where particle is now - - // note: this MUST be record, so we can keep it in - // dynamic array and has sequential memory access pattern - PParticle = ^TParticle; - TParticle = record - x, y: Integer; - velX, velY: Single; - accelX, accelY: Single; - state: TPartState; - particleType: TPartType; - red, green, blue: Byte; - alpha: Byte; - 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 - floorType: TFloorType; - env: TEnvType; // where particle is now - ceilingY: Integer; // actually, ceiling+1; `Unknown`: unknown - wallEndY: Integer; // if we stuck to a wall, this is where wall ends - - //k8: sorry, i have to emulate virtual methods this way, 'cause i haet `Object` - procedure thinkerBloodAndWater (); - procedure thinkerSpark (); - procedure thinkerBubble (); - - procedure findFloor (force: Boolean=false); // this updates `floorY` if forced or Unknown - procedure findCeiling (force: Boolean=false); // this updates `ceilingY` if forced or Unknown - - procedure freeze (); inline; // remove velocities and acceleration - procedure sleep (); inline; // switch to sleep mode - - function checkAirStreams (): Boolean; // `true`: affected by air stream - - function alive (): Boolean; inline; - procedure die (); inline; - procedure think (); inline; - end; - - TOnceAnim = record - AnimType: Byte; - x, y: Integer; - Animation: TAnimation; - end; - - var - Particles: array of TParticle = nil; - OnceAnims: array of TOnceAnim = nil; MaxParticles: Integer = 0; CurrentParticle: Integer = 0; // awakeMap has one bit for each map grid cell; on g_Mark, @@ -337,35 +335,35 @@ var r: Integer; begin pan := g_Map_PanelAtPoint(x, y, GridTagLift); - result := (pan <> nil); + result := (pan <> nil) and WordBool(pan.PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)); r := Random(3); if result then begin - if ((pan.PanelType and PANEL_LIFTUP) <> 0) then - begin - if (velY > -1-r) then velY -= 0.8; - if (abs(velX) > 0.1) then velX -= velX/10.0; - velX += (Random-Random)*0.2; - accelY := 0.15; - end - else if ((pan.PanelType and PANEL_LIFTDOWN) <> 0) then - begin - if (velY < 1+r) then velY += 0.8; - accelY := 0.15; - end - else if ((pan.PanelType and PANEL_LIFTLEFT) <> 0) then - begin - if (velX > -8-r) then velX -= (8+r) div 2; - accelY := 0.15; - end - else if ((pan.PanelType and PANEL_LIFTRIGHT) <> 0) then - begin - if (velX < 8+r) then velX += (8+r) div 2; - accelY := 0.15; - end - else - begin - result := false; + case pan.LiftType of + LIFTTYPE_UP: + begin + if (velY > -1-r) then velY -= 0.8; + if (abs(velX) > 0.1) then velX -= velX/10.0; + velX += (Random-Random)*0.2; + accelY := 0.15; + end; + LIFTTYPE_DOWN: + begin + if (velY < 1+r) then velY += 0.8; + accelY := 0.15; + end; + LIFTTYPE_LEFT: + begin + if (velX > -8-r) then velX -= (8+r) div 2; + accelY := 0.15; + end; + LIFTTYPE_RIGHT: + begin + if (velX < 8+r) then velX += (8+r) div 2; + accelY := 0.15; + end; + else + result := false; end; // awake if result and (state = TPartState.Sleeping) then state := TPartState.Normal; @@ -457,7 +455,7 @@ var ex: Integer; begin if (not force) and (ceilingY <> Unknown) then exit; - if (nil = g_Map_traceToNearest(x, y, x, g_Map_MinY, GridTagObstacle, @ex, @ceilingY)) then + if (nil = g_Map_traceToNearest(x, y, x, g_Map_MinY, GridTagSolid, @ex, @ceilingY)) then begin ceilingY := g_Map_MinY-2; end; @@ -501,6 +499,8 @@ procedure TParticle.think (); inline; end; begin + oldx := x; + oldy := y; // awake sleeping particle, if necessary if awakeDirty then begin @@ -599,7 +599,7 @@ var pan: TPanel; dx, dy: SmallInt; ex, ey: Integer; - checkEnv, inAir: Boolean; + checkEnv, inAir, inStep: Boolean; floorJustTraced: Boolean; {$IF DEFINED(D2F_DEBUG_FALL_MPLAT)} oldFloorY: Integer; @@ -743,7 +743,24 @@ begin if (dx <> 0) then begin // has some horizontal velocity - pan := g_Map_traceToNearest(x, y, x+dx, y+dy, GridTagObstacle, @ex, @ey); + inStep := False; + pan := g_Map_traceToNearest(x, y, x+dx, y+dy, GridTagSolid, @ex, @ey); + if (pan = nil) and (dy >= 0) then + begin + // do not stuck inside step + if g_Map_traceToNearest(x, y, x, y, GridTagStep, nil, nil) = nil then + // check for step panel below + pan := g_Map_traceToNearest(x, y, x, y+dy, GridTagStep, nil, @ey); + inStep := pan <> nil; + if inStep then + begin + // stick to panel edges + if ex < pan.X then + ex := pan.X + else if ex > pan.X + pan.Width - 1 then + ex := pan.X + pan.Width - 1; + end; + end; checkEnv := (x <> ex); x := ex; y := ey; @@ -757,19 +774,24 @@ begin end; if (pan <> nil) then begin - // 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 - begin - // stuck to a wall - stickToWall(dx); - end + if inStep then + stickToWall(dx) else begin - // stuck to a ceiling - stickToCeiling(); + // 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, GridTagSolid) <> nil) then + begin + // stuck to a wall + stickToWall(dx); + end + else + begin + // stuck to a ceiling + stickToCeiling(); + end; end; end; end @@ -958,16 +980,18 @@ begin begin x := fX-devX1+Random(devX2); y := fY-devY1+Random(devY2); + oldx := x; + oldy := y; // check for level bounds if (x < g_Map_MinX) or (y < g_Map_MinY) or (x > g_Map_MaxX) or (y > g_Map_MaxY) then continue; // in what environment we are starting in? - pan := g_Map_PanelAtPoint(x, y, (GridTagObstacle or GridTagLiquid)); + pan := g_Map_PanelAtPoint(x, y, (GridTagSolid or GridTagLiquid)); if (pan <> nil) then begin // either in a wall, or in a liquid - if ((pan.tag and GridTagObstacle) <> 0) then continue; // don't spawn in walls + if ((pan.tag and GridTagSolid) <> 0) then continue; // don't spawn in walls env := TEnvType.ELiquid; end else @@ -1056,6 +1080,9 @@ begin accelY := 0.8; end; + oldx := x; + oldy := y; + // check for level bounds if (x < g_Map_MinX) or (y < g_Map_MinY) or (x > g_Map_MaxX) or (y > g_Map_MaxY) then continue; @@ -1198,6 +1225,8 @@ begin begin x := fX-devX1+Random(devX2); y := fY-devY1+Random(devY2); + oldx := x; + oldy := y; // check for level bounds if (x < g_Map_MinX) or (y < g_Map_MinY) or (x > g_Map_MaxX) or (y > g_Map_MaxY) then continue; @@ -1276,7 +1305,7 @@ begin 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, (GridTagSolid or GridTagLiquid), @ex, @ey); if (x <> ex) then begin floorY := Unknown; ceilingY := Unknown; end; // dunno yet x := ex; y := ey; @@ -1367,16 +1396,18 @@ begin begin x := fX-devX1+Random(devX2); y := fY-devY1+Random(devY2); + oldx := x; + oldy := y; // check for level bounds if (x < g_Map_MinX) or (y < g_Map_MinY) or (x > g_Map_MaxX) or (y > g_Map_MaxY) then continue; // in what environment we are starting in? - pan := g_Map_PanelAtPoint(x, y, (GridTagObstacle or GridTagLiquid)); + pan := g_Map_PanelAtPoint(x, y, (GridTagSolid or GridTagLiquid)); if (pan <> nil) then begin // either in a wall, or in a liquid - //if ((pan.tag and GridTagObstacle) <> 0) then continue; // don't spawn in walls + //if ((pan.tag and GridTagSolid) <> 0) then continue; // don't spawn in walls //env := TEnvType.ELiquid; continue; end @@ -1449,16 +1480,18 @@ begin begin x := fX-devX1+Random(devX2); y := fY-devY1+Random(devY2); + oldx := x; + oldy := y; // check for level bounds if (x < g_Map_MinX) or (y < g_Map_MinY) or (x > g_Map_MaxX) or (y > g_Map_MaxY) then continue; // in what environment we are starting in? - pan := g_Map_PanelAtPoint(x, y, (GridTagObstacle or GridTagLiquid)); + pan := g_Map_PanelAtPoint(x, y, (GridTagSolid or GridTagLiquid)); if (pan <> nil) then begin // either in a wall, or in a liquid - //if ((pan.tag and GridTagObstacle) <> 0) then continue; // don't spawn in walls + //if ((pan.tag and GridTagSolid) <> 0) then continue; // don't spawn in walls //env := TEnvType.ELiquid; continue; end @@ -1628,6 +1661,9 @@ begin for a := 0 to High(OnceAnims) do if OnceAnims[a].Animation <> nil then begin + OnceAnims[a].oldx := OnceAnims[a].x; + OnceAnims[a].oldy := OnceAnims[a].y; + case OnceAnims[a].AnimType of ONCEANIM_SMOKE: begin @@ -1649,96 +1685,4 @@ begin end; end; - -procedure g_GFX_Draw (); - 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); - 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); - for a := 0 to len do - begin - with Particles[a] do - begin - if not alive then continue; - 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; - end; - end; - - glEnd(); -{$ENDIF} - - glDisable(GL_BLEND); - end; - - if (OnceAnims <> nil) then - begin - len := High(OnceAnims); - for a := 0 to len do - begin - if (OnceAnims[a].Animation <> nil) then - begin - with OnceAnims[a] do Animation.Draw(x, y, TMirrorType.None); - end; - end; - end; -end; - - end.