Cleaning up #include's
This commit is contained in:
parent
f79cc70d44
commit
3dd641c8c1
14 changed files with 21 additions and 61 deletions
4
bloom.cc
4
bloom.cc
|
@ -1,8 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "utilities.hh"
|
|
||||||
#include "texture.hh"
|
|
||||||
#include "rendertarget.hh"
|
|
||||||
#include "programs.hh"
|
|
||||||
#include "bloom.hh"
|
#include "bloom.hh"
|
||||||
#include "profiling.hh"
|
#include "profiling.hh"
|
||||||
|
|
||||||
|
|
8
bloom.hh
8
bloom.hh
|
@ -1,13 +1,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
#ifndef REAL_BUILD
|
||||||
# define REAL_BUILD
|
|
||||||
# include "externals.hh"
|
# include "externals.hh"
|
||||||
# include "texture.hh"
|
|
||||||
# include "rendertarget.hh"
|
|
||||||
# include "utilities.hh"
|
|
||||||
# undef REAL_BUILD
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "rendertarget.hh"
|
||||||
|
#include "programs.hh"
|
||||||
|
|
||||||
|
|
||||||
struct T_BloomPass
|
struct T_BloomPass
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "utilities.hh"
|
|
||||||
#include "texture.hh"
|
|
||||||
#include "rendertarget.hh"
|
|
||||||
#include "programs.hh"
|
|
||||||
#include "combine.hh"
|
#include "combine.hh"
|
||||||
#include "bloom.hh"
|
#include "bloom.hh"
|
||||||
#include "profiling.hh"
|
#include "profiling.hh"
|
||||||
|
|
12
combine.hh
12
combine.hh
|
@ -1,13 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
|
||||||
# define REAL_BUILD
|
#include "rendertarget.hh"
|
||||||
# include "externals.hh"
|
#include "programs.hh"
|
||||||
# include "texture.hh"
|
|
||||||
# include "rendertarget.hh"
|
|
||||||
# include "utilities.hh"
|
|
||||||
# include "programs.hh"
|
|
||||||
# undef REAL_BUILD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct T_CombinePass
|
struct T_CombinePass
|
||||||
|
|
4
dof.cc
4
dof.cc
|
@ -1,8 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "texture.hh"
|
|
||||||
#include "utilities.hh"
|
|
||||||
#include "programs.hh"
|
|
||||||
#include "rendertarget.hh"
|
|
||||||
#include "dof.hh"
|
#include "dof.hh"
|
||||||
#include "profiling.hh"
|
#include "profiling.hh"
|
||||||
|
|
||||||
|
|
10
dof.hh
10
dof.hh
|
@ -1,12 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
#include "rendertarget.hh"
|
||||||
# define REAL_BUILD
|
#include "programs.hh"
|
||||||
# include "externals.hh"
|
|
||||||
# include "texture.hh"
|
|
||||||
# include "rendertarget.hh"
|
|
||||||
# include "programs.hh"
|
|
||||||
# undef REAL_BUILD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct T_DoFPass
|
struct T_DoFPass
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "utilities.hh"
|
|
||||||
#include "profiling.hh"
|
#include "profiling.hh"
|
||||||
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
#include "utilities.hh"
|
||||||
# define REAL_BUILD
|
|
||||||
# include "externals.hh"
|
|
||||||
# include "utilities.hh"
|
|
||||||
# undef REAL_BUILD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct T_ProfilerSamples
|
struct T_ProfilerSamples
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "utilities.hh"
|
|
||||||
#include "programs.hh"
|
#include "programs.hh"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
|
||||||
# include "externals.hh"
|
#include "utilities.hh"
|
||||||
# include "utilities.hh"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*= T_ShaderCode =============================================================*/
|
/*= T_ShaderCode =============================================================*/
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "utilities.hh"
|
|
||||||
#include "texture.hh"
|
|
||||||
#include "rendertarget.hh"
|
|
||||||
#include "programs.hh"
|
|
||||||
#include "raymarcher.hh"
|
#include "raymarcher.hh"
|
||||||
#include "profiling.hh"
|
#include "profiling.hh"
|
||||||
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
static const std::string Name_( "Raymarcher" );
|
static const std::string Name_( "Raymarcher" );
|
||||||
}
|
}
|
||||||
|
@ -13,6 +10,7 @@ namespace {
|
||||||
#define PSTART() T_Profiler::Profiler.start( Name_ )
|
#define PSTART() T_Profiler::Profiler.start( Name_ )
|
||||||
#define PEND() do { glFinish( ); T_Profiler::Profiler.end( Name_ ); } while ( 0 )
|
#define PEND() do { glFinish( ); T_Profiler::Profiler.end( Name_ ); } while ( 0 )
|
||||||
|
|
||||||
|
|
||||||
T_Raymarcher::T_Raymarcher(
|
T_Raymarcher::T_Raymarcher(
|
||||||
__rw__ T_FilesWatcher& watcher ,
|
__rw__ T_FilesWatcher& watcher ,
|
||||||
__rd__ const uint32_t width ,
|
__rd__ const uint32_t width ,
|
||||||
|
|
|
@ -1,13 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
|
||||||
# define REAL_BUILD
|
#include "rendertarget.hh"
|
||||||
# include "externals.hh"
|
#include "programs.hh"
|
||||||
# include "texture.hh"
|
|
||||||
# include "rendertarget.hh"
|
|
||||||
# include "utilities.hh"
|
|
||||||
# include "programs.hh"
|
|
||||||
# undef REAL_BUILD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct T_Raymarcher
|
struct T_Raymarcher
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include "externals.hh"
|
#include "externals.hh"
|
||||||
#include "texture.hh"
|
|
||||||
#include "rendertarget.hh"
|
#include "rendertarget.hh"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#ifndef REAL_BUILD
|
#ifndef REAL_BUILD
|
||||||
# include "externals.hh"
|
# include "externals.hh"
|
||||||
# include "texture.hh"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "texture.hh"
|
||||||
|
|
||||||
|
|
||||||
struct T_Rendertarget;
|
struct T_Rendertarget;
|
||||||
|
|
||||||
|
|
||||||
struct T_RendertargetSetup
|
struct T_RendertargetSetup
|
||||||
{
|
{
|
||||||
T_RendertargetSetup( );
|
T_RendertargetSetup( );
|
||||||
|
|
Loading…
Reference in a new issue