diff options
author | Vittorio Romeo <vittorio.romeo@outlook.com> | 2021-10-31 18:07:30 +0000 |
---|---|---|
committer | Vittorio Romeo <vittorio.romeo@outlook.com> | 2021-10-31 18:07:30 +0000 |
commit | 852e5dec530550ae895d0280d1d26fe23af07615 (patch) | |
tree | 3c15062d873c00375a1e2a3f410b968c11d296a8 | |
parent | 7fead3a0e89a3a81b98bc29a3c503d43ddb1c4a9 (diff) |
clang-fmt
-rw-r--r-- | src/SSVOpenHexagon/Core/main.cpp | 62 | ||||
-rw-r--r-- | src/SSVOpenHexagon/Data/StyleData.cpp | 12 | ||||
-rw-r--r-- | src/SSVOpenHexagon/Global/Assets.cpp | 5 |
3 files changed, 38 insertions, 41 deletions
diff --git a/src/SSVOpenHexagon/Core/main.cpp b/src/SSVOpenHexagon/Core/main.cpp index 2600ca32..64096430 100644 --- a/src/SSVOpenHexagon/Core/main.cpp +++ b/src/SSVOpenHexagon/Core/main.cpp @@ -272,12 +272,11 @@ getFirstCompressedReplayFilenameFromArgs(const std::vector<std::string>& args) hg::Config::loadConfig(args); hg::Config::reapplyResolution(); - HG_SCOPE_GUARD( - { - ssvu::lo("::main") << "Saving config...\n"; - hg::Config::saveConfig(); - ssvu::lo("::main") << "Done saving config\n"; - }); + HG_SCOPE_GUARD({ + ssvu::lo("::main") << "Saving config...\n"; + hg::Config::saveConfig(); + ssvu::lo("::main") << "Done saving config\n"; + }); // // @@ -331,29 +330,27 @@ getFirstCompressedReplayFilenameFromArgs(const std::vector<std::string>& args) ImGui::SFML::Init(*window); } - HG_SCOPE_GUARD( - { - ssvu::lo("::main") << "Shutting down ImGui...\n"; + HG_SCOPE_GUARD({ + ssvu::lo("::main") << "Shutting down ImGui...\n"; - if(!headless) - { - ImGui::SFML::Shutdown(); - } + if(!headless) + { + ImGui::SFML::Shutdown(); + } - ssvu::lo("::main") << "Done shutting down ImGui...\n"; - }); + ssvu::lo("::main") << "Done shutting down ImGui...\n"; + }); // // // ------------------------------------------------------------------------ // Initialize assets hg::HGAssets assets{&steamManager, headless}; - HG_SCOPE_GUARD( - { - ssvu::lo("::main") << "Saving all local profiles...\n"; - assets.pSaveAll(); - ssvu::lo("::main") << "Done saving all local profiles\n"; - }); + HG_SCOPE_GUARD({ + ssvu::lo("::main") << "Saving all local profiles...\n"; + assets.pSaveAll(); + ssvu::lo("::main") << "Done saving all local profiles\n"; + }); // // @@ -361,12 +358,10 @@ getFirstCompressedReplayFilenameFromArgs(const std::vector<std::string>& args) // Initialize audio hg::Audio audio{ // - [&assets](const std::string& assetId) -> sf::SoundBuffer* { - return assets.getSoundBuffer(assetId); - }, // - [&assets](const std::string& assetId) -> const std::string* { - return assets.getMusicPath(assetId); - } // + [&assets](const std::string& assetId) -> sf::SoundBuffer* + { return assets.getSoundBuffer(assetId); }, // + [&assets](const std::string& assetId) -> const std::string* + { return assets.getMusicPath(assetId); } // }; audio.setSoundVolume(hg::Config::getSoundVolume()); @@ -607,15 +602,14 @@ int main(int argc, char* argv[]) // // ------------------------------------------------------------------------ // Flush and save log (at the end of the scope) - HG_SCOPE_GUARD( - { - ssvu::lo("::main") << "Saving log to 'log.txt'...\n"; + HG_SCOPE_GUARD({ + ssvu::lo("::main") << "Saving log to 'log.txt'...\n"; - ssvu::lo().flush(); - ssvu::saveLogToFile("log.txt"); + ssvu::lo().flush(); + ssvu::saveLogToFile("log.txt"); - ssvu::lo("::main") << "Done saving log to 'log.txt'\n"; - }); + ssvu::lo("::main") << "Done saving log to 'log.txt'\n"; + }); // // diff --git a/src/SSVOpenHexagon/Data/StyleData.cpp b/src/SSVOpenHexagon/Data/StyleData.cpp index 7ead052d..0db0a06e 100644 --- a/src/SSVOpenHexagon/Data/StyleData.cpp +++ b/src/SSVOpenHexagon/Data/StyleData.cpp @@ -235,14 +235,17 @@ void StyleData::drawBackgroundImpl(Utils::FastVertexVectorTris& vertices, void StyleData::drawBackgroundMenuHexagonImpl( Utils::FastVertexVectorTris& vertices, const sf::Vector2f& mCenterPos, - const unsigned int sides, const bool fourByThree, const bool blackAndWhite) const + const unsigned int sides, const bool fourByThree, + const bool blackAndWhite) const { const float div{ssvu::tau / sides * 1.0001f}; const float halfDiv{div / 2.f}; const float hexagonRadius{fourByThree ? 75.f : 100.f}; - const sf::Color& colorMain{blackAndWhite ? sf::Color::White : getMainColor()}; - const sf::Color colorCap{blackAndWhite ? sf::Color::Black : getCapColorResult()}; + const sf::Color& colorMain{ + blackAndWhite ? sf::Color::White : getMainColor()}; + const sf::Color colorCap{ + blackAndWhite ? sf::Color::Black : getCapColorResult()}; for(auto i(0u); i < sides; ++i) { @@ -279,7 +282,8 @@ void StyleData::drawBackgroundMenu(Utils::FastVertexVectorTris& mTris, drawBackgroundImpl( mTris, mCenterPos, sides, darkenUnevenBackgroundChunk, blackAndWhite); - drawBackgroundMenuHexagonImpl(mTris, mCenterPos, sides, fourByThree, blackAndWhite); + drawBackgroundMenuHexagonImpl( + mTris, mCenterPos, sides, fourByThree, blackAndWhite); } void StyleData::setCapColor(const CapColor& mCapColor) diff --git a/src/SSVOpenHexagon/Global/Assets.cpp b/src/SSVOpenHexagon/Global/Assets.cpp index 771d03ad..c003239e 100644 --- a/src/SSVOpenHexagon/Global/Assets.cpp +++ b/src/SSVOpenHexagon/Global/Assets.cpp @@ -482,9 +482,8 @@ HGAssets::getSelectablePackInfos() const noexcept } // Empty check - const auto packArray = - ssvuj::getExtr<std::vector<std::string>>( - cacheObject, "cachedPacks"); + const auto packArray = ssvuj::getExtr<std::vector<std::string>>( + cacheObject, "cachedPacks"); if(packArray.size() <= 0) { |