From bc697f2c7d10e14ded6ecafd5c2b9f4bf9c21519 Mon Sep 17 00:00:00 2001 From: Thomas Harrison Date: Sun, 26 Oct 2025 21:50:32 -0400 Subject: [PATCH 1/2] Add ci workflow --- .github/workflows/ci.yml | 71 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..b167488 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,71 @@ +name: Lint & Test + +on: + push: + branches: + - main + + pull_request: + types: + - opened + - reopened + - synchronize + +jobs: + # test: + # runs-on: ubuntu-latest + + # steps: + # - uses: actions/checkout@v4 + + # - name: Install dependencies + # run: sudo apt-get install -y build-essential gcc-multilib g++-multilib + + # - name: Install gcovr + # run: pip install gcovr + + # - name: Setup project + # run: cmake -S ${TEST_DIR} -B ${BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug + + # - name: Build + # run: cmake --build ${BUILD_DIR} + + # # - name: Test + # # working-directory: build + # # run: ctest -V + + # - name: Test with Coverage + # working-directory: build + # run: cmake --build ${BUILD_DIR} --target os_test_coverage + + lint: + runs-on: ubuntu-latest + + strategy: + matrix: + folder: + - src + - examples + - tests + + steps: + - uses: actions/checkout@v4 + + - name: Lint ${{ matrix.folder }} + uses: jidicula/clang-format-action@v4.14.0 + with: + clang-format-version: "20" + check-path: ${{ matrix.folder }} + + increment_version: + name: Increment Version + uses: automas-dev/reusable-workflows/.github/workflows/increment_version.yml@main + if: github.ref == 'refs/heads/main' + secrets: inherit + + needs: + # - test + - lint + + permissions: + contents: write From 797db4c63d6f2dc1f965d5da90b9da919baca96f Mon Sep 17 00:00:00 2001 From: Thomas Harrison Date: Mon, 27 Oct 2025 09:10:02 -0400 Subject: [PATCH 2/2] Add lint and format --- .clang-format | 62 ++++++++-------- Makefile | 8 +- examples/01_triangle/main.cpp | 10 +-- examples/02_camera/main.cpp | 20 ++--- examples/03_grid/main.cpp | 20 ++--- examples/04_framebuffer/main.cpp | 30 ++++---- examples/05_geometry/main.cpp | 122 +++++++++++++++---------------- examples/06_shapes/main.cpp | 24 +++--- examples/07_instanced/main.cpp | 16 ++-- include/glpp/extra/Transform.hpp | 2 +- src/FrameBuffer.cpp | 4 +- src/extra/Marker.cpp | 49 ++++++++----- src/extra/Vertex.cpp | 12 +-- 13 files changed, 201 insertions(+), 178 deletions(-) diff --git a/.clang-format b/.clang-format index a222fe5..906e38a 100644 --- a/.clang-format +++ b/.clang-format @@ -1,47 +1,47 @@ --- +Language: Cpp BasedOnStyle: Google -AccessModifierOffset: '-4' +AccessModifierOffset: -4 AlignEscapedNewlines: Left -AlignTrailingComments: 'false' -AllowAllArgumentsOnNextLine: 'false' -AllowShortBlocksOnASingleLine: 'false' +AlignTrailingComments: true +AlignAfterOpenBracket: true +AllowAllArgumentsOnNextLine: true +AllowShortBlocksOnASingleLine: false AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: Never AllowShortLambdasOnASingleLine: Empty -AlwaysBreakTemplateDeclarations: 'Yes' -BinPackArguments: 'true' -BinPackParameters: 'false' +AlwaysBreakTemplateDeclarations: "Yes" +AlignArrayOfStructures: Left +BinPackArguments: true +BinPackParameters: false BraceWrapping: - AfterEnum: 'false' - BeforeCatch: 'true' - BeforeElse: 'true' - BeforeLambdaBody: 'false' - BeforeWhile: 'false' + AfterEnum: false + BeforeCatch: true + BeforeElse: true + BeforeLambdaBody: false + BeforeWhile: false BreakBeforeBinaryOperators: NonAssignment BreakBeforeBraces: Custom -BreakBeforeTernaryOperators: 'false' +BreakBeforeTernaryOperators: false BreakConstructorInitializers: BeforeColon BreakInheritanceList: BeforeColon -BreakStringLiterals: 'false' -ColumnLimit: '80' -DerivePointerAlignment: 'false' +BreakStringLiterals: false +ColumnLimit: 0 +DerivePointerAlignment: false #EmptyLineAfterAccessModifier: Leave #EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: 'true' -FixNamespaceComments: 'false' -IndentCaseLabels: 'true' -IndentWidth: '4' -KeepEmptyLinesAtTheStartOfBlocks: 'true' -Language: Cpp -MaxEmptyLinesToKeep: '10' +ExperimentalAutoDetectBinPacking: true +FixNamespaceComments: false +IndentCaseLabels: true +IndentWidth: 4 +KeepEmptyLinesAtTheStartOfBlocks: true +MaxEmptyLinesToKeep: 10 NamespaceIndentation: All -PenaltyBreakComment: '20' -PenaltyExcessCharacter: '5' +PenaltyBreakComment: 20 +PenaltyExcessCharacter: 5 PointerAlignment: Middle -SortUsingDeclarations: 'false' -SpaceAfterTemplateKeyword: 'false' -SpaceBeforeCpp11BracedList: 'true' -SpacesBeforeTrailingComments: '1' +SortUsingDeclarations: false +SpaceAfterTemplateKeyword: false +SpaceBeforeCpp11BracedList: true +SpacesBeforeTrailingComments: 1 UseTab: Never - -... diff --git a/Makefile b/Makefile index c1d3848..7cf389f 100644 --- a/Makefile +++ b/Makefile @@ -22,4 +22,10 @@ build: install: cmake --install ${PWD}/build --config ${CONFIG} -.PHONY: config build install +lint: + @find src include examples tests -name '*.c' -or -name '*.h' -or -name '*.cpp' -or -name '*.hpp' | xargs clang-format --dry-run --Werror --sort-includes + +format: + @find src include examples tests -name '*.c' -or -name '*.h' -or -name '*.cpp' -or -name '*.hpp' | xargs clang-format -i --Werror --sort-includes + +.PHONY: config build install lint format diff --git a/examples/01_triangle/main.cpp b/examples/01_triangle/main.cpp index f3b623e..cd63a95 100644 --- a/examples/01_triangle/main.cpp +++ b/examples/01_triangle/main.cpp @@ -111,22 +111,22 @@ int main() { const float vertices[] = { -0.5f, -0.5f, 0.0f, // Bottom Left - 0.5f, -0.5f, 0.0f, // Bottom Right - 0.0f, 0.5f, 0.0f // Top Center + 0.5f, -0.5f, 0.0f, // Bottom Right + 0.0f, 0.5f, 0.0f // Top Center }; const float colors[] = { 1.0, 0.0, 0.0, // Bottom Left 0.0, 1.0, 0.0, // Bottom Right - 0.0, 0.0, 1.0 // Top Center + 0.0, 0.0, 1.0 // Top Center }; const unsigned int indices[] = { 0, 1, 2, // First Triangle }; - Buffer::Attribute a0 (0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a1 (1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a0(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a1(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); BufferArray array(vector> {{a0}, {a1}}); array.bind(); diff --git a/examples/02_camera/main.cpp b/examples/02_camera/main.cpp index fb4ec91..136fc86 100644 --- a/examples/02_camera/main.cpp +++ b/examples/02_camera/main.cpp @@ -105,16 +105,16 @@ int main() { const float vertices[] = { -0.5f, -0.5f, 0.0f, // Bottom Left - 0.5f, -0.5f, 0.0f, // Bottom Right - 0.0f, 0.5f, 0.0f, // Top Center + 0.5f, -0.5f, 0.0f, // Bottom Right + 0.0f, 0.5f, 0.0f, // Top Center - 0.0f, -0.5f, 0.0f, // - 1.0f, -0.5f, 0.0f, // - 1.0f, -0.5f, 1.0f, // + 0.0f, -0.5f, 0.0f, // + 1.0f, -0.5f, 0.0f, // + 1.0f, -0.5f, 1.0f, // - 0.5f, 0.0f, 0.0f, // - 0.5f, 1.0f, 0.0f, // - 0.5f, 1.0f, 1.0f, // + 0.5f, 0.0f, 0.0f, // + 0.5f, 1.0f, 0.0f, // + 0.5f, 1.0f, 1.0f, // }; const float colors[] = { @@ -131,8 +131,8 @@ int main() { 0.0, 0.0, 1.0, // Top Center }; - Buffer::Attribute a0 (0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a1 (1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a0(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a1(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); BufferArray array(vector> {{a0}, {a1}}); array.bind(); diff --git a/examples/03_grid/main.cpp b/examples/03_grid/main.cpp index 4c00112..cfde45f 100644 --- a/examples/03_grid/main.cpp +++ b/examples/03_grid/main.cpp @@ -108,16 +108,16 @@ int main() { const float vertices[] = { -0.5f, -0.5f, 0.0f, // Bottom Left - 0.5f, -0.5f, 0.0f, // Bottom Right - 0.0f, 0.5f, 0.0f, // Top Center + 0.5f, -0.5f, 0.0f, // Bottom Right + 0.0f, 0.5f, 0.0f, // Top Center - 0.0f, -0.5f, 0.0f, // - 1.0f, -0.5f, 0.0f, // - 1.0f, -0.5f, 1.0f, // + 0.0f, -0.5f, 0.0f, // + 1.0f, -0.5f, 0.0f, // + 1.0f, -0.5f, 1.0f, // - 0.5f, 0.0f, 0.0f, // - 0.5f, 1.0f, 0.0f, // - 0.5f, 1.0f, 1.0f, // + 0.5f, 0.0f, 0.0f, // + 0.5f, 1.0f, 0.0f, // + 0.5f, 1.0f, 1.0f, // }; const float colors[] = { @@ -134,8 +134,8 @@ int main() { 0.0, 0.0, 1.0, // Top Center }; - Buffer::Attribute a0 (0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a1 (1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a0(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a1(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); BufferArray array(vector> {{a0}, {a1}}); array.bind(); diff --git a/examples/04_framebuffer/main.cpp b/examples/04_framebuffer/main.cpp index 011adb5..44a20df 100644 --- a/examples/04_framebuffer/main.cpp +++ b/examples/04_framebuffer/main.cpp @@ -111,22 +111,22 @@ int main() { const float vertices[] = { -0.5f, -0.5f, 0.0f, // Bottom Left - 0.5f, -0.5f, 0.0f, // Bottom Right - 0.0f, 0.5f, 0.0f // Top Center + 0.5f, -0.5f, 0.0f, // Bottom Right + 0.0f, 0.5f, 0.0f // Top Center }; const float texCoords[] = { -0.5f, -0.5f, // Bottom Left - 0.5f, -0.5f, // Bottom Right - 0.0f, 0.5f, // Top Center + 0.5f, -0.5f, // Bottom Right + 0.0f, 0.5f, // Top Center }; const unsigned int indices[] = { 0, 1, 2, // First Triangle }; - Buffer::Attribute a0 (0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a1 (1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float)); + Buffer::Attribute a0(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a1(1, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float)); BufferArray array(vector> {{a0}, {a1}}); array.bind(); @@ -135,7 +135,7 @@ int main() { array.bufferElements(sizeof(indices), indices); array.unbind(); - Quad quad ({0, 0}, {1, 1}); + Quad quad({0, 0}, {1, 1}); // Needed because FrameBuffer is storing size for future blit to default FrameBuffer::getDefault().resize(uvec2(width, height)); @@ -146,14 +146,14 @@ int main() { fbo.attach(rbo, GL_DEPTH_STENCIL_ATTACHMENT); Texture::Ptr tex2 = make_shared(uvec2(width, height), - Texture::RGBA, - Texture::RGBA, - GL_FLOAT, - 0, - Texture::Linear, - Texture::Linear, - Texture::Clamp, - false); + Texture::RGBA, + Texture::RGBA, + GL_FLOAT, + 0, + Texture::Linear, + Texture::Linear, + Texture::Clamp, + false); fbo.attach(tex2, GL_COLOR_ATTACHMENT0); if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { diff --git a/examples/05_geometry/main.cpp b/examples/05_geometry/main.cpp index eff4d3c..3355ed0 100644 --- a/examples/05_geometry/main.cpp +++ b/examples/05_geometry/main.cpp @@ -98,78 +98,78 @@ void main() { })"; static vector cube = { - {glm::vec3(0.292893, 0.000000, 1.707107), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.000000)}, - {glm::vec3(-1.707107, 0.000000, -0.292893), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.250000)}, + {glm::vec3(0.292893, 0.000000, 1.707107), + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.000000)}, + {glm::vec3(-1.707107, 0.000000, -0.292893), + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.250000)}, {glm::vec3(-0.707107, -1.414214, 0.707107), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.000000)}, - {glm::vec3(-0.707107, 1.414214, 0.707107), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.250000)}, - {glm::vec3(-0.292893, 0.000000, -1.707107), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, - {glm::vec3(-1.707107, 0.000000, -0.292893), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.250000)}, - {glm::vec3(0.707107, 1.414214, -0.707107), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.500000)}, - {glm::vec3(0.707107, -1.414214, -0.707107), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.750000)}, - {glm::vec3(-0.292893, 0.000000, -1.707107), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.500000)}, - {glm::vec3(1.707107, 0.000000, 0.292893), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.000000)}, + {glm::vec3(-0.707107, 1.414214, 0.707107), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.250000)}, + {glm::vec3(-0.292893, 0.000000, -1.707107), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, + {glm::vec3(-1.707107, 0.000000, -0.292893), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.250000)}, + {glm::vec3(0.707107, 1.414214, -0.707107), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.500000)}, + {glm::vec3(0.707107, -1.414214, -0.707107), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.750000)}, + {glm::vec3(-0.292893, 0.000000, -1.707107), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.500000)}, + {glm::vec3(1.707107, 0.000000, 0.292893), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, {glm::vec3(-0.707107, -1.414214, 0.707107), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 1.000000)}, - {glm::vec3(0.707107, -1.414214, -0.707107), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 0.750000)}, - {glm::vec3(-0.292893, 0.000000, -1.707107), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 1.000000)}, + {glm::vec3(0.707107, -1.414214, -0.707107), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 0.750000)}, + {glm::vec3(-0.292893, 0.000000, -1.707107), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, {glm::vec3(-0.707107, -1.414214, 0.707107), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.125000, 0.750000)}, - {glm::vec3(-1.707107, 0.000000, -0.292893), + {glm::vec3(-1.707107, 0.000000, -0.292893), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.125000, 0.500000)}, - {glm::vec3(-0.707107, 1.414214, 0.707107), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.500000)}, - {glm::vec3(1.707107, 0.000000, 0.292893), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, - {glm::vec3(0.707107, 1.414214, -0.707107), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.500000)}, - {glm::vec3(0.292893, 0.000000, 1.707107), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.000000)}, - {glm::vec3(-0.707107, 1.414214, 0.707107), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.250000)}, - {glm::vec3(-1.707107, 0.000000, -0.292893), - glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.250000)}, - {glm::vec3(-0.707107, 1.414214, 0.707107), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.250000)}, - {glm::vec3(0.707107, 1.414214, -0.707107), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.500000)}, - {glm::vec3(-0.292893, 0.000000, -1.707107), - glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, - {glm::vec3(0.707107, 1.414214, -0.707107), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.500000)}, - {glm::vec3(1.707107, 0.000000, 0.292893), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.750000)}, - {glm::vec3(0.707107, -1.414214, -0.707107), - glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.750000)}, - {glm::vec3(1.707107, 0.000000, 0.292893), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, - {glm::vec3(0.292893, 0.000000, 1.707107), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 1.000000)}, + {glm::vec3(-0.707107, 1.414214, 0.707107), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.500000)}, + {glm::vec3(1.707107, 0.000000, 0.292893), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, + {glm::vec3(0.707107, 1.414214, -0.707107), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.500000)}, + {glm::vec3(0.292893, 0.000000, 1.707107), + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.000000)}, + {glm::vec3(-0.707107, 1.414214, 0.707107), + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.625000, 0.250000)}, + {glm::vec3(-1.707107, 0.000000, -0.292893), + glm::vec3(-0.707100, 0.000000, 0.707100), glm::vec2(0.375000, 0.250000)}, + {glm::vec3(-0.707107, 1.414214, 0.707107), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.250000)}, + {glm::vec3(0.707107, 1.414214, -0.707107), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.625000, 0.500000)}, + {glm::vec3(-0.292893, 0.000000, -1.707107), + glm::vec3(-0.500000, 0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, + {glm::vec3(0.707107, 1.414214, -0.707107), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.500000)}, + {glm::vec3(1.707107, 0.000000, 0.292893), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.625000, 0.750000)}, + {glm::vec3(0.707107, -1.414214, -0.707107), + glm::vec3(0.707100, 0.000000, -0.707100), glm::vec2(0.375000, 0.750000)}, + {glm::vec3(1.707107, 0.000000, 0.292893), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, + {glm::vec3(0.292893, 0.000000, 1.707107), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.625000, 1.000000)}, {glm::vec3(-0.707107, -1.414214, 0.707107), - glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 1.000000)}, - {glm::vec3(-0.292893, 0.000000, -1.707107), + glm::vec3(0.500000, -0.707100, 0.500000), glm::vec2(0.375000, 1.000000)}, + {glm::vec3(-0.292893, 0.000000, -1.707107), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.375000, 0.500000)}, - {glm::vec3(0.707107, -1.414214, -0.707107), + {glm::vec3(0.707107, -1.414214, -0.707107), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.375000, 0.750000)}, {glm::vec3(-0.707107, -1.414214, 0.707107), glm::vec3(-0.500000, -0.707100, -0.500000), glm::vec2(0.125000, 0.750000)}, - {glm::vec3(-0.707107, 1.414214, 0.707107), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.500000)}, - {glm::vec3(0.292893, 0.000000, 1.707107), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.750000)}, - {glm::vec3(1.707107, 0.000000, 0.292893), - glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, + {glm::vec3(-0.707107, 1.414214, 0.707107), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.500000)}, + {glm::vec3(0.292893, 0.000000, 1.707107), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.875000, 0.750000)}, + {glm::vec3(1.707107, 0.000000, 0.292893), + glm::vec3(0.500000, 0.707100, 0.500000), glm::vec2(0.625000, 0.750000)}, }; void error_callback(int error, const char * description) { diff --git a/examples/06_shapes/main.cpp b/examples/06_shapes/main.cpp index 83cc66c..7107b32 100644 --- a/examples/06_shapes/main.cpp +++ b/examples/06_shapes/main.cpp @@ -84,29 +84,29 @@ int main() { Line line1( std::vector { - {1, 2, 1}, - {1, 2, -1}, + {1, 2, 1 }, + {1, 2, -1}, {-1, 2, -1}, - {-1, 2, 1}, - }, + {-1, 2, 1 }, + }, glm::vec4(1.0, 0.0, 0.0, 1.0), Line::Lines); Line line2( std::vector { - {1, 1, 1}, - {1, 1, -1}, + {1, 1, 1 }, + {1, 1, -1}, {-1, 1, -1}, - {-1, 1, 1}, - }, + {-1, 1, 1 }, + }, glm::vec4(0.0, 1.0, 0.0, 1.0), Line::Strip); Line line3( std::vector { - {1, 0, 1}, - {1, 0, -1}, + {1, 0, 1 }, + {1, 0, -1}, {-1, 0, -1}, - {-1, 0, 1}, - }, + {-1, 0, 1 }, + }, glm::vec4(0.0, 0.0, 1.0, 1.0), Line::LineLoop); AxisMark axm; diff --git a/examples/07_instanced/main.cpp b/examples/07_instanced/main.cpp index fd2b82d..af59ce9 100644 --- a/examples/07_instanced/main.cpp +++ b/examples/07_instanced/main.cpp @@ -108,16 +108,16 @@ int main() { const float iOffset[] = { -1.0, -1.0, // - 0.0, 0.0, // - -1.0, 0.8, // - -0.8, 0.8, // - -0.6, 0.8, // + 0.0, 0.0, // + -1.0, 0.8, // + -0.8, 0.8, // + -0.6, 0.8, // }; - Buffer::Attribute a0 (0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a1 (1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); - Buffer::Attribute a2 (2, 1, GL_FLOAT, GL_FALSE, 1 * sizeof(float), nullptr, 1); - Buffer::Attribute a3 (3, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr, 1); + Buffer::Attribute a0(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a1(1, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float)); + Buffer::Attribute a2(2, 1, GL_FLOAT, GL_FALSE, 1 * sizeof(float), nullptr, 1); + Buffer::Attribute a3(3, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr, 1); BufferArray array(vector> {{a0}, {a1}, {a2}, {a3}}); array.drawArrays(Buffer::LineStrip, 0, 4); diff --git a/include/glpp/extra/Transform.hpp b/include/glpp/extra/Transform.hpp index 1174d19..d60b8e4 100644 --- a/include/glpp/extra/Transform.hpp +++ b/include/glpp/extra/Transform.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace glpp::extra { /** diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp index 874ea5d..860acde 100644 --- a/src/FrameBuffer.cpp +++ b/src/FrameBuffer.cpp @@ -161,9 +161,9 @@ namespace glpp { void FrameBuffer::blit(const FrameBuffer & source, GLbitfield mask, GLenum filter) const { - blit(source, // + blit(source, // 0, 0, source.size.x, source.size.y, // - 0, 0, size.x, size.y, // + 0, 0, size.x, size.y, // mask, filter); } diff --git a/src/extra/Marker.cpp b/src/extra/Marker.cpp index d272a2f..41514ed 100644 --- a/src/extra/Marker.cpp +++ b/src/extra/Marker.cpp @@ -65,9 +65,12 @@ namespace glpp::extra { namespace glpp::extra { static vector axis_mark_points { - {-1, 0, 0}, {1, 0, 0}, // X - {0, -1, 0}, {0, 1, 0}, // Y - {0, 0, -1}, {0, 0, 1}, // Z + {-1, 0, 0 }, + {1, 0, 0 }, // X + {0, -1, 0 }, + {0, 1, 0 }, // Y + {0, 0, -1}, + {0, 0, 1 }, // Z }; AxisMark::AxisMark(const glm::vec4 & color) @@ -89,20 +92,32 @@ namespace glpp::extra { namespace glpp::extra { static vector diamond_mark_points { - {-1, 0, 0}, {0, 0, -1}, // - {0, 0, -1}, {1, 0, 0}, // - {1, 0, 0}, {0, 0, 1}, // - {0, 0, 1}, {-1, 0, 0}, // - - {0, 1, 0}, {0, 0, -1}, // - {0, 1, 0}, {1, 0, 0}, // - {0, 1, 0}, {0, 0, 1}, // - {0, 1, 0}, {-1, 0, 0}, // - - {0, -1, 0}, {0, 0, -1}, // - {0, -1, 0}, {1, 0, 0}, // - {0, -1, 0}, {0, 0, 1}, // - {0, -1, 0}, {-1, 0, 0}, // + {-1, 0, 0 }, + {0, 0, -1}, // + {0, 0, -1}, + {1, 0, 0 }, // + {1, 0, 0 }, + {0, 0, 1 }, // + {0, 0, 1 }, + {-1, 0, 0 }, // + + {0, 1, 0 }, + {0, 0, -1}, // + {0, 1, 0 }, + {1, 0, 0 }, // + {0, 1, 0 }, + {0, 0, 1 }, // + {0, 1, 0 }, + {-1, 0, 0 }, // + + {0, -1, 0 }, + {0, 0, -1}, // + {0, -1, 0 }, + {1, 0, 0 }, // + {0, -1, 0 }, + {0, 0, 1 }, // + {0, -1, 0 }, + {-1, 0, 0 }, // }; DiamondMark::DiamondMark(const glm::vec4 & color) diff --git a/src/extra/Vertex.cpp b/src/extra/Vertex.cpp index df698dc..e104544 100644 --- a/src/extra/Vertex.cpp +++ b/src/extra/Vertex.cpp @@ -38,11 +38,13 @@ namespace glpp::extra { } namespace glpp::extra { - static const vector> attrs {{ - {0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), 0}, - {1, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void *)(3 * sizeof(float))}, - {2, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void *)(6 * sizeof(float))}, - }}; + static const vector> attrs { + { + {0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), 0}, + {1, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void *)(3 * sizeof(float))}, + {2, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void *)(6 * sizeof(float))}, + } + }; VertexBufferArray::VertexBufferArray() : BufferArray(attrs) {}