From 678ac40b72a4a69a7418cef4498cc8457e8cfbbe Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 27 Apr 2018 20:28:59 +0200
Subject: [PATCH] - cleaned up includes for gl_decal.cpp

---
 src/gl/scene/gl_decal.cpp            | 20 ++++++++------------
 src/gl/scene/gl_scenedrawer.h        |  8 --------
 src/hwrenderer/utility/hw_lighting.h |  9 +++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/gl/scene/gl_decal.cpp b/src/gl/scene/gl_decal.cpp
index fc0b9f5e6..3dd2972c8 100644
--- a/src/gl/scene/gl_decal.cpp
+++ b/src/gl/scene/gl_decal.cpp
@@ -1,7 +1,7 @@
 // 
 //---------------------------------------------------------------------------
 //
-// Copyright(C) 2003-2016 Christoph Oelckers
+// Copyright(C) 2003-2018 Christoph Oelckers
 // All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -21,24 +21,20 @@
 //
 /*
 ** gl_decal.cpp
-** OpenGL decal rendering code
+** OpenGL decal processing code
 **
 */
 
 #include "doomdata.h"
-#include "gl/system/gl_system.h"
 #include "a_sharedglobal.h"
 #include "r_utility.h"
 #include "g_levellocals.h"
-
+#include "hwrenderer/textures/hw_material.h"
 #include "hwrenderer/utility/hw_cvars.h"
-#include "gl/data/gl_vertexbuffer.h"
-#include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_lightdata.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_scenedrawer.h"
-#include "gl/renderer/gl_quaddrawer.h"
+#include "hwrenderer/scene/hw_drawstructs.h"
+#include "hwrenderer/scene/hw_drawinfo.h"
+#include "hwrenderer/utility/hw_lighting.h"
+#include "hwrenderer/data/flatvertices.h"
 
 void GLWall::ProcessDecal(HWDrawInfo *di, DBaseDecal *decal)
 {
@@ -257,7 +253,7 @@ void GLWall::ProcessDecal(HWDrawInfo *di, DBaseDecal *decal)
 
 	gldecal.zcenter = zpos - decalheight * 0.5f;
 	
-	auto verts = gl_drawinfo->AllocVertices(4);
+	auto verts = di->AllocVertices(4);
 	gldecal.vertindex = verts.second;
 	
 	for (i = 0; i < 4; i++)
diff --git a/src/gl/scene/gl_scenedrawer.h b/src/gl/scene/gl_scenedrawer.h
index 0d1759ff7..5520225f6 100644
--- a/src/gl/scene/gl_scenedrawer.h
+++ b/src/gl/scene/gl_scenedrawer.h
@@ -9,14 +9,6 @@
 #include "r_utility.h"
 #include "c_cvars.h"
 
-EXTERN_CVAR(Int, gl_weaponlight);
-
-inline	int getExtraLight()
-{
-	return r_viewpoint.extralight * gl_weaponlight;
-}
-
-
 class GLSceneDrawer
 {
 	fixed_t viewx, viewy;	// since the nodes are still fixed point, keeping the view position  also fixed point for node traversal is faster.
diff --git a/src/hwrenderer/utility/hw_lighting.h b/src/hwrenderer/utility/hw_lighting.h
index 43bceaf98..9acb1578d 100644
--- a/src/hwrenderer/utility/hw_lighting.h
+++ b/src/hwrenderer/utility/hw_lighting.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include "c_cvars.h"
 #include "v_palette.h"
 #include "templates.h"
+#include "r_utility.h"
 
 struct Colormap;
 
@@ -15,3 +17,10 @@ inline int hw_ClampLight(int lightlevel)
 	return clamp(lightlevel, 0, 255);
 }
 
+EXTERN_CVAR(Int, gl_weaponlight);
+
+inline	int getExtraLight()
+{
+	return r_viewpoint.extralight * gl_weaponlight;
+}
+