From bbfd967f1e74d66e36078b43776870b3f4e209ca Mon Sep 17 00:00:00 2001 From: dfranx Date: Wed, 18 Mar 2020 15:38:15 +0100 Subject: [PATCH] Fix --- main.cpp | 2 +- src/SHADERed/Engine/GLUtils.cpp | 2 +- src/SHADERed/Engine/GeometryFactory.cpp | 2 +- src/SHADERed/GUIManager.cpp | 7 ++----- src/SHADERed/InterfaceManager.cpp | 2 +- src/SHADERed/InterfaceManager.h | 2 +- src/SHADERed/Objects/AudioShaderStream.cpp | 2 +- src/SHADERed/Objects/Debug/PixelInformation.h | 4 ++-- src/SHADERed/Objects/Export/ExportCPP.cpp | 2 +- src/SHADERed/Objects/FunctionVariableManager.cpp | 2 +- src/SHADERed/Objects/GizmoObject.cpp | 4 ++-- src/SHADERed/Objects/GizmoObject.h | 2 +- src/SHADERed/Objects/HLSLFileIncluder.h | 2 +- src/SHADERed/Objects/ObjectManager.cpp | 2 +- src/SHADERed/Objects/PipelineItem.h | 2 +- src/SHADERed/Objects/PipelineManager.cpp | 4 ++-- src/SHADERed/Objects/PipelineManager.h | 2 +- src/SHADERed/Objects/PluginAPI/PluginManager.cpp | 10 +++++----- src/SHADERed/Objects/PluginAPI/PluginManager.h | 4 ++-- src/SHADERed/Objects/ProjectParser.cpp | 10 +++++----- src/SHADERed/Objects/RenderEngine.cpp | 2 +- src/SHADERed/Objects/Settings.cpp | 2 +- src/SHADERed/Objects/Settings.h | 4 ++-- src/SHADERed/Objects/ShaderVariable.h | 14 +++++++------- src/SHADERed/Objects/ShaderVariableContainer.cpp | 4 ++-- src/SHADERed/Objects/ThemeContainer.cpp | 2 +- src/SHADERed/UI/CodeEditorUI.cpp | 4 ++-- src/SHADERed/UI/CodeEditorUI.h | 2 +- src/SHADERed/UI/MessageOutputUI.cpp | 2 +- src/SHADERed/UI/ObjectListUI.cpp | 2 +- src/SHADERed/UI/ObjectListUI.h | 2 +- src/SHADERed/UI/ObjectPreviewUI.cpp | 2 +- src/SHADERed/UI/ObjectPreviewUI.h | 2 +- src/SHADERed/UI/OptionsUI.cpp | 2 +- src/SHADERed/UI/PinnedUI.cpp | 2 +- src/SHADERed/UI/PinnedUI.h | 2 +- src/SHADERed/UI/PipelineUI.cpp | 2 +- src/SHADERed/UI/PipelineUI.h | 2 +- src/SHADERed/UI/PixelInspectUI.cpp | 2 +- src/SHADERed/UI/PreviewUI.cpp | 2 +- src/SHADERed/UI/PropertyUI.cpp | 3 ++- src/SHADERed/UI/Tools/CubemapPreview.cpp | 2 +- src/SHADERed/UI/Tools/Magnifier.cpp | 4 ++-- src/SHADERed/UI/Tools/StatsPage.cpp | 4 ++-- src/SHADERed/UI/UIHelper.cpp | 2 +- src/SHADERed/UI/UIView.h | 2 +- 46 files changed, 71 insertions(+), 73 deletions(-) diff --git a/main.cpp b/main.cpp index 25c591f4..e1155135 100644 --- a/main.cpp +++ b/main.cpp @@ -2,12 +2,12 @@ #include #endif +#include #include #include #include #include #include -#include #include #include diff --git a/src/SHADERed/Engine/GLUtils.cpp b/src/SHADERed/Engine/GLUtils.cpp index 465d01bb..1166c80c 100644 --- a/src/SHADERed/Engine/GLUtils.cpp +++ b/src/SHADERed/Engine/GLUtils.cpp @@ -119,7 +119,7 @@ namespace ed { void CreateVAO(GLuint& geoVAO, GLuint geoVBO, const std::vector& ilayout, GLuint geoEBO, GLuint bufVBO, std::vector types) { int fmtIndex = 0; - + glDeleteVertexArrays(1, &geoVAO); glGenVertexArrays(1, &geoVAO); diff --git a/src/SHADERed/Engine/GeometryFactory.cpp b/src/SHADERed/Engine/GeometryFactory.cpp index 5ca83a82..60596ca1 100644 --- a/src/SHADERed/Engine/GeometryFactory.cpp +++ b/src/SHADERed/Engine/GeometryFactory.cpp @@ -1,6 +1,6 @@ +#include #include #include -#include #include #if defined(__APPLE__) diff --git a/src/SHADERed/GUIManager.cpp b/src/SHADERed/GUIManager.cpp index a2776b5c..2a7f75d1 100644 --- a/src/SHADERed/GUIManager.cpp +++ b/src/SHADERed/GUIManager.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -248,10 +248,7 @@ namespace ed { SDL_free(droppedFile); } else if (e.type == SDL_WINDOWEVENT) { - if (e.window.event == SDL_WINDOWEVENT_MOVED || - e.window.event == SDL_WINDOWEVENT_MAXIMIZED || - e.window.event == SDL_WINDOWEVENT_RESIZED) - { + if (e.window.event == SDL_WINDOWEVENT_MOVED || e.window.event == SDL_WINDOWEVENT_MAXIMIZED || e.window.event == SDL_WINDOWEVENT_RESIZED) { SDL_GetWindowSize(m_wnd, &m_width, &m_height); } } diff --git a/src/SHADERed/InterfaceManager.cpp b/src/SHADERed/InterfaceManager.cpp index 60834dd4..f399235b 100644 --- a/src/SHADERed/InterfaceManager.cpp +++ b/src/SHADERed/InterfaceManager.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include namespace ed { diff --git a/src/SHADERed/InterfaceManager.h b/src/SHADERed/InterfaceManager.h index c295415d..c0e6fabf 100644 --- a/src/SHADERed/InterfaceManager.h +++ b/src/SHADERed/InterfaceManager.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include @@ -6,7 +7,6 @@ #include #include #include -#include namespace ed { class GUIManager; diff --git a/src/SHADERed/Objects/AudioShaderStream.cpp b/src/SHADERed/Objects/AudioShaderStream.cpp index 966abeee..980eb453 100644 --- a/src/SHADERed/Objects/AudioShaderStream.cpp +++ b/src/SHADERed/Objects/AudioShaderStream.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include #include diff --git a/src/SHADERed/Objects/Debug/PixelInformation.h b/src/SHADERed/Objects/Debug/PixelInformation.h index 85b82e7d..c6c2b8f2 100644 --- a/src/SHADERed/Objects/Debug/PixelInformation.h +++ b/src/SHADERed/Objects/Debug/PixelInformation.h @@ -27,7 +27,7 @@ namespace ed { glm::vec4 DebuggerColor; // Color generated by the debugger - this way users can see if the ShaderDebugger is executing code correctly... going to leave this here until I improve ShaderDebugger PipelineItem* Owner; // shader pass responsible for this pixel - PipelineItem* Object; // pipeline item responsible for this pixel + PipelineItem* Object; // pipeline item responsible for this pixel std::string RenderTexture; // what render texture int RenderTextureIndex; @@ -37,7 +37,7 @@ namespace ed { glm::ivec2 Coordinate; // pixel position on the texture glm::vec2 RelativeCoordinate; - bool Fetched; // Did we fill the DebuggerColor and Vertex[] information for this pixel? + bool Fetched; // Did we fill the DebuggerColor and Vertex[] information for this pixel? bool Discarded; // was this pixel discarded? int VertexCount; // 1 for point, 2 for line, 3 for triangle, etc... diff --git a/src/SHADERed/Objects/Export/ExportCPP.cpp b/src/SHADERed/Objects/Export/ExportCPP.cpp index fe1c6cc0..57e8cd33 100644 --- a/src/SHADERed/Objects/Export/ExportCPP.cpp +++ b/src/SHADERed/Objects/Export/ExportCPP.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include #include diff --git a/src/SHADERed/Objects/FunctionVariableManager.cpp b/src/SHADERed/Objects/FunctionVariableManager.cpp index 12aeb93d..5ce6a324 100644 --- a/src/SHADERed/Objects/FunctionVariableManager.cpp +++ b/src/SHADERed/Objects/FunctionVariableManager.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include #include diff --git a/src/SHADERed/Objects/GizmoObject.cpp b/src/SHADERed/Objects/GizmoObject.cpp index 8ea1d094..8a39bf53 100644 --- a/src/SHADERed/Objects/GizmoObject.cpp +++ b/src/SHADERed/Objects/GizmoObject.cpp @@ -1,8 +1,8 @@ -#include -#include #include +#include #include #include +#include #include #include diff --git a/src/SHADERed/Objects/GizmoObject.h b/src/SHADERed/Objects/GizmoObject.h index 5ece2a06..0632093a 100644 --- a/src/SHADERed/Objects/GizmoObject.h +++ b/src/SHADERed/Objects/GizmoObject.h @@ -46,7 +46,7 @@ namespace ed { glm::vec3 *m_trans, *m_scale, *m_rota; glm::vec3 m_tValue, m_curValue; int m_axisSelected; // -1 = none, 0 = x, 1 = y, 2 = z - int m_axisHovered; // ^ same as here + int m_axisHovered; // ^ same as here int m_mode; // 0 = translation, 1 = scale, 2 = rotation float m_lastDepth; diff --git a/src/SHADERed/Objects/HLSLFileIncluder.h b/src/SHADERed/Objects/HLSLFileIncluder.h index c0b308a4..5e12cbe7 100644 --- a/src/SHADERed/Objects/HLSLFileIncluder.h +++ b/src/SHADERed/Objects/HLSLFileIncluder.h @@ -88,7 +88,7 @@ namespace ed { } } - virtual ~HLSLFileIncluder() override {} + virtual ~HLSLFileIncluder() override { } protected: typedef char tUserDataElement; diff --git a/src/SHADERed/Objects/ObjectManager.cpp b/src/SHADERed/Objects/ObjectManager.cpp index 01226371..e3b09f63 100644 --- a/src/SHADERed/Objects/ObjectManager.cpp +++ b/src/SHADERed/Objects/ObjectManager.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include diff --git a/src/SHADERed/Objects/PipelineItem.h b/src/SHADERed/Objects/PipelineItem.h index 7be67b88..7a50431b 100644 --- a/src/SHADERed/Objects/PipelineItem.h +++ b/src/SHADERed/Objects/PipelineItem.h @@ -1,10 +1,10 @@ #pragma once #include -#include #include #include #include #include +#include #include #ifdef _WIN32 diff --git a/src/SHADERed/Objects/PipelineManager.cpp b/src/SHADERed/Objects/PipelineManager.cpp index b0e59a05..4ad5af71 100644 --- a/src/SHADERed/Objects/PipelineManager.cpp +++ b/src/SHADERed/Objects/PipelineManager.cpp @@ -1,8 +1,8 @@ -#include -#include #include +#include #include #include +#include int strcmpcase(const char* s1, const char* s2) { diff --git a/src/SHADERed/Objects/PipelineManager.h b/src/SHADERed/Objects/PipelineManager.h index ffdcefb7..fbac289b 100644 --- a/src/SHADERed/Objects/PipelineManager.h +++ b/src/SHADERed/Objects/PipelineManager.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include #include namespace ed { diff --git a/src/SHADERed/Objects/PluginAPI/PluginManager.cpp b/src/SHADERed/Objects/PluginAPI/PluginManager.cpp index 6f47ff94..f8ba79c5 100644 --- a/src/SHADERed/Objects/PluginAPI/PluginManager.cpp +++ b/src/SHADERed/Objects/PluginAPI/PluginManager.cpp @@ -1,6 +1,10 @@ -#include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -8,10 +12,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/SHADERed/Objects/PluginAPI/PluginManager.h b/src/SHADERed/Objects/PluginAPI/PluginManager.h index e3f89f3f..00357582 100644 --- a/src/SHADERed/Objects/PluginAPI/PluginManager.h +++ b/src/SHADERed/Objects/PluginAPI/PluginManager.h @@ -1,8 +1,8 @@ #pragma once +#include #include -#include #include -#include +#include #include #include diff --git a/src/SHADERed/Objects/ProjectParser.cpp b/src/SHADERed/Objects/ProjectParser.cpp index f20dc9a9..18befcf7 100644 --- a/src/SHADERed/Objects/ProjectParser.cpp +++ b/src/SHADERed/Objects/ProjectParser.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -10,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -113,7 +113,7 @@ namespace ed { NULL /* .colorScheme */ }; int buttonid; - if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) {} + if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) { } if (buttonid == 0) { // TODO: redirect to .../plugin?name=pname @@ -139,9 +139,9 @@ namespace ed { NULL /* .colorScheme */ }; int buttonid; - if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) {} + if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) { } - if (buttonid == 0) {} + if (buttonid == 0) { } pluginTest = false; } else { @@ -165,7 +165,7 @@ namespace ed { NULL /* .colorScheme */ }; int buttonid; - if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) {} + if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) { } if (buttonid == 0) { // TODO: redirect to .../plugin?name=pname diff --git a/src/SHADERed/Objects/RenderEngine.cpp b/src/SHADERed/Objects/RenderEngine.cpp index f4b6f008..19d4581f 100644 --- a/src/SHADERed/Objects/RenderEngine.cpp +++ b/src/SHADERed/Objects/RenderEngine.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/src/SHADERed/Objects/Settings.cpp b/src/SHADERed/Objects/Settings.cpp index 89143698..a6c773ae 100644 --- a/src/SHADERed/Objects/Settings.cpp +++ b/src/SHADERed/Objects/Settings.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include diff --git a/src/SHADERed/Objects/Settings.h b/src/SHADERed/Objects/Settings.h index 1a60489b..ef7dc16d 100644 --- a/src/SHADERed/Objects/Settings.h +++ b/src/SHADERed/Objects/Settings.h @@ -11,7 +11,7 @@ namespace ed { void Load(); void Save(); - float DPIScale; // shouldn't be changed by users + float DPIScale; // shouldn't be changed by users float TempScale; // copy this value to DPIScale on "Ok" button press std::string Theme; @@ -74,7 +74,7 @@ namespace ed { bool StatusBar; int FPSLimit; bool ApplyFPSLimitToApp; // apply FPSLimit to whole app, not only preview - bool LostFocusLimitFPS; // limit to 30FPS when app loses focus + bool LostFocusLimitFPS; // limit to 30FPS when app loses focus int MSAA; // 1 (off), 2, 4, 8 } Preview; diff --git a/src/SHADERed/Objects/ShaderVariable.h b/src/SHADERed/Objects/ShaderVariable.h index 15b50aac..7949756c 100644 --- a/src/SHADERed/Objects/ShaderVariable.h +++ b/src/SHADERed/Objects/ShaderVariable.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include #include #include @@ -21,22 +21,22 @@ namespace ed { Time, // float - time elapsed since start TimeDelta, // float - render time FrameIndex, // uint - current frame index - ViewportSize, // vec2 - rendering window size - MousePosition, // vec2 - mouse position relative to (0,0) in the rendering window + ViewportSize, // vec2 - rendering window size + MousePosition, // vec2 - mouse position relative to (0,0) in the rendering window View, // mat4 - a built-in camera matrix Projection, // mat4 - a built-in projection matrix - ViewProjection, // mat4 - View*Projection matrix - Orthographic, // mat4 - an orthographic matrix + ViewProjection, // mat4 - View*Projection matrix + Orthographic, // mat4 - an orthographic matrix ViewOrthographic, // mat4 - View*Orthographic GeometryTransform, // mat4 - apply Scale, Rotation and Position to geometry IsPicked, // bool - check if current item is selected - CameraPosition, // vec4 - current camera position + CameraPosition, // vec4 - current camera position CameraPosition3, // vec3 - current camera position CameraDirection3, // vec3 - camera view direction KeysWASD, // vec4 - are W, A, S or D keys pressed Mouse, // vec4 - (x,y,left,right) updated every frame MouseButton, // vec4 - (x,y,left,right) updated only when mouse button pressed - PluginVariable, // a value that is updated by some plugin + PluginVariable, // a value that is updated by some plugin Count }; diff --git a/src/SHADERed/Objects/ShaderVariableContainer.cpp b/src/SHADERed/Objects/ShaderVariableContainer.cpp index 8d6c63da..306e4f0c 100644 --- a/src/SHADERed/Objects/ShaderVariableContainer.cpp +++ b/src/SHADERed/Objects/ShaderVariableContainer.cpp @@ -1,11 +1,11 @@ -#include #include +#include #include #include #include namespace ed { - ShaderVariableContainer::ShaderVariableContainer() {} + ShaderVariableContainer::ShaderVariableContainer() { } ShaderVariableContainer::~ShaderVariableContainer() { for (int i = 0; i < m_vars.size(); i++) { diff --git a/src/SHADERed/Objects/ThemeContainer.cpp b/src/SHADERed/Objects/ThemeContainer.cpp index 59604237..3c80841c 100644 --- a/src/SHADERed/Objects/ThemeContainer.cpp +++ b/src/SHADERed/Objects/ThemeContainer.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include namespace ed { diff --git a/src/SHADERed/UI/CodeEditorUI.cpp b/src/SHADERed/UI/CodeEditorUI.cpp index ec0346aa..f0a8ae46 100644 --- a/src/SHADERed/UI/CodeEditorUI.cpp +++ b/src/SHADERed/UI/CodeEditorUI.cpp @@ -156,7 +156,7 @@ namespace ed { m_data->Renderer.RecompileFile(shaderFile.c_str()); } - void CodeEditorUI::OnEvent(const SDL_Event& e) {} + void CodeEditorUI::OnEvent(const SDL_Event& e) { } void CodeEditorUI::Update(float delta) { if (m_editor.size() == 0) @@ -190,7 +190,7 @@ namespace ed { if (ImGui::BeginMenu("Code")) { if (ImGui::MenuItem("Compile", KeyboardShortcuts::Instance().GetString("CodeUI.Compile").c_str())) m_compile(i); - if (!m_stats[i].Visible && ImGui::MenuItem("Stats", KeyboardShortcuts::Instance().GetString("CodeUI.SwitchView").c_str(), nullptr, false)) {} + if (!m_stats[i].Visible && ImGui::MenuItem("Stats", KeyboardShortcuts::Instance().GetString("CodeUI.SwitchView").c_str(), nullptr, false)) { } if (m_stats[i].Visible && ImGui::MenuItem("Code", KeyboardShortcuts::Instance().GetString("CodeUI.SwitchView").c_str())) m_stats[i].Visible = false; ImGui::Separator(); diff --git a/src/SHADERed/UI/CodeEditorUI.h b/src/SHADERed/UI/CodeEditorUI.h index d275aa95..79b1c710 100644 --- a/src/SHADERed/UI/CodeEditorUI.h +++ b/src/SHADERed/UI/CodeEditorUI.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include @@ -6,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/src/SHADERed/UI/MessageOutputUI.cpp b/src/SHADERed/UI/MessageOutputUI.cpp index 5f9296e6..c290387e 100644 --- a/src/SHADERed/UI/MessageOutputUI.cpp +++ b/src/SHADERed/UI/MessageOutputUI.cpp @@ -1,7 +1,7 @@ -#include #include #include #include +#include #include namespace ed { diff --git a/src/SHADERed/UI/ObjectListUI.cpp b/src/SHADERed/UI/ObjectListUI.cpp index 22535b61..ddf58830 100644 --- a/src/SHADERed/UI/ObjectListUI.cpp +++ b/src/SHADERed/UI/ObjectListUI.cpp @@ -1,8 +1,8 @@ -#include #include #include #include #include +#include #include #include #include diff --git a/src/SHADERed/UI/ObjectListUI.h b/src/SHADERed/UI/ObjectListUI.h index 7d406b05..6e3a14c8 100644 --- a/src/SHADERed/UI/ObjectListUI.h +++ b/src/SHADERed/UI/ObjectListUI.h @@ -10,7 +10,7 @@ namespace ed { { m_cubePrev.Init(152, 114); } - ~ObjectListUI() {} + ~ObjectListUI() { } virtual void OnEvent(const SDL_Event& e); virtual void Update(float delta); diff --git a/src/SHADERed/UI/ObjectPreviewUI.cpp b/src/SHADERed/UI/ObjectPreviewUI.cpp index df189944..779ffb0f 100644 --- a/src/SHADERed/UI/ObjectPreviewUI.cpp +++ b/src/SHADERed/UI/ObjectPreviewUI.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include namespace ed { diff --git a/src/SHADERed/UI/ObjectPreviewUI.h b/src/SHADERed/UI/ObjectPreviewUI.h index 4cc0aa72..26227b8f 100644 --- a/src/SHADERed/UI/ObjectPreviewUI.h +++ b/src/SHADERed/UI/ObjectPreviewUI.h @@ -15,7 +15,7 @@ namespace ed { m_curHoveredItem = -1; m_lastZoomSize = glm::vec2(0, 0); } - ~ObjectPreviewUI() {} + ~ObjectPreviewUI() { } virtual void OnEvent(const SDL_Event& e); virtual void Update(float delta); diff --git a/src/SHADERed/UI/OptionsUI.cpp b/src/SHADERed/UI/OptionsUI.cpp index a8542ab7..d9c1084e 100644 --- a/src/SHADERed/UI/OptionsUI.cpp +++ b/src/SHADERed/UI/OptionsUI.cpp @@ -1,10 +1,10 @@ -#include #include #include #include #include #include #include +#include #include #include diff --git a/src/SHADERed/UI/PinnedUI.cpp b/src/SHADERed/UI/PinnedUI.cpp index 35c54846..6794d498 100644 --- a/src/SHADERed/UI/PinnedUI.cpp +++ b/src/SHADERed/UI/PinnedUI.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include diff --git a/src/SHADERed/UI/PinnedUI.h b/src/SHADERed/UI/PinnedUI.h index 1083e164..35fbc67a 100644 --- a/src/SHADERed/UI/PinnedUI.h +++ b/src/SHADERed/UI/PinnedUI.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include namespace ed { class PinnedUI : public UIView { diff --git a/src/SHADERed/UI/PipelineUI.cpp b/src/SHADERed/UI/PipelineUI.cpp index 85aa66ce..c6edb8f5 100644 --- a/src/SHADERed/UI/PipelineUI.cpp +++ b/src/SHADERed/UI/PipelineUI.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -10,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/src/SHADERed/UI/PipelineUI.h b/src/SHADERed/UI/PipelineUI.h index 190a44ec..069ea7fc 100644 --- a/src/SHADERed/UI/PipelineUI.h +++ b/src/SHADERed/UI/PipelineUI.h @@ -1,7 +1,7 @@ #pragma once #include -#include #include +#include namespace ed { class PipelineUI : public UIView { diff --git a/src/SHADERed/UI/PixelInspectUI.cpp b/src/SHADERed/UI/PixelInspectUI.cpp index f010c6cb..34a1b4bb 100644 --- a/src/SHADERed/UI/PixelInspectUI.cpp +++ b/src/SHADERed/UI/PixelInspectUI.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,6 +5,7 @@ #include #include #include +#include #include #include diff --git a/src/SHADERed/UI/PreviewUI.cpp b/src/SHADERed/UI/PreviewUI.cpp index 4720d5e1..ab4e4ba0 100644 --- a/src/SHADERed/UI/PreviewUI.cpp +++ b/src/SHADERed/UI/PreviewUI.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -9,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/src/SHADERed/UI/PropertyUI.cpp b/src/SHADERed/UI/PropertyUI.cpp index 2b7dc4e3..a27b7ba4 100644 --- a/src/SHADERed/UI/PropertyUI.cpp +++ b/src/SHADERed/UI/PropertyUI.cpp @@ -1,13 +1,14 @@ -#include #include #include #include #include #include +#include #include #include #include +#define GLM_ENABLE_EXPERIMENTAL #include #include #include diff --git a/src/SHADERed/UI/Tools/CubemapPreview.cpp b/src/SHADERed/UI/Tools/CubemapPreview.cpp index d0975e87..e9c1375f 100644 --- a/src/SHADERed/UI/Tools/CubemapPreview.cpp +++ b/src/SHADERed/UI/Tools/CubemapPreview.cpp @@ -1,7 +1,7 @@ -#include #include #include #include +#include #include #include #include diff --git a/src/SHADERed/UI/Tools/Magnifier.cpp b/src/SHADERed/UI/Tools/Magnifier.cpp index 25ebe7d8..80dbd7b7 100644 --- a/src/SHADERed/UI/Tools/Magnifier.cpp +++ b/src/SHADERed/UI/Tools/Magnifier.cpp @@ -1,6 +1,6 @@ -#include -#include #include +#include +#include #include #include diff --git a/src/SHADERed/UI/Tools/StatsPage.cpp b/src/SHADERed/UI/Tools/StatsPage.cpp index e9991d3a..c7817345 100644 --- a/src/SHADERed/UI/Tools/StatsPage.cpp +++ b/src/SHADERed/UI/Tools/StatsPage.cpp @@ -2,6 +2,6 @@ #include namespace ed { - void StatsPage::OnEvent(const SDL_Event& e) {} - void StatsPage::Update(float delta) {} + void StatsPage::OnEvent(const SDL_Event& e) { } + void StatsPage::Update(float delta) { } } \ No newline at end of file diff --git a/src/SHADERed/UI/UIHelper.cpp b/src/SHADERed/UI/UIHelper.cpp index 20feb5df..8dfb081e 100644 --- a/src/SHADERed/UI/UIHelper.cpp +++ b/src/SHADERed/UI/UIHelper.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include diff --git a/src/SHADERed/UI/UIView.h b/src/SHADERed/UI/UIView.h index 2fe78d80..8dc7bfd6 100644 --- a/src/SHADERed/UI/UIView.h +++ b/src/SHADERed/UI/UIView.h @@ -13,7 +13,7 @@ namespace ed { , Name(name) { } - virtual ~UIView() {} + virtual ~UIView() { } virtual void OnEvent(const SDL_Event& e) = 0; virtual void Update(float delta) = 0;