Index: binaries/data/mods/public/gui/credits/texts/programming.json =================================================================== --- binaries/data/mods/public/gui/credits/texts/programming.json +++ binaries/data/mods/public/gui/credits/texts/programming.json @@ -230,6 +230,7 @@ { "nick": "Spahbod", "name": "Omid Davoodi" }, { "nick": "Stan", "name": "Stanislas Dolcini" }, { "nick": "Stefan" }, + { "nick": "StefanBruens", "name": "Stefan Brüns" }, { "nick": "stilz", "name": "Sławomir Zborowski" }, { "nick": "stwf", "name": "Steven Fuchs" }, { "nick": "svott", "name": "Sven Ott" }, Index: source/renderer/HWLightingModelRenderer.h =================================================================== --- source/renderer/HWLightingModelRenderer.h +++ source/renderer/HWLightingModelRenderer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2020 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -25,8 +25,6 @@ #include "renderer/ModelVertexRenderer.h" -struct ShaderModelRendererInternals; - /** * Render animated models using a ShaderRenderModifier. * This computes and binds per-vertex data; the modifier is responsible @@ -48,6 +46,7 @@ void RenderModel(const CShaderProgramPtr& shader, int streamflags, CModel* model, CModelRData* data); protected: + struct ShaderModelRendererInternals; ShaderModelRendererInternals* m; }; Index: source/renderer/HWLightingModelRenderer.cpp =================================================================== --- source/renderer/HWLightingModelRenderer.cpp +++ source/renderer/HWLightingModelRenderer.cpp @@ -96,7 +96,7 @@ }; -struct ShaderModelRendererInternals +struct ShaderModelVertexRenderer::ShaderModelRendererInternals { bool cpuLighting; Index: source/renderer/ModelRenderer.h =================================================================== --- source/renderer/ModelRenderer.h +++ source/renderer/ModelRenderer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2020 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -245,9 +245,6 @@ static void GenTangents(const CModelDefPtr& mdef, std::vector& newVertices, bool gpuSkinning); }; - -struct ShaderModelRendererInternals; - /** * Implementation of ModelRenderer that loads the appropriate shaders for * rendering each model, and that batches by shader (and by mesh and texture). @@ -270,6 +267,7 @@ virtual void Render(const RenderModifierPtr& modifier, const CShaderDefines& context, int cullGroup, int flags); private: + struct ShaderModelRendererInternals; ShaderModelRendererInternals* m; }; Index: source/renderer/ModelRenderer.cpp =================================================================== --- source/renderer/ModelRenderer.cpp +++ source/renderer/ModelRenderer.cpp @@ -201,7 +201,7 @@ * Separated into the source file to increase implementation hiding (and to * avoid some causes of recompiles). */ -struct ShaderModelRendererInternals +struct ShaderModelRenderer::ShaderModelRendererInternals { ShaderModelRendererInternals(ShaderModelRenderer* r) : m_Renderer(r) { }