Cleanup: Removed include/de_graphics.h

skyjake · Jul 22, 2015 · 0164431 · 0164431
1 parent e30a96a
commit 0164431
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 113 deletions.
diff --git a/doomsday/apps/client/include/de_graphics.h b/doomsday/apps/client/include/de_graphics.h
diff --git a/doomsday/apps/client/src/audio/s_sfx.cpp b/doomsday/apps/client/src/audio/s_sfx.cpp
@@ -25,7 +25,6 @@
 #include <de/Log>
 #include "de_audio.h"
 #include "de_console.h"
-#include "de_graphics.h"
 #include "de_play.h"
 #include "de_system.h"
 
@@ -35,6 +34,8 @@
 #include "SectorCluster"
 
 #ifdef __CLIENT__
+#  include "gl/gl_main.h"
+
 #  include "api_fontrender.h"
 #  include "render/rend_font.h"
 

diff --git a/doomsday/apps/client/src/busymode.cpp b/doomsday/apps/client/src/busymode.cpp
@@ -30,18 +30,18 @@
 #include <de/Log>
 
 #include "de_console.h"
-#include "de_graphics.h"
 #ifdef __CLIENT__
-#include "clientapp.h"
-#include "sys_system.h"
-#endif
+#  include "clientapp.h"
+#  include "sys_system.h"
 
-//#include "audio/s_main.h"
+#  include "gl/gl_defer.h"
+#endif
 
 #include "ui/busyvisual.h"
 #ifdef __CLIENT__
-#include "ui/clientwindowsystem.h"
-#include "ui/widgets/busywidget.h"
+#  include "ui/clientwindow.h"
+#  include "ui/clientwindowsystem.h"
+#  include "ui/widgets/busywidget.h"
 #endif
 
 #ifdef __CLIENT__

diff --git a/doomsday/apps/client/src/dd_loop.cpp b/doomsday/apps/client/src/dd_loop.cpp
@@ -27,7 +27,6 @@
 #include "de_console.h"
 #include "de_system.h"
 #include "de_play.h"
-#include "de_graphics.h"
 #include "de_audio.h"
 #include "de_ui.h"
 
@@ -46,6 +45,7 @@
 
 #ifdef __CLIENT__
 #  include "render/rend_font.h"
+#  include "render/viewports.h"
 
 #  include "ui/busyvisual.h"
 #  include "ui/clientwindow.h"

diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp
@@ -29,12 +29,11 @@
 #include <de/GLState>
 
 #include "de_console.h"
-#include "de_graphics.h"
 #include "de_filesys.h"
 
 #include "api_gl.h"
-
-#include "gl/sys_opengl.h"
+#include "gl/gl_defer.h"
+#include "gl/gl_draw.h"
 #include "gl/gl_texmanager.h"
 
 #include "render/r_draw.h"

diff --git a/doomsday/apps/client/src/gl/dgl_draw.cpp b/doomsday/apps/client/src/gl/dgl_draw.cpp
@@ -22,12 +22,12 @@
 #include "de_base.h"
 #include "gl/gl_main.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <de/concurrency.h>
 #include "de_console.h"
-#include "de_graphics.h"
 #include "sys_system.h"
+#include "gl/gl_draw.h"
 #include "gl/sys_opengl.h"
 
 using namespace de;

diff --git a/doomsday/apps/client/src/gl/gl_defer.cpp b/doomsday/apps/client/src/gl/gl_defer.cpp
@@ -1,8 +1,7 @@
-/** @file gl_defer.cpp Implementation of deferred GL tasks. 
- * @ingroup gl
+/** @file gl_defer.cpp  Implementation of deferred GL tasks. 
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2005-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -21,17 +20,16 @@
 
 #define LIBDENG_DISABLE_DEFERRED_GL_API // using regular GL API calls
 
-#ifdef UNIX
-#   include "de_platform.h"
-#endif
+#include "de_platform.h"
+#include "gl/gl_defer.h"
 
-#include "de_base.h"
 #include "de_console.h"
 #include "de_system.h"
-#include "de_graphics.h"
+#include "dd_main.h"
 #include "m_misc.h"
-#include "gl/gl_texmanager.h"
 
+#include "gl/gl_main.h"
+#include "gl/gl_texmanager.h"
 #include "gl/texturecontent.h"
 
 using namespace de;

diff --git a/doomsday/apps/client/src/gl/gl_draw.cpp b/doomsday/apps/client/src/gl/gl_draw.cpp
@@ -27,12 +27,14 @@
 #include <de/Vector>
 #include <de/concurrency.h>
 #include "de_console.h"
-#include "de_graphics.h"
 #include "de_play.h"
 
-#include "api_render.h"
+#include "gl/gl_main.h"
 #include "gl/sys_opengl.h"
 
+#include "api_render.h"
+#include "render/viewports.h"
+
 using namespace de;
 
 static bool drawFilter = false;

diff --git a/doomsday/apps/client/src/gl/sys_opengl.cpp b/doomsday/apps/client/src/gl/sys_opengl.cpp
@@ -28,8 +28,8 @@
 #include <de/GLInfo>
 #include <de/GLState>
 #include "de_console.h"
-#include "de_graphics.h"
 #include "sys_system.h"
+#include "gl/gl_main.h"
 
 #ifdef WIN32
 #   define GETPROC(Type, x)   x = de::function_cast<Type>(wglGetProcAddress(#x))

diff --git a/doomsday/apps/client/src/m_misc.cpp b/doomsday/apps/client/src/m_misc.cpp
@@ -46,7 +46,6 @@
 #include "de_console.h"
 #include "de_system.h"
 #include "de_filesys.h"
-#include "de_graphics.h"
 #include "de_play.h"
 
 #include "lzss.h"

diff --git a/doomsday/apps/client/src/network/net_main.cpp b/doomsday/apps/client/src/network/net_main.cpp
@@ -28,7 +28,6 @@
 #include <de/Version>
 #include <doomsday/console/exec.h>
 #include "de_console.h"
-#include "de_graphics.h"
 #include "de_system.h"
 #include "de_ui.h"
 #include "dd_def.h"
@@ -52,10 +51,13 @@
 #include "network/net_event.h"
 
 #ifdef __CLIENT__
+#  include "gl/gl_main.h"
+
 #  include "api_fontrender.h"
 #  include "render/rend_main.h"
-#  include "render/lightgrid.h"
 #  include "render/blockmapvisual.h"
+#  include "render/lightgrid.h"
+#  include "render/viewports.h"
 
 #  include "edit_bias.h"
 #  include "ui/inputdebug.h"

diff --git a/doomsday/apps/client/src/render/blockmapvisual.cpp b/doomsday/apps/client/src/render/blockmapvisual.cpp
@@ -18,20 +18,15 @@
  * 02110-1301 USA</small>
  */
 
+#include "de_base.h"
+#include "render/blockmapvisual.h"
+
 #include <de/aabox.h>
 #include <de/concurrency.h>
-
 #include <de/Vector>
-
-#include "de_base.h"
-#include "de_graphics.h"
 #include "de_ui.h"
 
-#include "api_fontrender.h"
-
-#include "Face"
-#include "HEdge"
-
+#include "gl/gl_main.h"
 #include "gl/gl_texmanager.h"
 
 #include "world/blockmap.h"
@@ -40,8 +35,10 @@
 #include "world/p_object.h"
 #include "world/p_players.h"
 #include "ConvexSubspace"
+#include "Face"
+#include "HEdge"
 
-#include "render/blockmapvisual.h"
+#include "api_fontrender.h"
 #include "render/rend_font.h"
 
 using namespace de;

diff --git a/doomsday/apps/client/src/render/huecirclevisual.cpp b/doomsday/apps/client/src/render/huecirclevisual.cpp
@@ -1,7 +1,7 @@
-/** @file huecirclevisual.cpp HueCircle visualizer.
+/** @file huecirclevisual.cpp  HueCircle visualizer.
  *
  * @authors Copyright © 2006-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -17,15 +17,12 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include <de/mathutil.h> // M_HSVToRGB(), remove me (use QColor)
-
 #include "de_base.h"
-#include "de_graphics.h"
+#include "render/huecirclevisual.h"
 
+#include <de/mathutil.h>  // M_HSVToRGB(), remove me (use QColor)
 #include "HueCircle"
 
-#include "render/huecirclevisual.h"
-
 using namespace de;
 
 void HueCircleVisual::draw(HueCircle &hueCircle, Vector3d const &viewOrigin,

diff --git a/doomsday/apps/client/src/render/rend_font.cpp b/doomsday/apps/client/src/render/rend_font.cpp
@@ -27,14 +27,15 @@
 #include <cstdlib>
 #include <de/GLState>
 #include "de_console.h"
-#include "de_graphics.h"
 #include "de_system.h"
 #include "de_ui.h"
 #include "m_misc.h"
 
 #include "BitmapFont"
 #include "CompositeBitmapFont"
 
+#include "gl/gl_main.h"
+#include "gl/gl_draw.h"
 #include "gl/gl_texmanager.h"
 
 #include "api_fontrender.h"

diff --git a/doomsday/apps/client/src/sys_system.cpp b/doomsday/apps/client/src/sys_system.cpp
@@ -36,7 +36,6 @@
 #include <de/Loop>
 #include "de_console.h"
 #include "de_system.h"
-#include "de_graphics.h"
 #ifdef __CLIENT__
 #  include "clientapp.h"
 #endif

diff --git a/doomsday/apps/client/src/ui/busyvisual.cpp b/doomsday/apps/client/src/ui/busyvisual.cpp
@@ -1,8 +1,7 @@
-/** @file busyvisual.cpp Busy Mode visualizer. 
- * @ingroup render
+/** @file busyvisual.cpp  Busy Mode visualizer. 
  *
  * @authors Copyright © 2007-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2007-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2007-2015 Daniel Swanson <danij@dengine.net>
  * @authors Copyright © 2007 Jamie Jones <jamie_jones_au@yahoo.com.au>
  *
  * @par License
@@ -20,15 +19,14 @@
  * 02110-1301 USA</small>
  */
 
-#include <math.h>
-
 #include "de_base.h"
+#include "ui/busyvisual.h"
+
+#include <cmath>
 #include "de_console.h"
 #include "de_system.h"
-#include "de_graphics.h"
 #include "de_ui.h"
-
-#include "ui/busyvisual.h"
+#include "gl/gl_main.h"
 #include "ui/widgets/busywidget.h"
 
 static void releaseScreenshotTexture()

diff --git a/doomsday/apps/client/src/ui/inputdebug.cpp b/doomsday/apps/client/src/ui/inputdebug.cpp
@@ -1,6 +1,6 @@
 /** @file inputdebug.cpp  Input debug visualizer.
  *
- * @authors Copyright © 2007-2014 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2007-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -24,17 +24,24 @@
 
 #include <de/concurrency.h>
 #include <de/ddstring.h>
+#include <de/point.h>
 #include <de/timer.h> // SECONDSPERTIC
 #include <doomsday/console/cmd.h>
 #include <doomsday/console/var.h>
 #include <de/KeyEvent>
 #include "clientapp.h"
-
 #include "dd_def.h"
 #include "dd_main.h"
 #include "sys_system.h" // novideo
 
+#include "gl/gl_main.h"
+#include "gl/gl_draw.h"
+
+#include "api_fontrender.h"
+
 #include "ui/b_main.h"
+#include "ui/b_util.h"
+#include "ui/clientwindow.h"
 #include "ui/joystick.h"
 #include "ui/infine/finale.h"
 #include "ui/inputdevice.h"
@@ -43,11 +50,6 @@
 #include "ui/inputdevicehatcontrol.h"
 #include "ui/sys_input.h"
 #include "ui/ui_main.h"
-#include "ui/b_util.h"
-
-#include <de/point.h>
-#include "de_graphics.h"
-#include "api_fontrender.h"
 
 using namespace de;