From 924d60e99ba7ddf800eececed1b91ec1390dbc50 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 15 Aug 2022 11:03:19 -0400 Subject: [PATCH] Update clang-format again --- .clang-format | 7 ++++++- engine/asset/include/asset.hpp | 4 +++- engine/asset/include/assetptr.hpp | 24 ++++++++++++++++++------ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.clang-format b/.clang-format index 9aebe0c..c2b3ef2 100644 --- a/.clang-format +++ b/.clang-format @@ -25,5 +25,10 @@ AlignAfterOpenBracket: AlwaysBreak BinPackArguments: false BinPackParameters: false ColumnLimit: 120 - +AllowShortBlocksOnASingleLine: 'false' +AllowShortCaseLabelsOnASingleLine: 'false' +AllowShortFunctionsOnASingleLine: 'Empty' +AllowShortLambdasOnASingleLine: 'Empty' +AllowShortLoopsOnASingleLine: 'false' +SeparateDefinitionBlocks : 'Always' ... diff --git a/engine/asset/include/asset.hpp b/engine/asset/include/asset.hpp index 94dda47..8dabea9 100644 --- a/engine/asset/include/asset.hpp +++ b/engine/asset/include/asset.hpp @@ -26,7 +26,9 @@ public: return AssetPtr(AssetStore::at(p).get(), reference_block); } - template AssetPtr get(const prism::path path) { return fetch(path, get_reference_block(path)); } + template AssetPtr get(const prism::path path) { + return fetch(path, get_reference_block(path)); + } template std::vector get_all() { std::vector assets; diff --git a/engine/asset/include/assetptr.hpp b/engine/asset/include/assetptr.hpp index 1f26fe1..b011e2b 100644 --- a/engine/asset/include/assetptr.hpp +++ b/engine/asset/include/assetptr.hpp @@ -15,7 +15,9 @@ public: template struct AssetPtr { AssetPtr() = default; - AssetPtr(T* ptr, ReferenceBlock* block) : handle(ptr), block(block) { block->references++; } + AssetPtr(T* ptr, ReferenceBlock* block) : handle(ptr), block(block) { + block->references++; + } AssetPtr(const AssetPtr& rhs) { handle = rhs.handle; @@ -53,13 +55,23 @@ template struct AssetPtr { T* handle = nullptr; ReferenceBlock* block = nullptr; - explicit operator bool() const { return handle != nullptr; } + explicit operator bool() const { + return handle != nullptr; + } - T* operator->() { return handle; } + T* operator->() { + return handle; + } - T* operator->() const { return handle; } + T* operator->() const { + return handle; + } - T* operator*() { return handle; } + T* operator*() { + return handle; + } - T* operator*() const { return handle; } + T* operator*() const { + return handle; + } };