Skip to content

Commit

Permalink
Merge pull request #106 from MafiaHub/reformat-code
Browse files Browse the repository at this point in the history 
reformat code
  • Loading branch information
@Segfaultd
Segfaultd committed Feb 1, 2024
2 parents 8219bbb + 5cd276a commit f089d2a
Show file tree
Hide file tree
Showing 116 changed files with 1,015 additions and 752 deletions.
2 changes: 2 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Empty
AllowShortEnumsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: Empty
AllowShortLoopsOnASingleLine: true
Expand All @@ -36,6 +37,7 @@ BraceWrapping:
BeforeLambdaBody: false
IndentBraces: false
BreakConstructorInitializers: BeforeComma
BreakStringLiterals: false
BreakInheritanceList: BeforeComma
ColumnLimit: 280
CommentPragmas: "NOTE:"
Expand Down
5 changes: 5 additions & 0 deletions Folder.DotSettings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Copy_0020of_0020Built_002Din_003A_0020Reformat_0020_0026_0020Apply_0020Syntax_0020Style/@EntryIndexedValue"></s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Copy_0020of_0020Built_002Din_003A_0020Reformat_0020_0026_0020Apply_0020Syntax_0020Style/@EntryIndexRemoved">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Framework/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Framework"&gt;&lt;CppCodeStyleCleanupDescriptor ArrangeBraces="True" ArrangeAuto="True" ArrangeFunctionDeclarations="True" ArrangeNestedNamespaces="True" ArrangeTypeAliases="True" ArrangeCVQualifiers="True" ArrangeSlashesInIncludeDirectives="True" ArrangeOverridingFunctions="True" SortIncludeDirectives="True" SortMemberInitializers="True" /&gt;&lt;CppReformatCode&gt;True&lt;/CppReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;Xaml.RedundantFreezeAttribute&gt;True&lt;/Xaml.RedundantFreezeAttribute&gt;&lt;Xaml.RemoveRedundantModifiersAttribute&gt;True&lt;/Xaml.RemoveRedundantModifiersAttribute&gt;&lt;Xaml.RemoveRedundantNameAttribute&gt;True&lt;/Xaml.RemoveRedundantNameAttribute&gt;&lt;Xaml.RemoveRedundantResource&gt;True&lt;/Xaml.RemoveRedundantResource&gt;&lt;Xaml.RemoveRedundantCollectionProperty&gt;True&lt;/Xaml.RemoveRedundantCollectionProperty&gt;&lt;Xaml.RemoveRedundantAttachedPropertySetter&gt;True&lt;/Xaml.RemoveRedundantAttachedPropertySetter&gt;&lt;Xaml.RemoveRedundantStyledValue&gt;True&lt;/Xaml.RemoveRedundantStyledValue&gt;&lt;Xaml.RemoveRedundantNamespaceAlias&gt;True&lt;/Xaml.RemoveRedundantNamespaceAlias&gt;&lt;Xaml.RemoveForbiddenResourceName&gt;True&lt;/Xaml.RemoveForbiddenResourceName&gt;&lt;Xaml.RemoveRedundantGridDefinitionsAttribute&gt;True&lt;/Xaml.RemoveRedundantGridDefinitionsAttribute&gt;&lt;Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;True&lt;/Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;&lt;Xaml.RemoveRedundantBindingModeAttribute&gt;True&lt;/Xaml.RemoveRedundantBindingModeAttribute&gt;&lt;Xaml.RemoveRedundantGridSpanAttribut&gt;True&lt;/Xaml.RemoveRedundantGridSpanAttribut&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CppMakeLocalVarConstDescriptor&gt;True&lt;/CppMakeLocalVarConstDescriptor&gt;&lt;CppMakeMethodConst&gt;True&lt;/CppMakeMethodConst&gt;&lt;CppUseEraseAlgorithmDescriptor&gt;True&lt;/CppUseEraseAlgorithmDescriptor&gt;&lt;CppSimplifyConditionalExpressionDescriptor&gt;True&lt;/CppSimplifyConditionalExpressionDescriptor&gt;&lt;CppRemoveRedundantConditionalExpressionDescriptor&gt;True&lt;/CppRemoveRedundantConditionalExpressionDescriptor&gt;&lt;CppMakeVariableConstexpr&gt;True&lt;/CppMakeVariableConstexpr&gt;&lt;CppRemoveCastDescriptor&gt;True&lt;/CppRemoveCastDescriptor&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Framework</s:String></wpf:ResourceDictionary>
20 changes: 10 additions & 10 deletions code/framework/src/core_modules.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ namespace Framework {
}

// Singleton setters
static void SetNetworkPeer(Framework::Networking::NetworkPeer *peer) {
static void SetNetworkPeer(Networking::NetworkPeer *peer) {
_networkPeer = peer;
}

static void SetWorldEngine(Framework::World::Engine *engine) {
static void SetWorldEngine(World::Engine *engine) {
_engine = engine;
}

static void SetScriptingModule(Framework::Scripting::Module *module) {
static void SetScriptingModule(Scripting::Module *module) {
_scriptingModule = module;
}

Expand All @@ -53,15 +53,15 @@ namespace Framework {
}

// Singleton getters
static Framework::Networking::NetworkPeer *GetNetworkPeer() {
static Networking::NetworkPeer *GetNetworkPeer() {
return _networkPeer;
}

static Framework::World::Engine *GetWorldEngine() {
static World::Engine *GetWorldEngine() {
return _engine;
}

static Framework::Scripting::Module *GetScriptingModule() {
static Scripting::Module *GetScriptingModule() {
return _scriptingModule;
}

Expand All @@ -70,9 +70,9 @@ namespace Framework {
}

private:
static inline Framework::Networking::NetworkPeer *_networkPeer {};
static inline Framework::World::Engine *_engine {};
static inline Framework::Scripting::Module *_scriptingModule {};
static inline double _tickRate { 1000 / 60.0f };
static inline Networking::NetworkPeer *_networkPeer {};
static inline World::Engine *_engine {};
static inline Scripting::Module *_scriptingModule {};
static inline double _tickRate {1000 / 60.0f};
};
}; // namespace Framework
8 changes: 6 additions & 2 deletions code/framework/src/external/discord/errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
#pragma once

namespace Framework::External {
enum class DiscordError { DISCORD_NONE, DISCORD_CORE_CREATE_FAILED, DISCORD_CORE_NULL_INSTANCE };
}
enum class DiscordError {
DISCORD_NONE,
DISCORD_CORE_CREATE_FAILED,
DISCORD_CORE_NULL_INSTANCE
};
} // namespace Framework::External
25 changes: 13 additions & 12 deletions code/framework/src/external/discord/wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace Framework::External::Discord {
DiscordError Wrapper::Init(int64_t id) {
auto result = discord::Core::Create(id, DiscordCreateFlags_NoRequireDiscord, &_instance);
const auto result = discord::Core::Create(id, DiscordCreateFlags_NoRequireDiscord, &_instance);
if (result != discord::Result::Ok) {
return DiscordError::DISCORD_CORE_CREATE_FAILED;
}
Expand All @@ -37,7 +37,7 @@ namespace Framework::External::Discord {
return DiscordError::DISCORD_NONE;
}

DiscordError Wrapper::Update() {
DiscordError Wrapper::Update() const {
if (!_instance) {
return DiscordError::DISCORD_CORE_NULL_INSTANCE;
}
Expand All @@ -46,7 +46,7 @@ namespace Framework::External::Discord {
return DiscordError::DISCORD_NONE;
}

DiscordError Wrapper::SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity, const std::string &largeImage, const std::string &largeText, const std::string &smallImage, const std::string &smallText) {
DiscordError Wrapper::SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity, const std::string &largeImage, const std::string &largeText, const std::string &smallImage, const std::string &smallText) const {
if (!_instance) {
return DiscordError::DISCORD_CORE_NULL_INSTANCE;
}
Expand All @@ -69,11 +69,12 @@ namespace Framework::External::Discord {

return DiscordError::DISCORD_NONE;
}
DiscordError Wrapper::SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity) {

DiscordError Wrapper::SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity) const {
return SetPresence(state, details, activity, "logo-large", "MafiaHub", "logo-small", "MafiaHub");
}

void Wrapper::SignInWithDiscord(const DiscordLoginProc &proc) {
void Wrapper::SignInWithDiscord(const DiscordLoginProc &proc) const {
_instance->ApplicationManager().GetOAuth2Token([proc](discord::Result result, const discord::OAuth2Token &tokenData) {
if (result == discord::Result::Ok) {
proc(tokenData.GetAccessToken());
Expand All @@ -83,31 +84,31 @@ namespace Framework::External::Discord {
});
}

discord::UserManager &Wrapper::GetUserManager() {
discord::UserManager &Wrapper::GetUserManager() const {
return _instance->UserManager();
}

discord::ActivityManager &Wrapper::GetActivityManager() {
discord::ActivityManager &Wrapper::GetActivityManager() const {
return _instance->ActivityManager();
}

discord::ImageManager &Wrapper::GetImageManager() {
discord::ImageManager &Wrapper::GetImageManager() const {
return _instance->ImageManager();
}

discord::OverlayManager &Wrapper::GetOverlayManager() {
discord::OverlayManager &Wrapper::GetOverlayManager() const {
return _instance->OverlayManager();
}

discord::ApplicationManager &Wrapper::GetApplicationManager() {
discord::ApplicationManager &Wrapper::GetApplicationManager() const {
return _instance->ApplicationManager();
}

discord::VoiceManager &Wrapper::GetVoiceManager() {
discord::VoiceManager &Wrapper::GetVoiceManager() const {
return _instance->VoiceManager();
}

discord::RelationshipManager &Wrapper::GetRelationshipManager() {
discord::RelationshipManager &Wrapper::GetRelationshipManager() const {
return _instance->RelationshipManager();
}
} // namespace Framework::External::Discord
26 changes: 13 additions & 13 deletions code/framework/src/external/discord/wrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ namespace Framework::External::Discord {
return _initialized;
}

DiscordError Update();
DiscordError SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity, const std::string &largeImage, const std::string &largeText, const std::string &smallImage, const std::string &smallText);
DiscordError SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity);

void SignInWithDiscord(const DiscordLoginProc &proc);

discord::ActivityManager &GetActivityManager();
discord::UserManager &GetUserManager();
discord::ImageManager &GetImageManager();
discord::OverlayManager &GetOverlayManager();
discord::ApplicationManager &GetApplicationManager();
discord::VoiceManager &GetVoiceManager();
discord::RelationshipManager &GetRelationshipManager();
DiscordError Update() const;
DiscordError SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity, const std::string &largeImage, const std::string &largeText, const std::string &smallImage, const std::string &smallText) const;
DiscordError SetPresence(const std::string &state, const std::string &details, discord::ActivityType activity) const;

void SignInWithDiscord(const DiscordLoginProc &proc) const;

discord::ActivityManager &GetActivityManager() const;
discord::UserManager &GetUserManager() const;
discord::ImageManager &GetImageManager() const;
discord::OverlayManager &GetOverlayManager() const;
discord::ApplicationManager &GetApplicationManager() const;
discord::VoiceManager &GetVoiceManager() const;
discord::RelationshipManager &GetRelationshipManager() const;
};
} // namespace Framework::External::Discord
8 changes: 6 additions & 2 deletions code/framework/src/external/firebase/errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
#pragma once

namespace Framework::External::Firebase {
enum class FirebaseError { FIREBASE_NONE, FIREBASE_INITIALIZE_FAILED, FIREBASE_AUTH_FAILED };
}
enum class FirebaseError {
FIREBASE_NONE,
FIREBASE_INITIALIZE_FAILED,
FIREBASE_AUTH_FAILED
};
} // namespace Framework::External::Firebase
42 changes: 17 additions & 25 deletions code/framework/src/external/firebase/wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,55 +55,47 @@ namespace Framework::External::Firebase {
}

FirebaseError Wrapper::SignInWithCustomToken(const std::string &token) const {
auto auth = GetAuth();
firebase::Future<firebase::auth::User *> result = auth->SignInWithCustomToken(token.c_str());
while (result.status() != firebase::kFutureStatusComplete) {};
const auto auth = GetAuth();
const firebase::Future<firebase::auth::User *> result = auth->SignInWithCustomToken(token.c_str());
while (result.status() != firebase::kFutureStatusComplete) {}
if (result.error() == firebase::auth::kAuthErrorNone) {
return FirebaseError::FIREBASE_NONE;
}
else {
return FirebaseError::FIREBASE_AUTH_FAILED;
}
return FirebaseError::FIREBASE_AUTH_FAILED;
}

FirebaseError Wrapper::SignInWithEmailPassword(const std::string &email, const std::string &password) const {
auto auth = GetAuth();
firebase::Future<firebase::auth::User *> result = auth->SignInWithEmailAndPassword(email.c_str(), password.c_str());
while (result.status() != firebase::kFutureStatusComplete) {};
const auto auth = GetAuth();
const firebase::Future<firebase::auth::User *> result = auth->SignInWithEmailAndPassword(email.c_str(), password.c_str());
while (result.status() != firebase::kFutureStatusComplete) {}
if (result.error() == firebase::auth::kAuthErrorNone) {
return FirebaseError::FIREBASE_NONE;
}
else {
return FirebaseError::FIREBASE_AUTH_FAILED;
}
return FirebaseError::FIREBASE_AUTH_FAILED;
}

FirebaseError Wrapper::SignUpWithEmailPassword(const std::string &email, const std::string &password) const {
auto auth = GetAuth();
firebase::Future<firebase::auth::User *> result = auth->CreateUserWithEmailAndPassword(email.c_str(), password.c_str());
while (result.status() != firebase::kFutureStatusComplete) {};
const auto auth = GetAuth();
const firebase::Future<firebase::auth::User *> result = auth->CreateUserWithEmailAndPassword(email.c_str(), password.c_str());
while (result.status() != firebase::kFutureStatusComplete) {}
if (result.error() == firebase::auth::kAuthErrorNone) {
return FirebaseError::FIREBASE_NONE;
}
else {
return FirebaseError::FIREBASE_AUTH_FAILED;
}
return FirebaseError::FIREBASE_AUTH_FAILED;
}

FirebaseError Wrapper::SignInAnonymously() const {
auto auth = GetAuth();
firebase::Future<firebase::auth::User *> result = auth->SignInAnonymously();
while (result.status() != firebase::kFutureStatusComplete) {};
const auto auth = GetAuth();
const firebase::Future<firebase::auth::User *> result = auth->SignInAnonymously();
while (result.status() != firebase::kFutureStatusComplete) {}
if (result.error() == firebase::auth::kAuthErrorNone) {
return FirebaseError::FIREBASE_NONE;
}
else {
return FirebaseError::FIREBASE_AUTH_FAILED;
}
return FirebaseError::FIREBASE_AUTH_FAILED;
}

FirebaseError Wrapper::SignOut() const {
auto auth = GetAuth();
const auto auth = GetAuth();
auth->SignOut();
return FirebaseError::FIREBASE_NONE;
}
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/external/firebase/wrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace Framework::External::Firebase {
return _user;
}

firebase::App *GetApp() {
firebase::App *GetApp() const {
return _app;
}
};
Expand Down
11 changes: 9 additions & 2 deletions code/framework/src/external/imgui/errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,12 @@
#pragma once

namespace Framework::External::ImGUI {
enum class Error { IMGUI_NONE, IMGUI_NOT_INITIALIZED, IMGUI_RENDERER_NOT_SET, IMGUI_WINDOW_NOT_SET, IMGUI_BACKEND_MISMATCH, IMGUI_GENERIC_ERROR };
}
enum class Error {
IMGUI_NONE,
IMGUI_NOT_INITIALIZED,
IMGUI_RENDERER_NOT_SET,
IMGUI_WINDOW_NOT_SET,
IMGUI_BACKEND_MISMATCH,
IMGUI_GENERIC_ERROR
};
} // namespace Framework::External::ImGUI
2 changes: 1 addition & 1 deletion code/framework/src/external/imgui/helpers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
namespace Framework::External::ImGUI {
template <typename F>
auto getCallback(F f) {
return [](typename Framework::Utils::function_traits<F>::template arg_t<0> data) {
return [](typename Utils::function_traits<F>::template arg_t<0> data) {
auto &f = *static_cast<F *>(data->UserData);
return f(data);
};
Expand Down
16 changes: 8 additions & 8 deletions code/framework/src/external/imgui/widgets/console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <sstream>

namespace Framework::External::ImGUI::Widgets {
Console::Console(std::shared_ptr<Framework::Utils::CommandProcessor> commandProcessor, std::shared_ptr<Framework::Input::IInput> input): _commandProcessor(commandProcessor), _input(input), _logger(Framework::Logging::GetLogger("Console").get()) {}
Console::Console(std::shared_ptr<Utils::CommandProcessor> commandProcessor, std::shared_ptr<Input::IInput> input): _commandProcessor(commandProcessor), _input(input), _logger(Logging::GetLogger("Console").get()) {}

void Console::Toggle() {
if (_isOpen)
Expand Down Expand Up @@ -57,7 +57,7 @@ namespace Framework::External::ImGUI::Widgets {
}
}

auto ringBuffer = Framework::Logging::GetInstance()->GetRingBuffer();
auto ringBuffer = Logging::GetInstance()->GetRingBuffer();

if (_consoleControl) {
ImVec4 *colors = ImGui::GetStyle().Colors;
Expand Down Expand Up @@ -311,23 +311,23 @@ namespace Framework::External::ImGUI::Widgets {
return true;
}

void Console::SendCommand(const std::string &command) {
void Console::SendCommand(const std::string &command) const {
const auto result = _commandProcessor->ProcessCommand(command);

switch (result.GetError()) {
case Framework::Utils::CommandProcessorError::ERROR_NONE_PRINT_HELP: {
case Utils::CommandProcessorError::ERROR_NONE_PRINT_HELP: {
_logger->info("{}", result.Unwrap());
} break;
case Framework::Utils::CommandProcessorError::ERROR_CMD_ALREADY_EXISTS: {
case Utils::CommandProcessorError::ERROR_CMD_ALREADY_EXISTS: {
_logger->warn("Command already exists: {}", result.Unwrap());
} break;
case Framework::Utils::CommandProcessorError::ERROR_CMD_UNSPECIFIED_NAME: {
case Utils::CommandProcessorError::ERROR_CMD_UNSPECIFIED_NAME: {
_logger->warn("Command name was unspecified");
} break;
case Framework::Utils::CommandProcessorError::ERROR_CMD_UNKNOWN: {
case Utils::CommandProcessorError::ERROR_CMD_UNKNOWN: {
_logger->warn("Command not found: {}", result.Unwrap());
} break;
case Framework::Utils::CommandProcessorError::ERROR_INTERNAL: {
case Utils::CommandProcessorError::ERROR_INTERNAL: {
_logger->warn("Input error: {}", result.Unwrap());
} break;

Expand Down

0 comments on commit f089d2a

Please sign in to comment.