Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6729 from zzmp/fix/reorder

Browse source 
Reorder RenderContext initializer to avoid -Wreorder
This commit is contained in:
Brad Hefta-Gaub 2015-12-22 17:19:32 -08:00
commit 7a09582a65
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render/src/render/Engine.cpp
View file

@ -14,9 +14,10 @@
using namespace render; using namespace render;
RenderContext::RenderContext(ItemsConfig items, Tone tone, int drawStatus, bool drawHitEffect, glm::vec4 deferredDebugSize, int deferredDebugMode) RenderContext::RenderContext(ItemsConfig items, Tone tone, int drawStatus, bool drawHitEffect, glm::vec4 deferredDebugSize, int deferredDebugMode)
: _args{ nullptr }, _items{ items }, _tone{ tone }, : _deferredDebugMode{ deferredDebugMode }, _deferredDebugSize{ deferredDebugSize },
_drawStatus{ drawStatus }, _drawHitEffect{ drawHitEffect }, _args{ nullptr },
_deferredDebugSize{ deferredDebugSize }, _deferredDebugMode{ deferredDebugMode } {}; _drawStatus{ drawStatus }, _drawHitEffect{ drawHitEffect },
_items{ items }, _tone{ tone } {}
void RenderContext::setOptions(bool occlusion, bool fxaa, bool showOwned) { void RenderContext::setOptions(bool occlusion, bool fxaa, bool showOwned) {
_occlusionStatus = occlusion; _occlusionStatus = occlusion;

8
libraries/render/src/render/Engine.h
View file

@ -91,15 +91,15 @@ public:
void setOptions(bool occlusion, bool fxaa, bool showOwned); void setOptions(bool occlusion, bool fxaa, bool showOwned);
// Debugging // Debugging
int _deferredDebugMode = -1; int _deferredDebugMode;
glm::vec4 _deferredDebugSize { 0.0f, -1.0f, 1.0f, 1.0f }; glm::vec4 _deferredDebugSize;
protected: protected:
RenderArgs* _args; RenderArgs* _args;
// Options // Options
int _drawStatus = 0; // bitflag int _drawStatus; // bitflag
bool _drawHitEffect = false; bool _drawHitEffect;
bool _occlusionStatus = false; bool _occlusionStatus = false;
bool _fxaaStatus = false; bool _fxaaStatus = false;