From 93643b3775e739feca43b10883e8e86326f3b618 Mon Sep 17 00:00:00 2001 From: Rebekah Rowe Date: Thu, 7 Apr 2022 13:30:38 -0400 Subject: [PATCH] Fixed .clang-format to not sort includes --- .clang-format | 1 + include/glez/draw.hpp | 3 ++- include/glez/font.hpp | 3 ++- include/glez/texture.hpp | 3 ++- src/draw.cpp | 4 +++- src/font.cpp | 3 ++- src/glez.cpp | 10 ++++++---- src/texture.cpp | 9 +++++---- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.clang-format b/.clang-format index 60efa45..3aac014 100644 --- a/.clang-format +++ b/.clang-format @@ -3,3 +3,4 @@ BreakBeforeBraces: Attach CompactNamespaces: true FixNamespaceComments: true NamespaceIndentation: None +SortIncludes: Never diff --git a/include/glez/draw.hpp b/include/glez/draw.hpp index 716586c..435843d 100644 --- a/include/glez/draw.hpp +++ b/include/glez/draw.hpp @@ -5,10 +5,11 @@ #pragma once +#include + #include "color.hpp" #include "font.hpp" #include "texture.hpp" -#include namespace glez::draw { diff --git a/include/glez/font.hpp b/include/glez/font.hpp index 33bc4ae..c9b1a89 100644 --- a/include/glez/font.hpp +++ b/include/glez/font.hpp @@ -5,10 +5,11 @@ #pragma once -#include #include #include +#include + namespace glez { class font { diff --git a/include/glez/texture.hpp b/include/glez/texture.hpp index 4c15a31..ea2a954 100644 --- a/include/glez/texture.hpp +++ b/include/glez/texture.hpp @@ -6,10 +6,11 @@ #pragma once #include -#include #include #include +#include + namespace glez { class texture { diff --git a/src/draw.cpp b/src/draw.cpp index ae8857e..79ddb70 100644 --- a/src/draw.cpp +++ b/src/draw.cpp @@ -6,11 +6,13 @@ #include #include #include + +#include + #include #include #include #include -#include namespace indices { diff --git a/src/font.cpp b/src/font.cpp index c242fdf..fe8cf62 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -4,10 +4,11 @@ */ #include -#include #include #include +#include + namespace glez { font font::loadFromFile(const std::string& path, float size) { diff --git a/src/glez.cpp b/src/glez.cpp index 20916af..d5f37f6 100644 --- a/src/glez.cpp +++ b/src/glez.cpp @@ -6,14 +6,16 @@ #include #include #include +#include + #include -#include -#include +#include #include #include #include -#include -#include + +#include +#include static const char* shader_vertex = R"END( #version 130 diff --git a/src/texture.cpp b/src/texture.cpp index d9e23ab..9e23bcd 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -3,15 +3,16 @@ Copyright (c) 2018 nullworks. All rights reserved. */ -#include "picopng/picopng.hpp" #include #include -#include -#include +#include #include #include -#include // required to load the file +#include "picopng/picopng.hpp" + +#include +#include namespace glez {