From 3e53d0529892ee017f1c9dff13aaf0aa74bd7f48 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Wed, 12 Jun 2019 20:03:22 +0000 Subject: [PATCH] Fixes includes and forward declarations in CPatchRData. Reviewed By: wraitii Differential Revision: https://code.wildfiregames.com/D1952 This was SVN commit r22371. --- source/renderer/PatchRData.cpp | 3 ++- source/renderer/PatchRData.h | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source/renderer/PatchRData.cpp b/source/renderer/PatchRData.cpp index 70ddfddb2f..eee40d4f73 100644 --- a/source/renderer/PatchRData.cpp +++ b/source/renderer/PatchRData.cpp @@ -17,6 +17,8 @@ #include "precompiled.h" +#include "renderer/PatchRData.h" + #include "graphics/GameView.h" #include "graphics/LightEnv.h" #include "graphics/LOSTexture.h" @@ -34,7 +36,6 @@ #include "ps/Pyrogenesis.h" #include "ps/World.h" #include "renderer/AlphaMapCalculator.h" -#include "renderer/PatchRData.h" #include "renderer/Renderer.h" #include "renderer/TerrainRenderer.h" #include "renderer/WaterManager.h" diff --git a/source/renderer/PatchRData.h b/source/renderer/PatchRData.h index 4ae5642ad5..caa98585eb 100644 --- a/source/renderer/PatchRData.h +++ b/source/renderer/PatchRData.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -18,15 +18,18 @@ #ifndef INCLUDED_PATCHRDATA #define INCLUDED_PATCHRDATA -#include #include "graphics/SColor.h" -#include "maths/Vector3D.h" #include "maths/Vector2D.h" +#include "maths/Vector3D.h" +#include "graphics/Patch.h" #include "graphics/RenderableObject.h" #include "graphics/ShaderProgramPtr.h" -#include "VertexBufferManager.h" +#include "renderer/VertexBufferManager.h" + +#include class CPatch; +class CShaderDefines; class CSimulation2; class CTerrainTextureEntry; class CTextRenderer; @@ -176,4 +179,4 @@ private: static const ssize_t water_cell_size = 1; }; -#endif +#endif // INCLUDED_PATCHRDATA