X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=1cf480864080a2c4115db2cae221b07de7e16299;hb=6d6df4e3427cd01e03e172984c9d0d391ff38032;hp=ab82f010edd0b0294f0338d3b6199400797f0efe;hpb=5b1aa7467400740cf8ee0fef8206580a3584eed4;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index ab82f01..1cf4808 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -20,7 +20,7 @@ interface uses g_basic, g_player, e_graphics, Classes, g_res_downloader, - SysUtils, g_sound, g_gui, MAPSTRUCT, wadreader, md5, xprofiler; + SysUtils, g_sound, g_gui, MAPDEF, wadreader, md5, xprofiler; type TGameSettings = record @@ -63,7 +63,7 @@ type THearPoint = record Active: Boolean; - Coords: TPoint; + Coords: TDFPoint; end; function g_Game_IsNet(): Boolean; @@ -124,7 +124,6 @@ procedure GameCVars(P: SArray); procedure GameCommands(P: SArray); procedure GameCheats(P: SArray); procedure DebugCommands(P: SArray); -procedure ProfilerCommands(P: SArray); procedure g_Game_Process_Params; procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean); procedure g_Game_StepLoading(); @@ -210,9 +209,9 @@ var gPlayer1Settings: TPlayerSettings; gPlayer2Settings: TPlayerSettings; gGameOn: Boolean; - gPlayerScreenSize: TPoint; - gPlayer1ScreenCoord: TPoint; - gPlayer2ScreenCoord: TPoint; + gPlayerScreenSize: TDFPoint; + gPlayer1ScreenCoord: TDFPoint; + gPlayer2ScreenCoord: TDFPoint; gPlayer1: TPlayer = nil; gPlayer2: TPlayer = nil; gPlayerDrawn: TPlayer = nil; @@ -313,22 +312,46 @@ var g_profile_frame_update: Boolean = false; g_profile_frame_draw: Boolean = false; g_profile_collision: Boolean = false; + g_profile_los: Boolean = false; g_profile_history_size: Integer = 1000; + g_rlayer_back: Boolean = true; + g_rlayer_step: Boolean = true; + g_rlayer_wall: Boolean = true; + g_rlayer_door: Boolean = true; + g_rlayer_acid1: Boolean = true; + g_rlayer_acid2: Boolean = true; + g_rlayer_water: Boolean = true; + g_rlayer_fore: Boolean = true; + + procedure g_ResetDynlights (); procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single); procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single); +function conIsCheatsEnabled (): Boolean; + + implementation uses g_textures, g_main, g_window, g_menu, e_input, e_log, g_console, g_items, g_map, g_panel, g_playermodel, g_gfx, g_options, g_weapons, Math, - g_triggers, MAPDEF, g_monsters, e_sound, CONFIG, + g_triggers, g_monsters, e_sound, CONFIG, BinEditor, g_language, g_net, SDL, ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt, - utils, sfs; + utils, sfs, g_holmes; + + +// ////////////////////////////////////////////////////////////////////////// // +function conIsCheatsEnabled (): Boolean; +begin + result := false; + if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and + (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then exit; + result := true; +end; // ////////////////////////////////////////////////////////////////////////// // @@ -437,7 +460,8 @@ begin if (y < 0) then y := gScreenHeight-(hgt-1)+y; // background //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 255, 255, 255, 200, B_BLEND); - e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE); + //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE); + e_DarkenQuadWH(x, y, wdt, hgt, 150); // title yy := y+2; for ii := 0 to High(prof.bars) do @@ -765,6 +789,11 @@ begin if gPlayer2 <> nil then gPlayer2.GodMode := False; if gPlayer1 <> nil then gPlayer1.NoTarget := False; if gPlayer2 <> nil then gPlayer2.NoTarget := False; + + {$IF DEFINED(D2F_DEBUG)} + if gPlayer1 <> nil then gPlayer1.NoTarget := True; + gAimLine := true; + {$ENDIF} end; procedure g_Game_ExecuteEvent(Name: String); @@ -963,6 +992,17 @@ begin gExit := 0; end; +procedure drawTime(X, Y: Integer); inline; +begin + e_TextureFontPrint(x, y, + Format('%d:%.2d:%.2d', [ + gTime div 1000 div 3600, + (gTime div 1000 div 60) mod 60, + gTime div 1000 mod 60 + ]), + gStdFont); +end; + procedure DrawStat(); var pc, x, y, w, h: Integer; @@ -992,6 +1032,8 @@ begin e_DrawFillQuad(x, y, x+w-1, y+h-1, 64, 64, 64, 32); e_DrawQuad(x, y, x+w-1, y+h-1, 255, 127, 0); + drawTime(x+w-78, y+8); + wad := g_ExtractWadNameNoPath(gMapInfo.Map); map := g_ExtractFileName(gMapInfo.Map); mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name; @@ -1948,7 +1990,11 @@ begin UPSTime := Time; end; - if gGameOn then g_Weapon_AddDynLights(); + if gGameOn then + begin + g_Weapon_AddDynLights(); + g_Items_AddDynLights(); + end; end; procedure g_Game_LoadData(); @@ -2668,6 +2714,7 @@ begin if ly-sY-lrad >= gPlayerScreenSize.Y then continue; // set scissor to optimize drawing + //FIXME: broken for splitscreen mode glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4); // no need to clear stencil buffer, light blitting will do it for us glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); @@ -2708,7 +2755,7 @@ procedure renderMapInternal (backXOfs, backYOfs: Integer; transX, transY: Intege type TDrawCB = procedure (); - procedure drawPanelType (profname: AnsiString; panType: DWord); + procedure drawPanelType (profname: AnsiString; panType: DWord; doDraw: Boolean); var tagmask: Integer; pan: TPanel; @@ -2717,28 +2764,17 @@ type if gdbg_map_use_accel_render then begin tagmask := panelTypeToTag(panType); - {$IF TRUE} while (gDrawPanelList.count > 0) do begin pan := TPanel(gDrawPanelList.front()); if ((pan.tag and tagmask) = 0) then break; - pan.Draw(); - gDrawPanelList.popFront(); - end; - {$ELSE} - e_WriteLog(Format('=== PANELS: %d ===', [gDrawPanelList.count]), MSG_NOTIFY); - while (gDrawPanelList.count > 0) do - begin - pan := TPanel(gDrawPanelList.front()); - e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.ArrIdx: %d', [tagmask, pan.tag, pan.ArrIdx]), MSG_NOTIFY); - pan.Draw(); + if doDraw then pan.Draw(); gDrawPanelList.popFront(); end; - {$ENDIF} end else begin - g_Map_DrawPanels(panType); + if doDraw then g_Map_DrawPanels(panType); end; profileFrameDraw.sectionEnd(); end; @@ -2768,23 +2804,23 @@ begin if (setTransMatrix) then glTranslatef(transX, transY, 0); - drawPanelType('*back', PANEL_BACK); - drawPanelType('*step', PANEL_STEP); + drawPanelType('*back', PANEL_BACK, g_rlayer_back); + drawPanelType('*step', PANEL_STEP, g_rlayer_step); drawOther('items', @g_Items_Draw); drawOther('weapons', @g_Weapon_Draw); drawOther('shells', @g_Player_DrawShells); drawOther('drawall', @g_Player_DrawAll); drawOther('corpses', @g_Player_DrawCorpses); - drawPanelType('*wall', PANEL_WALL); + drawPanelType('*wall', PANEL_WALL, g_rlayer_wall); drawOther('monsters', @g_Monsters_Draw); - drawPanelType('*door', PANEL_CLOSEDOOR); + drawPanelType('*door', PANEL_CLOSEDOOR, g_rlayer_door); drawOther('gfx', @g_GFX_Draw); drawOther('flags', @g_Map_DrawFlags); - drawPanelType('*acid1', PANEL_ACID1); - drawPanelType('*acid2', PANEL_ACID2); - drawPanelType('*water', PANEL_WATER); + drawPanelType('*acid1', PANEL_ACID1, g_rlayer_acid1); + drawPanelType('*acid2', PANEL_ACID2, g_rlayer_acid2); + drawPanelType('*water', PANEL_WATER, g_rlayer_water); drawOther('dynlights', @renderDynLightsInternal); - drawPanelType('*fore', PANEL_FORE); + drawPanelType('*fore', PANEL_FORE, g_rlayer_fore); if g_debug_HealthBar then begin @@ -2847,8 +2883,19 @@ begin if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X; if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y; - if gMapInfo.Width <= gPlayerScreenSize.X then a := 0; - if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0; + if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0 + else if (gMapInfo.Width < gPlayerScreenSize.X) then + begin + // hcenter + a := (gPlayerScreenSize.X-gMapInfo.Width) div 2; + end; + + if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0 + else if (gMapInfo.Height < gPlayerScreenSize.Y) then + begin + // vcenter + b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2; + end; if p.IncCam <> 0 then begin @@ -2894,6 +2941,16 @@ begin //glTranslatef(a, b+p.IncCam, 0); + p.viewPortX := sX; + p.viewPortY := sY; + p.viewPortW := sWidth; + p.viewPortH := sHeight; + + if (p = gPlayer1) then + begin + g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH); + end; + renderMapInternal(-c, -d, a, b+p.IncCam, true); if p.FSpectator then @@ -2932,9 +2989,11 @@ end; procedure drawProfilers (); var px: Integer = -1; + py: Integer = -1; begin - if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw); - if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision); + if g_profile_frame_draw then px := px-drawProfiles(px, py, profileFrameDraw); + if g_profile_collision then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end; + if g_profile_los then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end; end; procedure g_Game_Draw(); @@ -3140,7 +3199,8 @@ begin if gPause and gGameOn and (g_ActiveWindow = nil) then begin - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); e_CharFont_GetSize(gMenuFont, _lc[I_MENU_PAUSE], w, h); e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(w div 2), @@ -3158,11 +3218,16 @@ begin else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); end; if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; if gState = STATE_FOLD then + begin e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter); + end; if gState = STATE_INTERCUSTOM then begin @@ -3183,13 +3248,18 @@ begin DrawCustomStat(); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; if gState = STATE_INTERSINGLE then begin if EndingGameCounter > 0 then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter) + begin + e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter); + end else begin back := 'INTER'; @@ -3202,7 +3272,10 @@ begin DrawSingleStat(); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; end; @@ -3218,7 +3291,10 @@ begin e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; if gState = STATE_SLIST then @@ -3226,7 +3302,8 @@ begin if g_Texture_Get('MENU_BACKGROUND', ID) then begin e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight); - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); end; g_Serverlist_Draw(slCurrent); end; @@ -3235,10 +3312,16 @@ begin if g_ActiveWindow <> nil then begin if gGameOn then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; g_ActiveWindow.Draw(); end; + // draw inspector + if (g_holmes_enabled) then g_Holmes_Draw(); + g_Console_Draw(); if g_debug_Sounds and gGameOn then @@ -3255,11 +3338,11 @@ begin end; if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then - e_TextureFontPrint(gScreenWidth-72, 0, - Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]), - gStdFont); + drawTime(gScreenWidth-72, gScreenHeight-16); if gGameOn then drawProfilers(); + + g_Holmes_DrawUI(); end; procedure g_Game_Quit(); @@ -4929,119 +5012,12 @@ begin end; end; -// profiler console commands -procedure ProfilerCommands (P: SArray); -var - cmd: string; - - function getBool (idx: Integer): Integer; - begin - if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end; - result := 0; - if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1; - end; - -begin - //if not gDebugMode then exit; - cmd := LowerCase(P[0]); - - if cmd = 'pf_draw_frame' then - begin - g_profile_frame_draw := not g_profile_frame_draw; - exit; - end; - - if cmd = 'pf_update_frame' then - begin - g_profile_frame_update := not g_profile_frame_update; - exit; - end; - - if cmd = 'pf_coldet' then - begin - g_profile_collision := not g_profile_collision; - exit; - end; - - if cmd = 'r_sq_draw' then - begin - case getBool(1) of - -1: begin end; - 0: gdbg_map_use_accel_render := false; - 1: gdbg_map_use_accel_render := true; - end; - if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona'); - exit; - end; - - if cmd = 'cd_sq_enabled' then - begin - case getBool(1) of - -1: begin end; - 0: gdbg_map_use_accel_coldet := false; - 1: gdbg_map_use_accel_coldet := true; - end; - if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona'); - exit; - end; - - { - if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then - begin - gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree'); - if gdbg_map_use_tree_coldet then g_Console_Add('coldet acceleration: tree') else g_Console_Add('coldet acceleration: grid'); - exit; - end; - - if (cmd = 'r_sq_use_grid') or (cmd = 'r_sq_use_tree') then - begin - gdbg_map_use_tree_draw := (cmd = 'r_sq_use_tree'); - if gdbg_map_use_tree_draw then g_Console_Add('render acceleration: tree') else g_Console_Add('render acceleration: grid'); - exit; - end; - } - - { - if (cmd = 't_dump_node_queries') then - begin - case getBool(1) of - -1: begin end; - 0: gdbg_map_dump_coldet_tree_queries := false; - 1: gdbg_map_dump_coldet_tree_queries := true; - end; - if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona'); - exit; - end; - } - - if (cmd = 'mon_sq_enabled') then - begin - case getBool(1) of - -1: begin end; - 0: gmon_debug_use_sqaccel := false; - 1: gmon_debug_use_sqaccel := true; - end; - if gmon_debug_use_sqaccel then g_Console_Add('accelerated monster coldet: tan') else g_Console_Add('accelerated monster coldet: ona'); - exit; - end; - - if (cmd = 'wtrace_sq_enabled') then - begin - case getBool(1) of - -1: begin end; - 0: gwep_debug_fast_trace := false; - 1: gwep_debug_fast_trace := true; - end; - if gwep_debug_fast_trace then g_Console_Add('accelerated weapon hitscan: tan') else g_Console_Add('accelerated weapon hitscan: ona'); - exit; - end; -end; procedure DebugCommands(P: SArray); var a, b: Integer; cmd: string; - //pt: TPoint; + //pt: TDFPoint; mon: TMonster; begin // Êîìàíäû îòëàäî÷íîãî ðåæèìà: @@ -6862,12 +6838,6 @@ var begin Parse_Params(pars); - s := Find_Param_Value(pars, '--profile-render'); - if (s <> '') then g_profile_frame_draw := true; - - s := Find_Param_Value(pars, '--profile-coldet'); - if (s <> '') then g_profile_collision := true; - // Debug mode: s := Find_Param_Value(pars, '--debug'); if (s <> '') then @@ -7023,4 +6993,22 @@ begin SetLength(pars, 0); end; +begin + conRegVar('pf_draw_frame', @g_profile_frame_draw, 'draw frame rendering profiles', 'render profiles'); + //conRegVar('pf_update_frame', @g_profile_frame_update, 'draw frame updating profiles', 'update profiles'); + conRegVar('pf_coldet', @g_profile_collision, 'draw collision detection profiles', 'coldet profiles'); + conRegVar('pf_los', @g_profile_los, 'draw monster LOS profiles', 'monster LOS profiles'); + + conRegVar('r_sq_draw', @gdbg_map_use_accel_render, 'accelerated spatial queries in rendering', 'accelerated rendering'); + conRegVar('cd_sq_enabled', @gdbg_map_use_accel_coldet, 'accelerated spatial queries in map coldet', 'accelerated map coldet'); + conRegVar('mon_sq_enabled', @gmon_debug_use_sqaccel, 'accelerated spatial queries for monsters', 'accelerated monster coldet'); + conRegVar('wtrace_sq_enabled', @gwep_debug_fast_trace, 'accelerated spatial queries for weapon hitscan trace', 'accelerated weapon hitscan'); + + conRegVar('pr_enabled', @gpart_dbg_enabled, 'enable/disable particles', 'particles'); + conRegVar('pr_phys_enabled', @gpart_dbg_phys_enabled, 'enable/disable particle physics', 'particle physics'); + + conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true); + conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true); + + conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true); end.