X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_map.pas;h=3364f1f3ddd94830a9bb4d387d58168302527ad6;hb=2399d51c8549c670168cec41463122239b50b03a;hp=8438e2d35db92e44cf931e8c34881487d55f10e0;hpb=99e8b41f80c372df968e5a10586667f856a66a87;p=d2df-sdl.git diff --git a/src/game/renders/opengl/r_map.pas b/src/game/renders/opengl/r_map.pas index 8438e2d..3364f1f 100644 --- a/src/game/renders/opengl/r_map.pas +++ b/src/game/renders/opengl/r_map.pas @@ -17,6 +17,8 @@ unit r_map; interface + uses g_base, g_player; // TRectWH, TPlayer + procedure r_Map_Initialize; procedure r_Map_Finalize; @@ -26,11 +28,16 @@ interface procedure r_Map_LoadTextures; procedure r_Map_FreeTextures; +{$IFDEF ENABLE_GFX} procedure r_Map_NewGFX (typ, x, y: Integer); +{$ENDIF} +{$IFDEF ENABLE_GIBS} + function r_Map_GetGibSize (m, i: Integer): TRectWH; +{$ENDIF} procedure r_Map_Update; - procedure r_Map_Draw (x, y, w, h, camx, camy: Integer); + procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer); implementation @@ -43,11 +50,17 @@ implementation {$ENDIF} e_log, binheap, MAPDEF, utils, - g_options, g_textures, g_basic, g_base, g_phys, - g_game, g_map, g_panel, g_items, g_monsters, g_playermodel, g_player, g_weapons, + g_options, g_textures, g_basic, g_phys, + g_game, g_map, g_panel, g_items, g_monsters, g_playermodel, g_weapons, {$IFDEF ENABLE_CORPSES} g_corpses, {$ENDIF} + {$IFDEF ENABLE_SHELLS} + g_shells, + {$ENDIF} + {$IFDEF ENABLE_GIBS} + g_gibs, + {$ENDIF} {$IFDEF ENABLE_GFX} g_gfx, {$ENDIF} @@ -83,6 +96,55 @@ implementation VILEFIRE_DX = 32; VILEFIRE_DY = 128; + ItemAnim: array [0..ITEM_LAST] of record + name: AnsiString; + w, h: Integer; + d: Integer; // delay + n: Integer; // count + b: Boolean; // backanim + end = ( + (name: ''; w: 0; h: 0; d: 0; n: 0; b: False), + (name: 'MED1'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'MED2'; w: 32; h: 32; d: 0; n: 1; b: False), + (name: 'BMED'; w: 32; h: 32; d: 0; n: 1; b: False), + (name: 'ARMORGREEN'; w: 32; h: 16; d: 20; n: 3; b: True), + (name: 'ARMORBLUE'; w: 32; h: 16; d: 20; n: 3; b: True), + (name: 'SBLUE'; w: 32; h: 32; d: 15; n: 4; b: True), + (name: 'SWHITE'; w: 32; h: 32; d: 20; n: 4; b: True), + (name: 'SUIT'; w: 32; h: 64; d: 0; n: 1; b: False), + (name: 'OXYGEN'; w: 16; h: 32; d: 0; n: 1; b: False), + (name: 'INVUL'; w: 32; h: 32; d: 20; n: 4; b: True), + (name: 'SAW'; w: 64; h: 32; d: 0; n: 1; b: False), + (name: 'SHOTGUN1'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'SHOTGUN2'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'MGUN'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'RLAUNCHER'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'PGUN'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'BFG'; w: 64; h: 64; d: 0; n: 1; b: False), + (name: 'SPULEMET'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'CLIP'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'AMMO'; w: 32; h: 16; d: 0; n: 1; b: False), + (name: 'SHELL1'; w: 16; h: 8; d: 0; n: 1; b: False), + (name: 'SHELL2'; w: 32; h: 16; d: 0; n: 1; b: False), + (name: 'ROCKET'; w: 16; h: 32; d: 0; n: 1; b: False), + (name: 'ROCKETS'; w: 64; h: 32; d: 0; n: 1; b: False), + (name: 'CELL'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'CELL2'; w: 32; h: 32; d: 0; n: 1; b: False), + (name: 'BPACK'; w: 32; h: 32; d: 0; n: 1; b: False), + (name: 'KEYR'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'KEYG'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'KEYB'; w: 16; h: 16; d: 0; n: 1; b: False), + (name: 'KASTET'; w: 64; h: 32; d: 0; n: 1; b: False), + (name: 'PISTOL'; w: 64; h: 16; d: 0; n: 1; b: False), + (name: 'BOTTLE'; w: 16; h: 32; d: 20; n: 4; b: True), + (name: 'HELMET'; w: 16; h: 16; d: 20; n: 4; b: True), + (name: 'JETPACK'; w: 32; h: 32; d: 15; n: 3; b: True), + (name: 'INVIS'; w: 32; h: 32; d: 20; n: 4; b: True), + (name: 'FLAMETHROWER'; w: 64; h: 32; d: 0; n: 1; b: False), + (name: 'FUELCAN'; w: 16; h: 32; d: 0; n: 1; b: False) + ); + +{$IFDEF ENABLE_GFX} GFXAnim: array [0..R_GFX_LAST] of record name: AnsiString; w, h: Integer; @@ -111,6 +173,7 @@ implementation (name: 'SMOKE'; w: 32; h: 32; count: 10; back: false; speed: 3; rspeed: 0; alpha: 150), // transparent (name: 'FLAME'; w: 32; h: 32; count: 11; back: false; speed: 3; rspeed: 2; alpha: 0) // random ); +{$ENDIF} ShotAnim: array [0..WEAPON_LAST] of record name: AnsiString; @@ -146,6 +209,17 @@ implementation (name: 'BSKELFIRE'; w: 64; h: 64; count: 2) // 26 SKEL_FIRE ); +{$IFDEF ENABLE_SHELLS} + ShellAnim: array [0..SHELL_LAST] of record + name: AnsiString; + dx, dy: Integer; + end = ( + (name: 'EBULLET'; dx: 2; dy: 1), // 0 SHELL_BULLET + (name: 'ESHELL'; dx: 4; dy: 2), // 1 SHELL_SHELL + (name: 'ESHELL'; dx: 4; dy: 2) // 2 SHELL_DBLSHELL + ); +{$ENDIF} + type TBinHeapPanelDrawCmp = class public @@ -162,7 +236,7 @@ implementation spec: LongInt; tex: TGLMultiTexture; end; - Items: array [0..ITEM_MAX] of record + Items: array [0..ITEM_LAST] of record tex: TGLMultiTexture; anim: TAnimState; end; @@ -170,24 +244,27 @@ implementation WeapTextures: array [0..WP_LAST, 0..W_POS_LAST, 0..W_ACT_LAST] of TGLTexture; ShotTextures: array [0..WEAPON_LAST] of TGLMultiTexture; FlagTextures: array [0..FLAG_LAST] of TGLMultiTexture; + PunchTextures: array [Boolean, 0..2] of TGLMultiTexture; // [berserk, center/up/down] VileFire: TGLMultiTexture; + InvulPenta: TGLTexture; Models: array of record anim: array [TDirection, 0..A_LAST] of record base, mask: TGLMultiTexture; end; -(* - {$IFDEF ENABLE_GIBS} - gibs: array of record - base, mask: TGLTexture; - rect: TRectWH; - end; - {$ENDIF} -*) +{$IFDEF ENABLE_GIBS} + gibs: record + base, mask: TGLTextureArray; + rect: TRectArray; + end; +{$ENDIF} end; - StubShotAnim: TAnimState; + StubShotAnim: TAnimState; // TODO remove this hack FlagAnim: TAnimState; +{$IFDEF ENABLE_SHELLS} + ShellTextures: array [0..SHELL_LAST] of TGLTexture; +{$ENDIF} {$IFDEF ENABLE_GFX} GFXTextures: array [0..R_GFX_LAST] of TGLMultiTexture; gfxlist: array of record @@ -221,9 +298,40 @@ implementation StubShotAnim.Invalidate; end; + procedure r_Map_FreeModel (i: Integer); + var a: Integer; d: TDirection; + begin + for d := TDirection.D_LEFT to TDirection.D_RIGHT do + begin + for a := A_STAND to A_LAST do + begin + if Models[i].anim[d, a].base <> nil then + Models[i].anim[d, a].base.Free; + if Models[i].anim[d, a].mask <> nil then + Models[i].anim[d, a].mask.Free; + Models[i].anim[d, a].base := nil; + Models[i].anim[d, a].mask := nil; + end; + end; + {$IFDEF ENABLE_GIBS} + if Models[i].gibs.base <> nil then + for a := 0 to High(Models[i].gibs.base) do + Models[i].gibs.base[a].Free; + if Models[i].gibs.mask <> nil then + for a := 0 to High(Models[i].gibs.mask) do + Models[i].gibs.mask[a].Free; + Models[i].gibs.base := nil; + Models[i].gibs.mask := nil; + Models[i].gibs.rect := nil; + {$ENDIF} + end; + procedure r_Map_LoadModel (i: Integer); var prefix: AnsiString; a: Integer; d: TDirection; m: ^TPlayerModelInfo; begin + ASSERT(i < Length(Models)); + ASSERT(i < Length(PlayerModelsArray)); + r_Map_FreeModel(i); m := @PlayerModelsArray[i]; prefix := m.FileName + ':TEXTURES/'; for d := TDirection.D_LEFT to TDirection.D_RIGHT do @@ -238,116 +346,87 @@ implementation Models[i].anim[d, a].mask := r_Textures_LoadMultiFromFileAndInfo(prefix + m.anim[d, a].mask, 64, 64, m.anim[d, a].frames, m.anim[d, a].back, true); end end; -(* {$IFDEF ENABLE_GIBS} - Models[i].gibs := nil; + Models[i].gibs.base := nil; + Models[i].gibs.mask := nil; + Models[i].gibs.rect := nil; if m.GibsCount > 0 then begin - SetLength(Models[i].gibs, m.GibsCount); + SetLength(Models[i].gibs.base, m.GibsCount); + SetLength(Models[i].gibs.mask, m.GibsCount); + SetLength(Models[i].gibs.rect, m.GibsCount); + for a := 0 to m.GibsCount - 1 do + Models[i].gibs.rect[a] := DefaultGibSize; + if r_Textures_LoadStreamFromFile(prefix + m.GibsResource, 32, 32, m.GibsCount, Models[i].gibs.base, Models[i].gibs.rect) then + begin + if r_Textures_LoadStreamFromFile(prefix + m.GibsMask, 32, 32, m.GibsCount, Models[i].gibs.mask, nil) then + begin + // ok + end; + end; end; {$ENDIF} -*) end; + procedure r_Map_LoadMonsterAnim (m, a: Integer; d: TDirection); + const dir: array [TDirection] of AnsiString = ('_L', ''); + var w, h, count: Integer; + begin + count := MONSTER_ANIMTABLE[m].AnimCount[a]; + if count > 0 then + begin + w := MTABLE[m].w; + h := MTABLE[m].h; + if (m = MONSTER_SOUL) and (a = ANIM_DIE) then + begin + // special case + w := 128; + h := 128; + end; + MonTextures[m, a, d] := r_Textures_LoadMultiFromFileAndInfo( + GameWAD + ':MTEXTURES/' + MONSTERTABLE[m].name + '_' + ANIMTABLE[a].name + dir[d], + w, + h, + count, + False, + False + ); + end + else + MonTextures[m, a, d] := nil; + end; procedure r_Map_Load; const WeapName: array [0..WP_LAST] of AnsiString = ('', 'CSAW', 'HGUN', 'SG', 'SSG', 'MGUN', 'RKT', 'PLZ', 'BFG', 'SPL', 'FLM'); WeapPos: array [0..W_POS_LAST] of AnsiString = ('', '_UP', '_DN'); WeapAct: array [0..W_ACT_LAST] of AnsiString = ('', '_FIRE'); + PunchName: array [Boolean] of AnsiString = ('PUNCH', 'PUNCHB'); var - i, j, k: Integer; d: TDirection; - - procedure LoadItem (i: Integer; const name: AnsiString; w, h, delay, count: Integer; backanim: Boolean); - begin - ASSERT(i >= 0); - ASSERT(i <= ITEM_MAX); - Items[i].tex := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/' + name, w, h, count, backanim, false); - if backanim then count := count * 2 - 2; - Items[i].anim := TAnimState.Create(True, delay, count); - ASSERT(Items[i].tex <> NIL); - end; - - procedure LoadMonster (m, a: Integer; d: TDirection); - const - dir: array [TDirection] of AnsiString = ('_L', ''); - var - w, h, count: Integer; + i, j, k: Integer; d: TDirection; b: Boolean; + begin + // --------- items --------- // + for i := 0 to ITEM_LAST do begin - count := MONSTER_ANIMTABLE[m].AnimCount[a]; - if count > 0 then + if ItemAnim[i].n > 0 then begin - w := MTABLE[m].w; - h := MTABLE[m].h; - if (m = MONSTER_SOUL) and (a = ANIM_DIE) then - begin - // special case - w := 128; - h := 128; - end; - MonTextures[m, a, d] := r_Textures_LoadMultiFromFileAndInfo( - GameWAD + ':MTEXTURES/' + MONSTERTABLE[m].name + '_' + ANIMTABLE[a].name + dir[d], - w, - h, - count, - False, - False - ) - end - else - MonTextures[m, a, d] := nil + Items[i].tex := r_Textures_LoadMultiFromFileAndInfo( + GameWAD + ':TEXTURES/' + ItemAnim[i].name, + ItemAnim[i].w, + ItemAnim[i].h, + ItemAnim[i].n, + ItemAnim[i].b, + false + ); + k := IfThen(ItemAnim[i].b, ItemAnim[i].n * 2 - 2, ItemAnim[i].n); + Items[i].anim := TAnimState.Create(True, ItemAnim[i].d, k); + end; end; - - begin - // --------- items --------- // - // i name w h d n backanim - LoadItem(ITEM_NONE, 'NOTEXTURE', 16, 16, 0, 1, False); - LoadItem(ITEM_MEDKIT_SMALL, 'MED1', 16, 16, 0, 1, False); - LoadItem(ITEM_MEDKIT_LARGE, 'MED2', 32, 32, 0, 1, False); - LoadItem(ITEM_MEDKIT_BLACK, 'BMED', 32, 32, 0, 1, False); - LoadItem(ITEM_ARMOR_GREEN, 'ARMORGREEN', 32, 16, 20, 3, True); - LoadItem(ITEM_ARMOR_BLUE, 'ARMORBLUE', 32, 16, 20, 3, True); - LoadItem(ITEM_SPHERE_BLUE, 'SBLUE', 32, 32, 15, 4, True); - LoadItem(ITEM_SPHERE_WHITE, 'SWHITE', 32, 32, 20, 4, True); - LoadItem(ITEM_SUIT, 'SUIT', 32, 64, 0, 1, False); - LoadItem(ITEM_OXYGEN, 'OXYGEN', 16, 32, 0, 1, False); - LoadItem(ITEM_INVUL, 'INVUL', 32, 32, 20, 4, True); - LoadItem(ITEM_WEAPON_SAW, 'SAW', 64, 32, 0, 1, False); - LoadItem(ITEM_WEAPON_SHOTGUN1, 'SHOTGUN1', 64, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_SHOTGUN2, 'SHOTGUN2', 64, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_CHAINGUN, 'MGUN', 64, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_ROCKETLAUNCHER, 'RLAUNCHER', 64, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_PLASMA, 'PGUN', 64, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_BFG, 'BFG', 64, 64, 0, 1, False); - LoadItem(ITEM_WEAPON_SUPERPULEMET, 'SPULEMET', 64, 16, 0, 1, False); - LoadItem(ITEM_AMMO_BULLETS, 'CLIP', 16, 16, 0, 1, False); - LoadItem(ITEM_AMMO_BULLETS_BOX, 'AMMO', 32, 16, 0, 1, False); - LoadItem(ITEM_AMMO_SHELLS, 'SHELL1', 16, 8, 0, 1, False); - LoadItem(ITEM_AMMO_SHELLS_BOX, 'SHELL2', 32, 16, 0, 1, False); - LoadItem(ITEM_AMMO_ROCKET, 'ROCKET', 16, 32, 0, 1, False); - LoadItem(ITEM_AMMO_ROCKET_BOX, 'ROCKETS', 64, 32, 0, 1, False); - LoadItem(ITEM_AMMO_CELL, 'CELL', 16, 16, 0, 1, False); - LoadItem(ITEM_AMMO_CELL_BIG, 'CELL2', 32, 32, 0, 1, False); - LoadItem(ITEM_AMMO_BACKPACK, 'BPACK', 32, 32, 0, 1, False); - LoadItem(ITEM_KEY_RED, 'KEYR', 16, 16, 0, 1, False); - LoadItem(ITEM_KEY_GREEN, 'KEYG', 16, 16, 0, 1, False); - LoadItem(ITEM_KEY_BLUE, 'KEYB', 16, 16, 0, 1, False); - LoadItem(ITEM_WEAPON_KASTET, 'KASTET', 64, 32, 0, 1, False); - LoadItem(ITEM_WEAPON_PISTOL, 'PISTOL', 64, 16, 0, 1, False); - LoadItem(ITEM_BOTTLE, 'BOTTLE', 16, 32, 20, 4, True); - LoadItem(ITEM_HELMET, 'HELMET', 16, 16, 20, 4, True); - LoadItem(ITEM_JETPACK, 'JETPACK', 32, 32, 15, 3, True); - LoadItem(ITEM_INVIS, 'INVIS', 32, 32, 20, 4, True); - LoadItem(ITEM_WEAPON_FLAMETHROWER, 'FLAMETHROWER', 64, 32, 0, 1, False); - LoadItem(ITEM_AMMO_FUELCAN, 'FUELCAN', 16, 32, 0, 1, False); - // fill with NOTEXURE forgotten item - for i := ITEM_AMMO_FUELCAN + 1 to ITEM_MAX do - LoadItem(i,'NOTEXTURE', 16, 16, 0, 1, False); // --------- monsters --------- // for i := MONSTER_DEMON to MONSTER_MAN do for j := 0 to ANIM_LAST do for d := TDirection.D_LEFT to TDirection.D_RIGHT do - LoadMonster(i, j, d); + r_Map_LoadMonsterAnim(i, j, d); VileFire := r_Textures_LoadMultiFromFileAndInfo(GameWAD + ':TEXTURES/FIRE', 64, 128, 8, False, False); // --------- player models --------- // if PlayerModelsArray <> nil then @@ -376,11 +455,44 @@ implementation FlagTextures[FLAG_RED] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGRED', 64, 64, 5, false); FlagTextures[FLAG_BLUE] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGBLUE', 64, 64, 5, false); // FlagTextures[FLAG_DOM] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':TEXTURES/FLAGDOM', 64, 64, 8, false); + // --------- shells --------- // + {$IFDEF ENABLE_SHELLS} + for i := 0 to SHELL_LAST do + ShellTextures[i] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/' + ShellAnim[i].name); + {$ENDIF} + // --------- punch --------- // + for b := false to true do + begin + for i := 0 to 2 do + PunchTextures[b, i] := r_Textures_LoadMultiFromFileAndInfo(GameWad + ':WEAPONS/' + PunchName[b] + WeapPos[i], 64, 64, 4, false); + end; + // --------- other --------- // + InvulPenta := r_Textures_LoadFromFile(GameWad + ':TEXTURES/PENTA'); end; procedure r_Map_Free; - var i, j, k, a: Integer; d: TDirection; + var i, j, k: Integer; d: TDirection; b: Boolean; begin + if InvulPenta <> nil then + InvulPenta.Free; + InvulPenta := nil; + for b := false to true do + begin + for i := 0 to 2 do + begin + if PunchTextures[b, i] <> nil then + PunchTextures[b, i].Free; + PunchTextures[b, i] := nil; + end; + end; + {$IFDEF ENABLE_SHELLS} + for i := 0 to SHELL_LAST do + begin + if ShellTextures[i] <> nil then + ShellTextures[i].Free; + ShellTextures[i] := nil; + end; + {$ENDIF} for i := 0 to FLAG_LAST do begin if FlagTextures[i] <> nil then @@ -414,18 +526,9 @@ implementation end; end; end; - for d := TDirection.D_LEFT to TDirection.D_RIGHT do - begin - for a := A_STAND to A_LAST do - begin - if Models[i].anim[d, a].base <> nil then - Models[i].anim[d, a].base.Free; - if Models[i].anim[d, a].mask <> nil then - Models[i].anim[d, a].mask.Free; - Models[i].anim[d, a].base := nil; - Models[i].anim[d, a].mask := nil; - end; - end; + if Models <> nil then + for i := 0 to High(Models) do + r_Map_FreeModel(i); for i := MONSTER_DEMON to MONSTER_MAN do begin for j := 0 to ANIM_LAST do @@ -438,7 +541,7 @@ implementation end; end; end; - for i := 0 to ITEM_MAX do + for i := 0 to ITEM_LAST do begin if Items[i].tex <> nil then begin @@ -544,18 +647,18 @@ implementation for i := 0 to High(ggItems) do begin it := @ggItems[i]; - if it.used and it.alive and (it.dropped = drop) and (it.ItemType <> ITEM_NONE) then + if it.used and it.alive and (it.dropped = drop) and (it.ItemType > ITEM_NONE) and (it.ItemType <= ITEM_LAST) then begin t := Items[it.ItemType].tex; if g_Collide(it.obj.x, it.obj.y, t.width, t.height, x, y, w, h) then begin it.obj.Lerp(gLerpFactor, fX, fY); r_Draw_MultiTextureRepeat(t, Items[it.ItemType].anim, fX, fY, t.width, t.height, false, 255, 255, 255, 255, false); - // if g_debug_frames then // TODO draw collision frame end; end; end; end; + // TODO draw g_debug_frames end; function r_Map_GetMonsterTexture (m, a: Integer; d: TDirection; out t: TGLMultiTexture; out dx, dy: Integer; out flip: Boolean): Boolean; @@ -612,10 +715,7 @@ implementation if r_Map_GetMonsterTexture(m, a, d, t, dx, dy, flip) then r_Draw_MultiTextureRepeat(t, mon.DirAnim[a, d], fX + dx, fY + dy, t.width, t.height, flip, 255, 255, 255, 255, false); -{ - if g_debug_frames - // TODO draw frame -} + // TODO draw g_debug_frames end; procedure r_Map_DrawMonsters (x, y, w, h: Integer); @@ -649,7 +749,7 @@ implementation end; end; - procedure r_Map_DrawPlayerModel (pm: TPlayerModel; x, y: Integer); + procedure r_Map_DrawPlayerModel (pm: TPlayerModel; x, y: Integer; alpha: Byte); var a, pos, act, xx, yy, angle: Integer; d: TDirection; flip: Boolean; t: TGLMultiTexture; tex: TGLTexture; c: TRGB; begin a := pm.CurrentAnimation; @@ -702,7 +802,7 @@ implementation tex.width, tex.height, d = TDirection.D_LEFT, - 255, 255, 255, 255, false + 255, 255, 255, alpha, false ); end; end; @@ -711,18 +811,18 @@ implementation if r_Map_GetPlayerModelTex(pm.id, a, d, flip) then begin t := Models[pm.id].anim[d, a].base; - r_Draw_MultiTextureRepeat(t, pm.AnimState, x, y, t.width, t.height, flip, 255, 255, 255, 255, false); + r_Draw_MultiTextureRepeat(t, pm.AnimState, x, y, t.width, t.height, flip, 255, 255, 255, alpha, false); t := Models[pm.id].anim[d, a].mask; if t <> nil then begin c := pm.Color; - r_Draw_MultiTextureRepeat(t, pm.AnimState, x, y, t.width, t.height, flip, c.r, c.g, c.b, 255, false); + r_Draw_MultiTextureRepeat(t, pm.AnimState, x, y, t.width, t.height, flip, c.r, c.g, c.b, alpha, false); end; end; end; - procedure r_Map_DrawPlayer (p: TPlayer); - var fX, fY, fSlope: Integer; + procedure r_Map_DrawPlayer (p, drawed: TPlayer); + var fX, fY, fSlope, ax, ay, w, h: Integer; b, flip: Boolean; t: TGLMultiTexture; alpha: Byte; begin if p.alive then begin @@ -730,26 +830,106 @@ implementation // TODO fix lerp //p.obj.Lerp(gLerpFactor, fX, fY); fSlope := nlerp(p.SlopeOld, p.obj.slopeUpLeft, gLerpFactor); - // TODO draw punch - // TODO invul pentagram - // TODO draw it with transparency - r_Map_DrawPlayerModel(p.Model, fX, fY + fSlope); + + (* punch effect *) + if p.PunchAnim.IsValid() and p.PunchAnim.enabled then + begin + b := R_BERSERK in p.FRulez; + if p.FKeys[KEY_DOWN].pressed then + t := PunchTextures[b, 2] + else if p.FKeys[KEY_UP].pressed then + t := PunchTextures[b, 1] + else + t := PunchTextures[b, 0]; + if t <> nil then + begin + flip := p.Direction = TDirection.D_LEFT; + ax := IfThen(flip, 15 - p.Obj.Rect.X, p.Obj.Rect.X - 15); // ??? + ay := p.Obj.Rect.Y - 11; + r_Draw_MultiTextureRepeat(t, p.PunchAnim, fx + ax, fy + fSlope + ay, t.width, t.height, flip, 255, 255, 255, 255, false) + end; + end; + + (* invulnerability effect *) + if (InvulPenta <> nil) and (p.FMegaRulez[MR_INVUL] > gTime) and ((p <> drawed) or (p.SpawnInvul >= gTime)) then + begin + w := InvulPenta.width; + h := InvulPenta.height; + ax := p.Obj.Rect.X + (p.Obj.Rect.Width div 2) - (w div 2); // + IfThen(flip, +4, -2) // ??? + ay := p.Obj.Rect.Y + (p.Obj.Rect.Height div 2) - (h div 2) - 7; // ??? + r_Draw_Texture(InvulPenta, fx + ax, fy + ay + fSlope, w, h, false, 255, 255, 255, 255, false); + end; + + (* invisibility effect *) + alpha := 255; + if p.FMegaRulez[MR_INVIS] > gTime then + begin + if (drawed <> nil) and ((p = drawed) or ((p.Team = drawed.Team) and (gGameSettings.GameMode <> GM_DM))) then + begin + if (p.FMegaRulez[MR_INVIS] - gTime <= 2100) and not ODD((p.FMegaRulez[MR_INVIS] - gTime) div 300) then + alpha := 55; + end + else + alpha := 1; // ??? + end; + + r_Map_DrawPlayerModel(p.Model, fX, fY + fSlope, alpha); end; // TODO draw g_debug_frames // TODO draw chat bubble // TODO draw aim end; - procedure r_Map_DrawPlayers (x, y, w, h: Integer); + procedure r_Map_DrawPlayers (x, y, w, h: Integer; player: TPlayer); var i: Integer; begin - // TODO draw only visible if gPlayers <> nil then for i := 0 to High(gPlayers) do if gPlayers[i] <> nil then - r_Map_DrawPlayer(gPlayers[i]); + r_Map_DrawPlayer(gPlayers[i], player); + end; + +{$IFDEF ENABLE_GIBS} + function r_Map_GetGibSize (m, i: Integer): TRectWH; + begin + result := Models[m].gibs.rect[i]; end; + procedure r_Map_DrawGibs (x, y, w, h: Integer); + var i, fx, fy, m, id, rx, ry, ra: Integer; p: PObj; t: TGLTexture; + begin + if gGibs <> nil then + begin + for i := 0 to High(gGibs) do + begin + if gGibs[i].alive then + begin + p := @gGibs[i].Obj; + if g_Obj_Collide(x, y, w, h, p) then + begin + p.Lerp(gLerpFactor, fx, fy); + id := gGibs[i].GibID; + m := gGibs[i].ModelID; + t := Models[m].gibs.base[id]; + if t <> nil then + begin + rx := p.Rect.X + p.Rect.Width div 2; + ry := p.Rect.Y + p.Rect.Height div 2; + ra := gGibs[i].RAngle; + r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, 255, 255, 255, 255, false, rx, ry, ra); + t := Models[m].gibs.mask[id]; + if t <> nil then + r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, gGibs[i].Color.R, gGibs[i].Color.G, gGibs[i].Color.B, 255, false, rx, ry, ra); + // r_Draw_TextureRepeatRotate(nil, fx + p.Rect.X, fy + p.Rect.Y, p.Rect.Width, p.Rect.Height, false, 255, 255, 255, 255, false, p.Rect.Width div 2, p.Rect.Height div 2, ra); + end; + end; + end; + end; + end; + // TODO draw g_debug_frames + end; +{$ENDIF} + {$IFDEF ENABLE_CORPSES} procedure r_Map_DrawCorpses (x, y, w, h: Integer); var i, fX, fY: Integer; p: TCorpse; @@ -762,10 +942,11 @@ implementation if (p <> nil) and (p.state <> CORPSE_STATE_REMOVEME) and (p.model <> nil) then begin p.obj.Lerp(gLerpFactor, fX, fY); - r_Map_DrawPlayerModel(p.model, fX, fY); + r_Map_DrawPlayerModel(p.model, fX, fY, 255); end; end; end; + // TODO draw g_debug_frames end; {$ENDIF} @@ -921,6 +1102,7 @@ implementation end; end; end; + // TODO draw g_debug_frames end; procedure r_Map_DrawFlags (x, y, w, h: Integer); @@ -937,14 +1119,92 @@ implementation if flip then dx := -1 else dx := +1; tex := FlagTextures[i]; r_Draw_MultiTextureRepeat(tex, FlagAnim, fx + dx, fy + 1, tex.width, tex.height, flip, 255, 255, 255, 255, false) - // TODO g_debug_frames end; end; end; + // TODO g_debug_frames end; - procedure r_Map_Draw (x, y, w, h, camx, camy: Integer); - var iter: TPanelGrid.Iter; p: PPanel; cx, cy, xx, yy, ww, hh: Integer; +{$IFDEF ENABLE_SHELLS} + procedure r_Map_DrawShells (x, y, w, h: Integer); + var i, fx, fy, typ: Integer; t: TGLTexture; p: PObj; + begin + if gShells <> nil then + begin + for i := 0 to High(gShells) do + begin + if gShells[i].alive then + begin + typ := gShells[i].SType; + if typ <= SHELL_LAST then + begin + p := @gShells[i].Obj; + if g_Obj_Collide(x, y, w, h, p) then + begin + t := ShellTextures[typ]; + if t <> nil then + begin + p.Lerp(gLerpFactor, fx, fy); + r_Draw_TextureRepeatRotate(t, fx, fy, t.width, t.height, false, 255, 255, 255, 255, false, ShellAnim[typ].dx, ShellAnim[typ].dy, gShells[i].RAngle); + end; + end; + end; + end; + end; + end; + end; +{$ENDIF} + + procedure r_Map_CalcAspect (ow, oh, nw, nh: LongInt; horizontal: Boolean; out ww, hh: LongInt); + begin + if horizontal then + begin + ww := nw; + hh := nw * oh div ow; + end + else + begin + ww := nh * ow div oh; + hh := nh; + end; + end; + + procedure r_Map_CalcSkyParallax (cx, cy, vw, vh, sw, sh, mw, mh: LongInt; out x, y, w, h: LongInt); + const + factor = 120; (* size ratio between view and sky (120%) *) + limit = 100; (* max speed for parallax *) + var + msw, msh, mvw, mvh, svw, svh: LongInt; + begin + msw := vw * factor div 100; + msh := vh * factor div 100; + r_Map_CalcAspect(sw, sh, msw, msh, (sw / sh) <= (msw / msh), w, h); + + (* calc x parallax or sky center on speed limit *) + mvw := MAX(1, mw - vw); + svw := w - vw; + if 100 * svw div mvw <= limit then + x := -cx * svw div mvw + else + x := -svw div 2; + + (* calc y parallax or sky center on speed limit *) + mvh := MAX(1, mh - vh); + svh := h - vh; + if 100 * svh div mvh <= limit then + y := -cy * svh div mvh + else + y := -svh div 2; + + (* handle out of map bounds *) + if x > 0 then x := 0; + if y > 0 then y := 0; + if x < -svw then x := -svw; + if y < -svh then y := -svh; + end; + + procedure r_Map_Draw (x, y, w, h, camx, camy: Integer; player: TPlayer); + var iter: TPanelGrid.Iter; p: PPanel; cx, cy, xx, yy, ww, hh: Integer; sx, sy, sw, sh: LongInt; begin cx := camx - w div 2; cy := camy - h div 2; @@ -953,8 +1213,25 @@ implementation ww := w; hh := h; + if g_dbg_ignore_bounds = false then + begin + if xx + ww > gMapInfo.Width then + xx := gMapInfo.Width - ww; + if yy + hh > gMapInfo.Height then + yy := gMapInfo.Height - hh; + if xx < 0 then + xx := 0; + if yy < 0 then + yy := 0; + cx := xx - x; + cy := yy - y; + end; + if SkyTexture <> nil then - r_Draw_Texture(SkyTexture, x, y, w, h, false, 255, 255, 255, 255, false); + begin + r_Map_CalcSkyParallax(cx, cy, ww, hh, SkyTexture.width, SkyTexture.height, gMapInfo.Width, gMapInfo.Height, sx, sy, sw, sh); + r_Draw_Texture(SkyTexture, x + sx, y + sy, sw, sh, false, 255, 255, 255, 255, false); + end; plist.Clear; iter := mapGrid.ForEachInAABB(xx, yy, ww, hh, GridDrawableMask); @@ -969,9 +1246,13 @@ implementation r_Map_DrawPanelType(PANEL_STEP); r_Map_DrawItems(xx, yy, ww, hh, false); r_Map_DrawShots(xx, yy, ww, hh); - // TODO draw shells - r_Map_DrawPlayers(xx, yy, ww, hh); - // TODO draw gibs + {$IFDEF ENABLE_SHELLS} + r_Map_DrawShells(xx, yy, ww, hh); + {$ENDIF} + r_Map_DrawPlayers(xx, yy, ww, hh, player); + {$IFDEF ENABLE_GIBS} + r_Map_DrawGibs(xx, yy, ww, hh); + {$ENDIF} {$IFDEF ENABLE_CORPSES} r_Map_DrawCorpses(xx, yy, ww, hh); {$ENDIF} @@ -988,13 +1269,22 @@ implementation r_Map_DrawPanelType(PANEL_ACID2); r_Map_DrawPanelType(PANEL_WATER); r_Map_DrawPanelType(PANEL_FORE); + // TODO draw monsters health bar + // TODO draw players health bar + // TODO draw players indicators glPopMatrix; + + // TODO draw player pain + // TODO draw player pickup + // TODO draw player invul + // TODO draw minimap + // TODO draw g_debug_player end; procedure r_Map_Update; var i: Integer; begin - for i := 0 to ITEM_MAX do + for i := 0 to ITEM_LAST do Items[i].anim.Update; r_Map_UpdateGFX; FlagAnim.Update;