44baa47bba
# Conflicts: # include/Engine/Common.h # include/Engine/Rendering/DrawFinalPass.h # include/Engine/Rendering/DrawScenePass.h # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/Renderer.h # resources/Shaders/ForwardPlus.frag.glsl # resources/Shaders/ForwardPlus.vert.glsl # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/DrawScenePass.cpp # src/Engine/Rendering/RenderSystem.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp
11 lines
213 B
C++
11 lines
213 B
C++
#include <memory>
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <vector>
|
|
#include <map>
|
|
#include <unordered_map>
|
|
#include <algorithm>
|
|
#include <array>
|
|
|
|
#include "Core/Util/Logging.h"
|
|
#include "Core/Util/IfDebug.h" |