From 0dc82fe75556ddfb5cd4a4d1eadcdde523660cb7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 27 Apr 2018 00:53:58 +0200 Subject: [PATCH] - header cleanup for gl_swscene. --- src/gl/scene/gl_swscene.cpp | 8 ++++---- src/gl/scene/gl_swscene.h | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/gl/scene/gl_swscene.cpp b/src/gl/scene/gl_swscene.cpp index 4281a2cc9..965a2f8dd 100644 --- a/src/gl/scene/gl_swscene.cpp +++ b/src/gl/scene/gl_swscene.cpp @@ -25,17 +25,17 @@ ** */ -#include "gl/system/gl_system.h" -#include "gl/system/gl_debug.h" -#include "gl/data/gl_vertexbuffer.h" -#include "gl/shaders/gl_shader.h" #include "hwrenderer/textures/hw_ihwtexture.h" +#include "hwrenderer/textures/hw_material.h" +#include "r_renderer.h" #include "gl_swscene.h" #include "w_wad.h" #include "d_player.h" #include "textures/bitmap.h" #include "swrenderer/scene/r_light.h" +#include "gl/renderer/gl_renderer.h" + // [RH] Base blending values (for e.g. underwater) int BaseBlendR, BaseBlendG, BaseBlendB; float BaseBlendA; diff --git a/src/gl/scene/gl_swscene.h b/src/gl/scene/gl_swscene.h index f4fbb00a3..f54b2f3ed 100644 --- a/src/gl/scene/gl_swscene.h +++ b/src/gl/scene/gl_swscene.h @@ -4,9 +4,6 @@ #include "r_defs.h" #include "m_fixed.h" #include "hwrenderer/scene/hw_clipper.h" -#include "gl_portal.h" -#include "gl/renderer/gl_lightdata.h" -#include "gl/renderer/gl_renderer.h" #include "r_utility.h" #include "c_cvars.h" @@ -18,12 +15,6 @@ class SWSceneDrawer FSWSceneTexture *FBTexture = nullptr; bool FBIsTruecolor = false; - - void BlendView (player_t *CPlayer, float blend[4]); - bool CreateResources(); - void BindFBBuffer(); - - public: SWSceneDrawer(); ~SWSceneDrawer();