V1.4.0

.clang-format

@@ -0,0 +1,21 @@
+---
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignEscapedNewlines: Left
+AlignOperands: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortLambdasOnASingleLine: Inline
+BraceWrapping:
+  AfterCaseLabel: true
+  IndentBraces: true
+BreakBeforeBraces: Allman
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 300
+IndentWidth: 4
+PenaltyBreakFirstLessLess: 300
+PointerAlignment: Left
+SortIncludes: Never
+SpaceBeforeParensOptions:
+  AfterControlStatements: false

.github/workflows/linux.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Setup xmake
       uses: xmake-io/github-action-setup-xmake@v1
       with:
-        xmake-version: '2.6.5'
+        xmake-version: '2.7.6'
 
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository

.github/workflows/windows.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Setup xmake
       uses: xmake-io/github-action-setup-xmake@v1
       with:
-        xmake-version: '2.6.5'
+        xmake-version: '2.7.6'
 
     # Install node
     #- name: Setup nodejs

.gitignore

@@ -9,6 +9,7 @@ vsxmake2022
 .xmake
 vs2019
 
+build
 Build
 Build/*.log
 Build/*.torrent

Code/TestMain.cpp

@@ -1,5 +1,6 @@
-        #include <gtest/gtest.h>
-        int main(int argc, char** argv) {
-            ::testing::InitGoogleTest(&argc, argv);
-            return RUN_ALL_TESTS();
-        }
+#include <gtest/gtest.h>
+int main(int argc, char** argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}

Code/admin/AdminApp.cpp

@@ -6,9 +6,7 @@
 #include <Magnum/GL/Renderer.h>
 
 AdminApp::AdminApp(const Arguments& arguments)
-    : Platform::Application{
-          arguments,
-          Configuration{}.setTitle("TiltedOnline Server Admin").setWindowFlags(Configuration::WindowFlag::Resizable)}
+    : Platform::Application{arguments, Configuration{}.setTitle("TiltedOnline Server Admin").setWindowFlags(Configuration::WindowFlag::Resizable)}
 {
     m_password.resize(1024);
     m_imgui = ImGuiIntegration::Context(Vector2{windowSize()} / dpiScaling(), windowSize(), framebufferSize());
@@ -17,13 +15,14 @@ AdminApp::AdminApp(const Arguments& arguments)
        you'll need this exact behavior for the rest of your scene. If not, set
        this only for the drawFrame() call. */
     GL::Renderer::setBlendEquation(GL::Renderer::BlendEquation::Add, GL::Renderer::BlendEquation::Add);
-    GL::Renderer::setBlendFunction(GL::Renderer::BlendFunction::SourceAlpha,
-                                   GL::Renderer::BlendFunction::OneMinusSourceAlpha);
+    GL::Renderer::setBlendFunction(GL::Renderer::BlendFunction::SourceAlpha, GL::Renderer::BlendFunction::OneMinusSourceAlpha);
 
-    auto handlerGenerator = [this](auto& x) {
+    auto handlerGenerator = [this](auto& x)
+    {
         using T = typename std::remove_reference_t<decltype(x)>::Type;
 
-        m_messageHandlers[T::Opcode] = [this](UniquePtr<ServerAdminMessage>& apMessage) {
+        m_messageHandlers[T::Opcode] = [this](UniquePtr<ServerAdminMessage>& apMessage)
+        {
             const auto pRealMessage = TiltedPhoques::CastUnique<T>(std::move(apMessage));
             HandleMessage(*pRealMessage);
         };
@@ -58,10 +57,7 @@ void AdminApp::drawEvent()
     {
         ImGui::SetNextWindowSize(ImVec2(600, 150));
         ImGui::SetNextWindowPos(ImVec2(windowSize().x() / 2, 200), 0, ImVec2(0.5f, 0.f));
-        ImGui::Begin("Online", nullptr,
-                     ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove |
-                         ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar |
-                         ImGuiWindowFlags_MenuBar);
+        ImGui::Begin("Online", nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_MenuBar);
 
         if (m_state == ConnectionState::kConnecting)
             ImGui::Text("Please wait...");
@@ -166,9 +162,7 @@ void AdminApp::textInputEvent(TextInputEvent& event)
         return;
 }
 
-
 void AdminApp::drawServerUi()
 {
     m_overlay.Update(*this);
 }
-

Code/admin/AdminApp.h

@@ -48,7 +48,6 @@ struct AdminApp : Platform::Application, TiltedPhoques::Client
     void SendShutdownRequest();
 
 protected:
-
     void drawServerUi();
 
     bool Send(const ClientAdminMessage& acMessage) const noexcept;

Code/admin/Overlay.h

@@ -17,7 +17,7 @@ struct Overlay
 
     void Update(AdminApp& aApp);
 
-  private:
+private:
     void SetActiveWidget(WidgetID aNewActive);
 
     WidgetID Toolbar();

Code/admin/Transport.cpp

@@ -49,10 +49,7 @@ bool AdminApp::Send(const ClientAdminMessage& acMessage) const noexcept
 
     struct ScopedReset
     {
-        ~ScopedReset()
-        {
-            s_allocator.Reset();
-        }
+        ~ScopedReset() { s_allocator.Reset(); }
     } allocatorGuard;
 
     if (IsConnected())
@@ -80,10 +77,7 @@ bool AdminApp::Send(const ClientMessage& acMessage) const noexcept
 
     struct ScopedReset
     {
-        ~ScopedReset()
-        {
-            s_allocator.Reset();
-        }
+        ~ScopedReset() { s_allocator.Reset(); }
     } allocatorGuard;
 
     if (IsConnected())
@@ -105,7 +99,6 @@ bool AdminApp::Send(const ClientMessage& acMessage) const noexcept
     return false;
 }
 
-
 void AdminApp::SendShutdownRequest()
 {
     AdminShutdownRequest request;

Code/admin/Widgets/Admin.h

@@ -12,5 +12,4 @@ struct Admin : Widget
     void Update(AdminApp& aApp) override;
 
 private:
-
 };

Code/admin/Widgets/Console.cpp

@@ -65,13 +65,13 @@ void Console::Update(AdminApp& aApp)
 
     auto& style = ImGui::GetStyle();
     auto inputLineHeight = ImGui::GetTextLineHeight() + style.ItemInnerSpacing.y * 2;
-    
+
     if (ImGui::ListBoxHeader("##ConsoleHeader", ImVec2(-1, -(inputLineHeight + style.ItemSpacing.y))))
     {
         ImGuiListClipper clipper;
         clipper.Begin(m_outputLines.size());
         while (clipper.Step())
-            for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) 
+            for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i)
             {
                 auto& item = m_outputLines[i];
                 ImGui::PushID(i);
@@ -93,25 +93,24 @@ void Console::Update(AdminApp& aApp)
                 ImGui::SetScrollHereY();
             m_outputScroll = false;
         }
-        
+
         ImGui::ListBoxFooter();
     }
-    
+
     if (m_focusConsoleInput)
     {
         ImGui::SetKeyboardFocusHere();
         m_focusConsoleInput = false;
     }
     ImGui::SetNextItemWidth(-FLT_MIN);
-    const auto execute = ImGui::InputText("##InputCommand", m_Command, std::size(m_Command),
-                                          ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackHistory,  &HandleConsoleHistory, this);
+    const auto execute = ImGui::InputText("##InputCommand", m_Command, std::size(m_Command), ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackHistory, &HandleConsoleHistory, this);
     ImGui::SetItemDefaultFocus();
     if (execute)
     {
         m_consoleHistoryIndex = m_consoleHistory.size();
         m_consoleHistory.push_back(m_Command);
         m_newConsoleHistory = true;
-        
+
         if (m_inputClear)
         {
             std::memset(m_Command, 0, sizeof(m_Command));
@@ -135,7 +134,7 @@ void Console::Log(const TiltedPhoques::String& acpText)
         }
 
         if (first != second)
-            m_outputLines.emplace_back(acpText.substr(first, second-first));
+            m_outputLines.emplace_back(acpText.substr(first, second - first));
 
         first = second + 1;
     }

Code/admin/Widgets/Console.h

@@ -19,17 +19,16 @@ struct Console : Widget
     bool GameLogEnabled() const;
 
 private:
-
     static int HandleConsoleHistory(ImGuiInputTextCallbackData* apData);
 
-    TiltedPhoques::Vector<TiltedPhoques::String> m_outputLines{ };
+    TiltedPhoques::Vector<TiltedPhoques::String> m_outputLines{};
     TiltedPhoques::Vector<TiltedPhoques::String> m_consoleHistory{};
-    int64_t m_consoleHistoryIndex{ 0 };
+    int64_t m_consoleHistoryIndex{0};
     bool m_newConsoleHistory{true};
-    bool m_outputShouldScroll{ true };
-    bool m_outputScroll{ false };
-    bool m_inputClear{ true };
-    bool m_disabledGameLog{ true };
-    bool m_focusConsoleInput{ false };
-    char m_Command[0x10000]{ 0 };
+    bool m_outputShouldScroll{true};
+    bool m_outputScroll{false};
+    bool m_inputClear{true};
+    bool m_disabledGameLog{true};
+    bool m_focusConsoleInput{false};
+    char m_Command[0x10000]{0};
 };

Code/admin_protocol/AdminMessages/AdminSessionOpen.cpp

@@ -1,6 +1,5 @@
 #include "AdminSessionOpen.h"
 
-
 void AdminSessionOpen::SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept
 {
 }

Code/admin_protocol/AdminMessages/AdminSessionOpen.h

@@ -6,7 +6,8 @@ struct AdminSessionOpen : ServerAdminMessage
 {
     static constexpr ServerAdminOpcode Opcode = kAdminSessionOpen;
 
-    AdminSessionOpen() : ServerAdminMessage(Opcode)
+    AdminSessionOpen()
+        : ServerAdminMessage(Opcode)
     {
     }
 
@@ -15,9 +16,5 @@ struct AdminSessionOpen : ServerAdminMessage
     void SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept override;
     void DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept override;
 
-    bool operator==(const AdminSessionOpen& achRhs) const noexcept
-    {
-        return GetOpcode() == achRhs.GetOpcode();
-    }
-
+    bool operator==(const AdminSessionOpen& achRhs) const noexcept { return GetOpcode() == achRhs.GetOpcode(); }
 };

Code/admin_protocol/AdminMessages/AdminShutdownRequest.cpp

@@ -1,6 +1,5 @@
 #include "AdminShutdownRequest.h"
 
-
 void AdminShutdownRequest::SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept
 {
 }

Code/admin_protocol/AdminMessages/AdminShutdownRequest.h

@@ -6,7 +6,8 @@ struct AdminShutdownRequest : ClientAdminMessage
 {
     static constexpr ClientAdminOpcode Opcode = kAdminShutdown;
 
-    AdminShutdownRequest() : ClientAdminMessage(Opcode)
+    AdminShutdownRequest()
+        : ClientAdminMessage(Opcode)
     {
     }
 
@@ -15,9 +16,5 @@ struct AdminShutdownRequest : ClientAdminMessage
     void SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept override;
     void DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept override;
 
-    bool operator==(const AdminShutdownRequest& achRhs) const noexcept
-    {
-        return GetOpcode() == achRhs.GetOpcode();
-    }
-
+    bool operator==(const AdminShutdownRequest& achRhs) const noexcept { return GetOpcode() == achRhs.GetOpcode(); }
 };

Code/admin_protocol/AdminMessages/ClientAdminMessageFactory.cpp

@@ -4,19 +4,20 @@
 #include <TiltedCore/Allocator.hpp>
 #include "ClientAdminMessageFactory.h"
 
-static std::function<UniquePtr<ClientAdminMessage>(TiltedPhoques::Buffer::Reader& aReader)>
-    s_clientAdminMessageExtractor[kClientAdminOpcodeMax];
+static std::function<UniquePtr<ClientAdminMessage>(TiltedPhoques::Buffer::Reader& aReader)> s_clientAdminMessageExtractor[kClientAdminOpcodeMax];
 
 namespace details
 {
 static struct ClientAdminMessageFactoryInit
 {
     ClientAdminMessageFactoryInit()
     {
-        auto extractor = [](auto& x) {
+        auto extractor = [](auto& x)
+        {
             using T = typename std::remove_reference_t<decltype(x)>::Type;
 
-            s_clientAdminMessageExtractor[T::Opcode] = [](TiltedPhoques::Buffer::Reader& aReader) {
+            s_clientAdminMessageExtractor[T::Opcode] = [](TiltedPhoques::Buffer::Reader& aReader)
+            {
                 auto ptr = TiltedPhoques::MakeUnique<T>();
                 ptr->DeserializeRaw(aReader);
                 return TiltedPhoques::CastUnique<ClientAdminMessage>(std::move(ptr));

Code/admin_protocol/AdminMessages/Message.cpp

@@ -59,6 +59,3 @@ void ServerAdminMessage::SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) co
 void ServerAdminMessage::SerializeDifferential(TiltedPhoques::Buffer::Writer& aWriter) const noexcept
 {
 }
-
-
-

Code/admin_protocol/AdminMessages/Message.h

@@ -5,14 +5,15 @@
 #include <TiltedCore/Stl.hpp>
 #include <TiltedCore/Serialization.hpp>
 
-using TiltedPhoques::String;
 using TiltedPhoques::Serialization;
+using TiltedPhoques::String;
 
 struct ClientAdminMessage : TiltedPhoques::AllocatorCompatible
 {
     ClientAdminMessage(ClientAdminOpcode aOpcode)
         : m_opcode(aOpcode)
-    {}
+    {
+    }
 
     virtual ~ClientAdminMessage() = default;
 
@@ -21,7 +22,7 @@ struct ClientAdminMessage : TiltedPhoques::AllocatorCompatible
     virtual void SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept;
     // Serialize values that are dependent on previous states
     virtual void SerializeDifferential(TiltedPhoques::Buffer::Writer& aWriter) const noexcept;
-    // Deserialize values that are dependent on previous states, this function will already be called 
+    // Deserialize values that are dependent on previous states, this function will already be called
     virtual void DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept;
     virtual void DeserializeDifferential(TiltedPhoques::Buffer::Reader& aReader) noexcept;
 
@@ -35,7 +36,8 @@ struct ServerAdminMessage : TiltedPhoques::AllocatorCompatible
 {
     ServerAdminMessage(ServerAdminOpcode aOpcode)
         : m_opcode(aOpcode)
-    {}
+    {
+    }
 
     virtual ~ServerAdminMessage() = default;