From 6cf91d3941e382a5289a026163ccd2fb12b1a244 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Apr 2020 17:19:17 +0200 Subject: [PATCH] - moved the remaining core parts of the GL renderer to 'common'. --- src/CMakeLists.txt | 20 ++++--------------- src/common/engine/i_interface.h | 1 + src/common/platform/posix/cocoa/i_video.mm | 2 +- src/common/platform/posix/sdl/sdlglvideo.cpp | 4 ++-- src/common/platform/win32/win32basevideo.cpp | 2 +- src/common/platform/win32/win32glvideo.cpp | 2 +- .../rendering/gl}/gl_framebuffer.cpp | 6 +++--- .../rendering/gl}/gl_framebuffer.h | 0 src/common/rendering/gl/gl_hwtexture.cpp | 2 +- src/common/rendering/gl/gl_postprocess.cpp | 4 ++-- src/common/rendering/gl/gl_renderbuffers.cpp | 2 +- .../rendering/gl}/gl_renderer.cpp | 4 ++-- .../rendering/gl}/gl_renderer.h | 5 ----- src/common/rendering/gl/gl_renderstate.cpp | 4 ++-- src/common/rendering/gl/gl_samplers.cpp | 2 +- src/common/rendering/gl/gl_shader.cpp | 2 +- .../rendering/gl}/gl_stereo3d.cpp | 10 ++++++---- .../rendering/hwrenderer/data}/hw_clock.cpp | 9 +++------ .../rendering/hwrenderer/data}/hw_clock.h | 0 .../rendering/hwrenderer/data/hw_skydome.cpp | 2 +- .../rendering/hwrenderer/data/hw_skydome.h | 1 - src/d_main.cpp | 13 +++++++++++- src/playsim/p_pspr.h | 1 + src/rendering/hwrenderer/hw_entrypoint.cpp | 2 +- src/rendering/hwrenderer/scene/hw_bsp.cpp | 2 +- src/rendering/hwrenderer/scene/hw_decal.cpp | 2 +- .../hwrenderer/scene/hw_drawinfo.cpp | 2 +- .../hwrenderer/scene/hw_drawlist.cpp | 2 +- src/rendering/hwrenderer/scene/hw_flats.cpp | 2 +- src/rendering/hwrenderer/scene/hw_portal.cpp | 2 +- .../hwrenderer/scene/hw_renderhacks.cpp | 2 +- src/rendering/hwrenderer/scene/hw_sprites.cpp | 2 +- src/rendering/hwrenderer/scene/hw_walls.cpp | 2 +- .../hwrenderer/utility/hw_draw2d.cpp | 2 +- .../polyrenderer/backend/poly_framebuffer.cpp | 2 +- .../polyrenderer/backend/poly_renderstate.cpp | 2 +- src/rendering/r_sky.cpp | 3 --- .../vulkan/renderer/vk_renderstate.cpp | 2 +- .../vulkan/system/vk_framebuffer.cpp | 2 +- 39 files changed, 61 insertions(+), 70 deletions(-) rename src/{rendering/gl/system => common/rendering/gl}/gl_framebuffer.cpp (99%) rename src/{rendering/gl/system => common/rendering/gl}/gl_framebuffer.h (100%) rename src/{rendering/gl/renderer => common/rendering/gl}/gl_renderer.cpp (98%) rename src/{rendering/gl/renderer => common/rendering/gl}/gl_renderer.h (94%) rename src/{rendering/gl/renderer => common/rendering/gl}/gl_stereo3d.cpp (98%) rename src/{rendering/hwrenderer/utility => common/rendering/hwrenderer/data}/hw_clock.cpp (95%) rename src/{rendering/hwrenderer/utility => common/rendering/hwrenderer/data}/hw_clock.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d94f0877d..d6678ec69 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -659,9 +659,6 @@ file( GLOB HEADER_FILES rendering/vulkan/renderer/*.h rendering/vulkan/shaders/*.h rendering/vulkan/textures/*.h - rendering/gl/renderer/*.h - rendering/gl/shaders/*.h - rendering/gl/system/*.h *.h ) @@ -935,9 +932,6 @@ set (PCH_SOURCES g_statusbar/shared_sbar.cpp rendering/2d/f_wipe.cpp rendering/2d/v_blend.cpp - rendering/gl/renderer/gl_renderer.cpp - rendering/gl/renderer/gl_stereo3d.cpp - rendering/gl/system/gl_framebuffer.cpp rendering/hwrenderer/hw_entrypoint.cpp rendering/hwrenderer/data/hw_vertexbuilder.cpp rendering/hwrenderer/dynlights/doom_aabbtree.cpp @@ -946,7 +940,6 @@ set (PCH_SOURCES rendering/hwrenderer/scene/hw_renderstate.cpp rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp rendering/hwrenderer/textures/hw_precache.cpp - rendering/hwrenderer/utility/hw_clock.cpp rendering/hwrenderer/utility/hw_draw2d.cpp rendering/hwrenderer/utility/hw_lighting.cpp maploader/edata.cpp @@ -1126,6 +1119,7 @@ set (PCH_SOURCES common/rendering/v_framebuffer.cpp common/rendering/v_video.cpp common/rendering/r_videoscale.cpp + common/rendering/hwrenderer/data/hw_clock.cpp common/rendering/hwrenderer/data/hw_skydome.cpp common/rendering/hwrenderer/data/flatvertices.cpp common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp @@ -1139,6 +1133,9 @@ set (PCH_SOURCES common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp common/rendering/gl_load/gl_interface.cpp + common/rendering/gl/gl_renderer.cpp + common/rendering/gl/gl_stereo3d.cpp + common/rendering/gl/gl_framebuffer.cpp common/rendering/gl/gl_renderstate.cpp common/rendering/gl/gl_renderbuffers.cpp common/rendering/gl/gl_postprocess.cpp @@ -1420,15 +1417,6 @@ source_group("Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE source_group("Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/.+") source_group("Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/volk/.+") source_group("Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/vk_mem_alloc.+") -source_group("Rendering\\OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/.+") -source_group("Rendering\\OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/data/.+") -source_group("Rendering\\OpenGL Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/dynlights/.+") -source_group("Rendering\\OpenGL Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/renderer/.+") -source_group("Rendering\\OpenGL Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/scene/.+") -source_group("Rendering\\OpenGL Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/shaders/.+") -source_group("Rendering\\OpenGL Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/system/.+") -source_group("Rendering\\OpenGL Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/textures/.+") -source_group("Rendering\\OpenGL Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/utility/.+") source_group("Rendering\\Software Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/.+") source_group("Rendering\\Software Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/drawers/.+") source_group("Rendering\\Software Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/scene/.+") diff --git a/src/common/engine/i_interface.h b/src/common/engine/i_interface.h index 594d5ab2b..5bd03dd0b 100644 --- a/src/common/engine/i_interface.h +++ b/src/common/engine/i_interface.h @@ -16,6 +16,7 @@ struct SystemCallbacks bool (*DisableTextureFilter)(); void (*OnScreenSizeChanged)(); IntRect(*GetSceneRect)(); + FString(*GetLocationDescription)(); }; extern SystemCallbacks *sysCallbacks; diff --git a/src/common/platform/posix/cocoa/i_video.mm b/src/common/platform/posix/cocoa/i_video.mm index 6cf35313e..1f2056ab5 100644 --- a/src/common/platform/posix/cocoa/i_video.mm +++ b/src/common/platform/posix/cocoa/i_video.mm @@ -53,7 +53,7 @@ #include "version.h" #include "printf.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" #ifdef HAVE_VULKAN #include "vulkan/system/vk_framebuffer.h" #endif diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp index 66edd075e..65133a792 100644 --- a/src/common/platform/posix/sdl/sdlglvideo.cpp +++ b/src/common/platform/posix/sdl/sdlglvideo.cpp @@ -47,8 +47,8 @@ #include "gl_sysfb.h" #include "gl_system.h" -#include "gl/renderer/gl_renderer.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_renderer.h" +#include "gl_framebuffer.h" #ifdef HAVE_VULKAN #include "rendering/vulkan/system/vk_framebuffer.h" diff --git a/src/common/platform/win32/win32basevideo.cpp b/src/common/platform/win32/win32basevideo.cpp index bb1fb81ba..fe2ba3b9a 100644 --- a/src/common/platform/win32/win32basevideo.cpp +++ b/src/common/platform/win32/win32basevideo.cpp @@ -52,7 +52,7 @@ #include "win32basevideo.h" #include "cmdlib.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" CVAR(Int, vid_adapter, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) diff --git a/src/common/platform/win32/win32glvideo.cpp b/src/common/platform/win32/win32glvideo.cpp index 80dadfd0e..034ec8691 100644 --- a/src/common/platform/win32/win32glvideo.cpp +++ b/src/common/platform/win32/win32glvideo.cpp @@ -53,7 +53,7 @@ #include "engineerrors.h" #include "win32glvideo.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" EXTERN_CVAR(Int, vid_adapter) EXTERN_CVAR(Bool, vid_hdr) diff --git a/src/rendering/gl/system/gl_framebuffer.cpp b/src/common/rendering/gl/gl_framebuffer.cpp similarity index 99% rename from src/rendering/gl/system/gl_framebuffer.cpp rename to src/common/rendering/gl/gl_framebuffer.cpp index 2cff171e0..26d1cc58c 100644 --- a/src/rendering/gl/system/gl_framebuffer.cpp +++ b/src/common/rendering/gl/gl_framebuffer.cpp @@ -40,11 +40,11 @@ #include "i_time.h" #include "gl_interface.h" -#include "gl/system/gl_framebuffer.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_framebuffer.h" +#include "gl_renderer.h" #include "gl_renderbuffers.h" #include "gl_samplers.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_vrmodes.h" #include "hwrenderer/models/hw_models.h" #include "hw_skydome.h" diff --git a/src/rendering/gl/system/gl_framebuffer.h b/src/common/rendering/gl/gl_framebuffer.h similarity index 100% rename from src/rendering/gl/system/gl_framebuffer.h rename to src/common/rendering/gl/gl_framebuffer.h diff --git a/src/common/rendering/gl/gl_hwtexture.cpp b/src/common/rendering/gl/gl_hwtexture.cpp index 3aa4aad79..143aba183 100644 --- a/src/common/rendering/gl/gl_hwtexture.cpp +++ b/src/common/rendering/gl/gl_hwtexture.cpp @@ -41,7 +41,7 @@ #include "gl_interface.h" #include "hw_cvars.h" #include "gl_debug.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_renderstate.h" #include "gl_samplers.h" diff --git a/src/common/rendering/gl/gl_postprocess.cpp b/src/common/rendering/gl/gl_postprocess.cpp index 8af1a2272..2ac2db313 100644 --- a/src/common/rendering/gl/gl_postprocess.cpp +++ b/src/common/rendering/gl/gl_postprocess.cpp @@ -22,10 +22,10 @@ #include "gl_system.h" #include "m_png.h" #include "gl_buffers.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" #include "gl_debug.h" #include "gl_renderbuffers.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_postprocessstate.h" #include "gl_shaderprogram.h" #include "hwrenderer/postprocessing/hw_postprocess.h" diff --git a/src/common/rendering/gl/gl_renderbuffers.cpp b/src/common/rendering/gl/gl_renderbuffers.cpp index 5e212a3be..a1d8899bb 100644 --- a/src/common/rendering/gl/gl_renderbuffers.cpp +++ b/src/common/rendering/gl/gl_renderbuffers.cpp @@ -25,7 +25,7 @@ #include "printf.h" #include "hw_cvars.h" #include "gl_debug.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_renderbuffers.h" #include "gl_postprocessstate.h" #include "gl_shaderprogram.h" diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/common/rendering/gl/gl_renderer.cpp similarity index 98% rename from src/rendering/gl/renderer/gl_renderer.cpp rename to src/common/rendering/gl/gl_renderer.cpp index 78f58ab8c..305ee0a97 100644 --- a/src/rendering/gl/renderer/gl_renderer.cpp +++ b/src/common/rendering/gl/gl_renderer.cpp @@ -41,10 +41,10 @@ #include "cmdlib.h" #include "version.h" #include "gl_interface.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" #include "hw_cvars.h" #include "gl_debug.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_renderstate.h" #include "gl_renderbuffers.h" #include "gl_shaderprogram.h" diff --git a/src/rendering/gl/renderer/gl_renderer.h b/src/common/rendering/gl/gl_renderer.h similarity index 94% rename from src/rendering/gl/renderer/gl_renderer.h rename to src/common/rendering/gl/gl_renderer.h index 4eb59d088..5613fd5fd 100644 --- a/src/rendering/gl/renderer/gl_renderer.h +++ b/src/common/rendering/gl/gl_renderer.h @@ -1,14 +1,10 @@ #ifndef __GL_RENDERER_H #define __GL_RENDERER_H -#include "r_defs.h" #include "v_video.h" #include "vectors.h" -#include "swrenderer/r_renderer.h" #include "matrix.h" #include "gl_renderbuffers.h" -#include "hwrenderer/scene/hw_portal.h" -#include "hw_shadowmap.h" #include #ifdef _MSC_VER @@ -83,7 +79,6 @@ public: void CopyToBackbuffer(const IntRect *bounds, bool applyGamma); void DrawPresentTexture(const IntRect &box, bool applyGamma); void Flush(); - void Draw2D(F2DDrawer *data); void BeginFrame(); bool StartOffscreen(); diff --git a/src/common/rendering/gl/gl_renderstate.cpp b/src/common/rendering/gl/gl_renderstate.cpp index ac9e47025..9eee22c66 100644 --- a/src/common/rendering/gl/gl_renderstate.cpp +++ b/src/common/rendering/gl/gl_renderstate.cpp @@ -31,12 +31,12 @@ #include "hw_cvars.h" #include "flatvertices.h" #include "gl_shader.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "hw_lightbuffer.h" #include "gl_renderbuffers.h" #include "gl_hwtexture.h" #include "gl_buffers.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/data/hw_viewpointbuffer.h" namespace OpenGLRenderer diff --git a/src/common/rendering/gl/gl_samplers.cpp b/src/common/rendering/gl/gl_samplers.cpp index 1371ec3d1..a9f45dc2f 100644 --- a/src/common/rendering/gl/gl_samplers.cpp +++ b/src/common/rendering/gl/gl_samplers.cpp @@ -38,7 +38,7 @@ #include "gl_interface.h" #include "hw_cvars.h" #include "gl_debug.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_samplers.h" #include "hw_material.h" #include "i_interface.h" diff --git a/src/common/rendering/gl/gl_shader.cpp b/src/common/rendering/gl/gl_shader.cpp index 4bf727efd..c00ab0911 100644 --- a/src/common/rendering/gl/gl_shader.cpp +++ b/src/common/rendering/gl/gl_shader.cpp @@ -44,7 +44,7 @@ #include "gl_interface.h" #include "gl_debug.h" #include "matrix.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include #include diff --git a/src/rendering/gl/renderer/gl_stereo3d.cpp b/src/common/rendering/gl/gl_stereo3d.cpp similarity index 98% rename from src/rendering/gl/renderer/gl_stereo3d.cpp rename to src/common/rendering/gl/gl_stereo3d.cpp index 8bcb2768f..032fb71ad 100644 --- a/src/rendering/gl/renderer/gl_stereo3d.cpp +++ b/src/common/rendering/gl/gl_stereo3d.cpp @@ -26,15 +26,15 @@ */ #include "gl_system.h" -#include "gl/renderer/gl_renderer.h" +#include "gl_renderer.h" #include "gl_renderbuffers.h" #include "hw_vrmodes.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" #include "gl_postprocessstate.h" -#include "gl/system/gl_framebuffer.h" +#include "gl_framebuffer.h" #include "gl_shaderprogram.h" #include "gl_buffers.h" -#include "menu/menu.h" +#include "templates.h" EXTERN_CVAR(Int, vr_mode) EXTERN_CVAR(Float, vid_saturation) @@ -43,6 +43,8 @@ EXTERN_CVAR(Float, vid_contrast) EXTERN_CVAR(Int, gl_satformula) EXTERN_CVAR(Int, gl_dither_bpc) +void UpdateVRModes(bool considerQuadBuffered = true); + namespace OpenGLRenderer { diff --git a/src/rendering/hwrenderer/utility/hw_clock.cpp b/src/common/rendering/hwrenderer/data/hw_clock.cpp similarity index 95% rename from src/rendering/hwrenderer/utility/hw_clock.cpp rename to src/common/rendering/hwrenderer/data/hw_clock.cpp index f337f6581..ea47d0cb1 100644 --- a/src/rendering/hwrenderer/utility/hw_clock.cpp +++ b/src/common/rendering/hwrenderer/data/hw_clock.cpp @@ -38,9 +38,9 @@ #include "c_dispatch.h" #include "r_utility.h" #include "v_video.h" -#include "g_levellocals.h" #include "hw_clock.h" #include "i_time.h" +#include "i_interface.h" glcycle_t RenderWall,SetupWall,ClipWall; glcycle_t RenderFlat,SetupFlat; @@ -167,11 +167,8 @@ void CheckBench() FString compose; - auto &vp = r_viewpoint; - auto Level = vp.ViewLevel; - compose.Format("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n", - Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees); - + if (sysCallbacks && sysCallbacks->GetLocationDescription) compose = sysCallbacks->GetLocationDescription(); + AppendRenderStats(compose); AppendRenderTimes(compose); AppendLightStats(compose); diff --git a/src/rendering/hwrenderer/utility/hw_clock.h b/src/common/rendering/hwrenderer/data/hw_clock.h similarity index 100% rename from src/rendering/hwrenderer/utility/hw_clock.h rename to src/common/rendering/hwrenderer/data/hw_clock.h diff --git a/src/common/rendering/hwrenderer/data/hw_skydome.cpp b/src/common/rendering/hwrenderer/data/hw_skydome.cpp index 7e882acd0..45c813fc7 100644 --- a/src/common/rendering/hwrenderer/data/hw_skydome.cpp +++ b/src/common/rendering/hwrenderer/data/hw_skydome.cpp @@ -76,7 +76,7 @@ enum // also shamelessly lifted from ZDoomGL! ;) // //----------------------------------------------------------------------------- -EXTERN_CVAR(Float, skyoffset) +CVAR(Float, skyoffset, 0, 0) // for testing struct SkyColor diff --git a/src/common/rendering/hwrenderer/data/hw_skydome.h b/src/common/rendering/hwrenderer/data/hw_skydome.h index 527bd3fa8..7cbd37948 100644 --- a/src/common/rendering/hwrenderer/data/hw_skydome.h +++ b/src/common/rendering/hwrenderer/data/hw_skydome.h @@ -1,6 +1,5 @@ #pragma once -#include "v_palette.h" #include "matrix.h" #include "hwrenderer/data/buffers.h" #include "hw_renderstate.h" diff --git a/src/d_main.cpp b/src/d_main.cpp index 5b9dbcd6f..509e80320 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -114,7 +114,7 @@ #include "scriptutil.h" #include "v_palette.h" #include "texturemanager.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/scene/hw_drawinfo.h" #ifdef __unix__ @@ -2855,6 +2855,16 @@ IntRect System_GetSceneRect() mSceneViewport.height = height; return mSceneViewport; } + +FString System_GetLocationDescription() +{ + auto& vp = r_viewpoint; + auto Level = vp.ViewLevel; + return FStringf("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n", + Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees); + +} + //========================================================================== // // DoomSpecificInfo @@ -3063,6 +3073,7 @@ static int D_DoomMain_Internal (void) System_DisableTextureFilter, System_OnScreenSizeChanged, System_GetSceneRect, + System_GetLocationDescription, }; sysCallbacks = &syscb; diff --git a/src/playsim/p_pspr.h b/src/playsim/p_pspr.h index d39fdd2e4..a4097a944 100644 --- a/src/playsim/p_pspr.h +++ b/src/playsim/p_pspr.h @@ -41,6 +41,7 @@ #define WEAPON_FUDGE_Y 0.375 struct FTranslatedLineTarget; struct FState; +class player_t; // // Overlay psprites are scaled shapes diff --git a/src/rendering/hwrenderer/hw_entrypoint.cpp b/src/rendering/hwrenderer/hw_entrypoint.cpp index 61ebf3c61..b7e691605 100644 --- a/src/rendering/hwrenderer/hw_entrypoint.cpp +++ b/src/rendering/hwrenderer/hw_entrypoint.cpp @@ -37,7 +37,7 @@ #include "swrenderer/r_swscene.h" #include "swrenderer/r_renderer.h" #include "hw_dynlightdata.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "flatvertices.h" #include "v_palette.h" #include "d_main.h" diff --git a/src/rendering/hwrenderer/scene/hw_bsp.cpp b/src/rendering/hwrenderer/scene/hw_bsp.cpp index 5009f37ee..a2b79eecd 100644 --- a/src/rendering/hwrenderer/scene/hw_bsp.cpp +++ b/src/rendering/hwrenderer/scene/hw_bsp.cpp @@ -39,7 +39,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/scene/hw_portal.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "flatvertices.h" #include "hwrenderer/data/hw_vertexbuilder.h" diff --git a/src/rendering/hwrenderer/scene/hw_decal.cpp b/src/rendering/hwrenderer/scene/hw_decal.cpp index 6dc727731..6dae20c56 100644 --- a/src/rendering/hwrenderer/scene/hw_decal.cpp +++ b/src/rendering/hwrenderer/scene/hw_decal.cpp @@ -34,7 +34,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/utility/hw_lighting.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "flatvertices.h" #include "hw_renderstate.h" #include "texturemanager.h" diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index 8365eeb34..421024947 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -36,7 +36,7 @@ #include "hw_drawinfo.h" #include "po_man.h" #include "models.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_cvars.h" #include "hw_viewpointbuffer.h" #include "flatvertices.h" diff --git a/src/rendering/hwrenderer/scene/hw_drawlist.cpp b/src/rendering/hwrenderer/scene/hw_drawlist.cpp index 18e425c9f..902d68f29 100644 --- a/src/rendering/hwrenderer/scene/hw_drawlist.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawlist.cpp @@ -33,7 +33,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_drawlist.h" #include "flatvertices.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_renderstate.h" #include "hw_drawinfo.h" #include "hw_fakeflat.h" diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp index f051aaa4f..dfc73b55c 100644 --- a/src/rendering/hwrenderer/scene/hw_flats.cpp +++ b/src/rendering/hwrenderer/scene/hw_flats.cpp @@ -38,7 +38,7 @@ #include "matrix.h" #include "hw_dynlightdata.h" #include "hw_cvars.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" #include "hw_material.h" #include "hwrenderer/scene/hw_drawinfo.h" diff --git a/src/rendering/hwrenderer/scene/hw_portal.cpp b/src/rendering/hwrenderer/scene/hw_portal.cpp index 06ae4c7e3..711e81108 100644 --- a/src/rendering/hwrenderer/scene/hw_portal.cpp +++ b/src/rendering/hwrenderer/scene/hw_portal.cpp @@ -34,7 +34,7 @@ #include "g_levellocals.h" #include "hw_renderstate.h" #include "flatvertices.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" #include "texturemanager.h" diff --git a/src/rendering/hwrenderer/scene/hw_renderhacks.cpp b/src/rendering/hwrenderer/scene/hw_renderhacks.cpp index 383578410..d0775d109 100644 --- a/src/rendering/hwrenderer/scene/hw_renderhacks.cpp +++ b/src/rendering/hwrenderer/scene/hw_renderhacks.cpp @@ -35,7 +35,7 @@ #include "hw_drawinfo.h" #include "hw_drawstructs.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_dynlightdata.h" #include "flatvertices.h" #include "hw_lightbuffer.h" diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index dbedea82c..5ee5470ef 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp @@ -51,7 +51,7 @@ #include "hwrenderer/scene/hw_portal.h" #include "flatvertices.h" #include "hw_cvars.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" #include "hw_material.h" #include "hw_dynlightdata.h" diff --git a/src/rendering/hwrenderer/scene/hw_walls.cpp b/src/rendering/hwrenderer/scene/hw_walls.cpp index bdc848aef..93de62a88 100644 --- a/src/rendering/hwrenderer/scene/hw_walls.cpp +++ b/src/rendering/hwrenderer/scene/hw_walls.cpp @@ -35,7 +35,7 @@ #include "hw_dynlightdata.h" #include "hw_material.h" #include "hw_cvars.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/scene/hw_drawstructs.h" diff --git a/src/rendering/hwrenderer/utility/hw_draw2d.cpp b/src/rendering/hwrenderer/utility/hw_draw2d.cpp index 2ea531fa9..25f330c62 100644 --- a/src/rendering/hwrenderer/utility/hw_draw2d.cpp +++ b/src/rendering/hwrenderer/utility/hw_draw2d.cpp @@ -32,7 +32,7 @@ #include "hwrenderer/data/buffers.h" #include "flatvertices.h" #include "hwrenderer/data/hw_viewpointbuffer.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_cvars.h" #include "hw_renderstate.h" #include "r_videoscale.h" diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp index 5693c2cff..d059db321 100644 --- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp +++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp @@ -30,7 +30,7 @@ #include "i_video.h" #include "v_draw.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_vrmodes.h" #include "hw_cvars.h" #include "hwrenderer/models/hw_models.h" diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/rendering/polyrenderer/backend/poly_renderstate.cpp index 830a344e7..af1522952 100644 --- a/src/rendering/polyrenderer/backend/poly_renderstate.cpp +++ b/src/rendering/polyrenderer/backend/poly_renderstate.cpp @@ -30,7 +30,7 @@ #include "hw_viewpointuniforms.h" #include "hw_lightbuffer.h" #include "hw_cvars.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "flatvertices.h" #include "hwrenderer/data/hw_viewpointbuffer.h" #include "hwrenderer/data/shaderuniforms.h" diff --git a/src/rendering/r_sky.cpp b/src/rendering/r_sky.cpp index ef74707ce..96cc6083a 100644 --- a/src/rendering/r_sky.cpp +++ b/src/rendering/r_sky.cpp @@ -54,9 +54,6 @@ CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE|CVAR_NOINITCALL) R_InitSkyMap (); } -CVAR(Float, skyoffset, 0, 0) // for testing - - //========================================================================== // // R_InitSkyMap diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp index a3ae824f0..18425e29d 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/src/rendering/vulkan/renderer/vk_renderstate.cpp @@ -33,7 +33,7 @@ #include "hw_viewpointuniforms.h" #include "hw_lightbuffer.h" #include "hw_cvars.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "flatvertices.h" #include "hwrenderer/data/hw_viewpointbuffer.h" #include "hwrenderer/data/shaderuniforms.h" diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp index f7af67ea1..7eca202c7 100644 --- a/src/rendering/vulkan/system/vk_framebuffer.cpp +++ b/src/rendering/vulkan/system/vk_framebuffer.cpp @@ -33,7 +33,7 @@ #include "version.h" #include "v_draw.h" -#include "hwrenderer/utility/hw_clock.h" +#include "hw_clock.h" #include "hw_vrmodes.h" #include "hw_cvars.h" #include "hwrenderer/models/hw_models.h"