v1.1.0

v1.1.0

Author: maelbecel

.github/workflows/autorelease.yml

@@ -62,10 +62,17 @@ jobs:
       shell: sh
 
 
+    - name: Get commit message
+      id: get_commit_message
+      run: |
+        commit_message=$(curl --location --request GET 'https://api.github.com/repos/$GITHUB_REPOSITORY/commits/${{ github.sha }}' \
+        --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | jq -r ".commit.message")
+        echo "::set-output name=commit_message::$commit_message"
+
     - name: Release pushed tag
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ github.ref_name }}
+        tag: ${{ steps.get_commit_message.outputs.commit_message }}
       run: |
         gh release create "$tag" \
             --repo="$GITHUB_REPOSITORY" \

.github/workflows/linter.yml

@@ -2,24 +2,23 @@ name: ClangFormat Linter
 
 on:
   push:
-    branches:
+    branches-ignore:
       - dev
       - client
       - server
       - game-engine
-      - fix/CICD
-  pull_request:
-    branches:
-      - dev
-      - client
-      - server
-      - game-engine
-      - fix/CICD
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: "Check if on a branch"
+      run: |
+        if [[ "${{ github.ref }}" != refs/heads/* ]]; then
+          echo "Not on a branch, skipping job."
+          exit 78
+        fi
     - uses: actions/checkout@v2
     - name: "Install clang-format"
       run: sudo apt-get install -y clang-format

.gitignore

@@ -41,8 +41,7 @@ bin*
 ExodiaProfile-*.json
 
 # Binaries for programs and plugins
-r-type_client
-r-type_server
+r-type_*
 exodia
 
 # ImGui
@@ -55,6 +54,9 @@ vgcore.*
 .idea/
 .vscode/
 
-#Windows
+# Windows
 Release/
-Debug/Assets/
+Debug/Assets/
+
+# R-Type
+.rtype

3rd-party/Vcpkg

@@ -0,0 +1 @@
+Subproject commit 72010900b7cee36cea77aebb97695095c9358eaf

Assets/AssetRegistry.asset

@@ -137,9 +137,21 @@ AssetRegistry:
   - Handle: 124013371145915
     Path: Sound/Music/BattleTheme.wav
     Type: AssetType::Sound2D
+  - Handle: 45121874124124
+    Path: Font/R-Type/Classic.png
+    Type: AssetType::Font
+  - Handle: 4521854574125
+    Path: Font/R-Type/ClassicColored.png
+    Type: AssetType::Font
   - Handle: 18375016605620543235
     Path: test.exodia
     Type: AssetType::Scene
   - Handle: 18375012605620
     Path: Textures/Missile.png
+    Type: AssetType::Texture2D
+  - Handle: 183750131800543235
+    Path: Textures/Simple_Explosion.png
+    Type: AssetType::Texture2D
+  - Handle: 1837501318005432356
+    Path: Textures/Explosion.png
     Type: AssetType::Texture2D

Assets/Font/R-Type/Classic.png

@@ -14,6 +14,7 @@ find_package(glad  CONFIG REQUIRED) # glad::glad
     # -- Audio Library ---------------------------------------------------------
 find_package(OpenAL   CONFIG REQUIRED) # OpenAL::OpenAL
 find_package(FreeALUT CONFIG REQUIRED) # FreeALUT::alut
+find_package(Vorbis   CONFIG REQUIRED) # Vorbis::vorbisfile
 
     # -- Serialization Library -------------------------------------------------
 find_package(yaml-cpp CONFIG REQUIRED) # yaml-cpp::yaml-cpp

Assets/Font/R-Type/ClassicColored.png

@@ -66,6 +66,7 @@ target_link_libraries(r-type_client PRIVATE
     yaml-cpp::yaml-cpp
     imguizmo::imguizmo
     FreeALUT::alut
+    Vorbis::vorbisfile
 )
 
 target_include_directories(r-type_client PRIVATE ${Stb_INCLUDE_DIR})

CMake/Dependencies.cmake

@@ -9,8 +9,11 @@
 #include <imgui.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include <sstream>
 
-namespace Exodia {
+using namespace Exodia;
+
+namespace RType {
 
     //////////////////////////////
     // Constructor & Destructor //
@@ -22,35 +25,49 @@ namespace Exodia {
     // Methods //
     /////////////
 
-    void RTypeLayer::OnAttach() {
-        EXODIA_PROFILE_FUNCTION();
+    int RTypeLayer::GetPort() {
 
-        auto commandLine = Application::Get().GetSpecification().CommandLineArgs;
+        ApplicationCommandLineArgs commandLine = Application::Get().GetSpecification().CommandLineArgs;
 
-        // TODO: Temp port ./r-type_client -p {port}
+        // TODO: Temp port ./r-type_client {port}
         int port = 8083; // Default port
         if (commandLine.Count > 1) {
             port = std::stoi(commandLine[1]);
 
             if (port < 1024 || port > 65535) {
                 Application::Get().Close();
-                return;
+                return -1;
             }
         }
+        return port;
+    }
 
+    void RTypeLayer::ConnectToServer(int port) {
         _Network = CreateScope<Network::Network>(_WorldNetwork, _IOContextManager, port);
 
         _Network->Loop();
-        _Network->SendAskConnect("127.0.0.1",
-                                 8082); // TODO: change ip and port when the server is on a different machine
+        _Network->SendAskConnect("127.0.0.1", 8082);
+        // TODO: change ip and port when the server is on a different machine
+    }
+
+    void RTypeLayer::OnAttach() {
+        EXODIA_PROFILE_FUNCTION();
+
+        int port = GetPort();
+
+        if (port == -1)
+            return;
+
+        ConnectToServer(port);
+
         // Create world
         CurrentScene = GAME;
 
-        Scenes[MENU] = CreateRef<Scene>();
-        Scenes[MENU]->RegisterSystem(new AnimationSystem());
-        Scenes[MENU]->RegisterSystem(new MovingSystem(1.5f));
-        Scenes[MENU]->OnViewportResize(Application::Get().GetWindow().GetWidth(),
-                                       Application::Get().GetWindow().GetHeight());
+        // Scenes[MENU] = CreateRef<Scene>();
+        // Scenes[MENU]->RegisterSystem(new AnimationSystem());
+        // Scenes[MENU]->RegisterSystem(new MovingSystem(1.5f));
+        // Scenes[MENU]->OnViewportResize(Application::Get().GetWindow().GetWidth(),
+        //                                Application::Get().GetWindow().GetHeight());
 
         // RType::EntityEventSubscriber *subscribe = new RType::EntityEventSubscriber(_Network);
         CollisionSystem *collisionSystem = new CollisionSystem();
@@ -61,13 +78,27 @@ namespace Exodia {
         Scenes[GAME]->RegisterSystem(collisionSystem);
         // Scenes[GAME]->Subscribe<Events::OnEntityCreated>(subscribe);
         // Scenes[GAME]->Subscribe<Events::OnEntityDestroyed>(subscribe);
-        Scenes[GAME]->Subscribe<Events::OnCollisionEntered>(collisionSystem);
+        Scenes[GAME]->Subscribe<Exodia::Events::OnCollisionEntered>(collisionSystem);
         Scenes[GAME]->OnViewportResize(Application::Get().GetWindow().GetWidth(),
                                        Application::Get().GetWindow().GetHeight());
 
-        Entity *music = Scenes[GAME]->CreateEntity("Background");
+        // Entity *music = Scenes[GAME]->CreateEntity("Background");
+
+        // music->AddComponent<MusicComponent>(124013371145915, 0.5f, true);
 
-        music->AddComponent<MusicComponent>(124013371145915, 0.5f, true);
+        // Entity *text = Scenes[GAME]->CreateEntity("Text");
+
+        // auto txt = text->AddComponent<TextRendererComponent>("\"From   the dark regions of space they\n came...Waging
+        // war upon us.\n One saviour stood his ground while all\n others were crushed under the alien\n assaul t...\n\n
+        // The Prototype Markl .\"");
+
+        // txt.Get().Font = UUID(4521854574125);
+        // txt.Get().Font = UUID(45121874124124);
+
+        // auto transform = text->GetComponent<TransformComponent>();
+
+        // transform.Get().Translation = {-10.0f, 3.0f, 0.0f};
+        // transform.Get().Scale = {0.50f, 0.50f, 1.0f};
 
         _Network->SetWorld(Scenes[CurrentScene]->GetWorldPtr());
 
@@ -76,12 +107,17 @@ namespace Exodia {
         // Create the camera entity
         Entity *cameraEntity = Scenes[GAME]->CreateEntity("Camera");
 
-        auto &camera = cameraEntity->AddComponent<CameraComponent>().Get();
+        CameraComponent &camera = cameraEntity->AddComponent<CameraComponent>().Get();
         cameraEntity->GetComponent<TransformComponent>().Get().Translation = {0.0f, 0.0f, 15.0f};
         camera.Camera.SetProjectionType(SceneCamera::ProjectionType::Perspective);
         camera.Camera.SetViewportSize(Application::Get().GetWindow().GetWidth(),
                                       Application::Get().GetWindow().GetHeight());
 
+        /*RType::EntityEventSubscriber *subscribe = new RType::EntityEventSubscriber(*_Network);
+
+        Scenes[GAME]->Subscribe<Events::OnEntityCreated>(subscribe);
+        Scenes[GAME]->Subscribe<Events::OnEntityDestroyed>(subscribe);*/
+
         /* Removing rigid body for static camera
         auto body_camera = cameraEntity->AddComponent<RigidBody2DComponent>();
         body_camera.Get().Type = RigidBody2DComponent::BodyType::Dynamic;
@@ -91,21 +127,21 @@ namespace Exodia {
         */
 
         // Create the entities
-        // CreatePlayer(Scenes, 0);
+        // TODO: Ask server for playerID
+        // int playerID = 0;
+        // Entity *entity = Scenes[GAME]->CreateEntity("Player_" + std::to_string(playerID));
+        // entity->AddComponent<ScriptComponent>().Get().Bind("Player");
 
         // Create pata-pata
-        // CreatePataPata(Scenes);
-
-        Entity *cameraMenu = Scenes[MENU]->CreateEntity("Camera");
-
-        auto &camera_ = cameraMenu->AddComponent<CameraComponent>().Get();
-        cameraMenu->GetComponent<TransformComponent>().Get().Translation = {0.0f, 0.0f, 15.0f};
-        camera_.Camera.SetProjectionType(SceneCamera::ProjectionType::Perspective);
-        camera_.Camera.SetViewportSize(1600, 900);
-        cameraMenu->AddComponent<RigidBody2DComponent>().Get().Type = RigidBody2DComponent::BodyType::Static;
+        // Entity *patata = Scenes[GAME]->CreateEntity("Pata-pata");
+        // patata->AddComponent<ScriptComponent>().Get().Bind("PataPata");
 
         // Create stars
         // CreateStars(Scenes);
+        for (int i = 0; i < 60; i++) {
+            Entity *star = Scenes[GAME]->CreateEntity("Star" + std::to_string(i));
+            star->AddComponent<ScriptComponent>().Get().Bind("Star");
+        }
 
         // Create the camera
         Scenes[CurrentScene]->OnRuntimeStart();
@@ -147,16 +183,19 @@ namespace Exodia {
 
         Scenes[CurrentScene]->GetWorld().LockMutex();
         Scenes[CurrentScene]->GetWorld().ForEach<ScriptComponent, TagComponent>(
-            [&](Entity *entity, auto script, auto tag) {
-                auto &sc = script.Get();
-                auto &tc = tag.Get();
+            [&](Entity *entity, ComponentHandle<ScriptComponent> script, ComponentHandle<TagComponent> tag) {
+                ScriptComponent &sc = script.Get();
+                TagComponent &tc = tag.Get();
 
-                if ((tc.Tag.compare("Player_" + _Network->id) == 0) && sc.Instance != nullptr) {
-                    sc.Instance->OnKeyPressed(key);
+                std::ostringstream oss;
+                oss << _Network->GetId();
+                std::string player = "Player_" + oss.str();
 
-                    _Network->SendEvent(key, true);
-                }
+                if ((tc.Tag.compare(player) == 0) && sc.Instance != nullptr) {
+                    // sc.Instance->OnKeyPressed(key);
 
+                    _Network->SendEvent(false, key, true);
+                }
                 (void)entity;
             });
         Scenes[CurrentScene]->GetWorld().UnlockMutex();
@@ -165,19 +204,21 @@ namespace Exodia {
     };
 
     bool RTypeLayer::OnKeyReleasedEvent(KeyReleasedEvent &event) {
-
         int key = event.GetKeyCode();
 
         Scenes[CurrentScene]->GetWorld().LockMutex();
         Scenes[CurrentScene]->GetWorld().ForEach<ScriptComponent, TagComponent>(
-            [&](Entity *entity, auto script, auto tag) {
-                auto &sc = script.Get();
-                auto &tc = tag.Get();
+            [&](Entity *entity, ComponentHandle<ScriptComponent> script, ComponentHandle<TagComponent> tag) {
+                ScriptComponent &sc = script.Get();
+                TagComponent &tc = tag.Get();
 
-                if ((tc.Tag.compare("Player_" + _Network->id) == 0) && sc.Instance != nullptr) {
-                    sc.Instance->OnKeyReleased(key);
+                std::ostringstream oss;
+                oss << _Network->GetId();
+                std::string player = "Player_" + oss.str();
 
-                    _Network->SendEvent(key, false);
+                if ((tc.Tag.compare(player) == 0) && sc.Instance != nullptr) {
+                    sc.Instance->OnKeyReleased(key);
+                    _Network->SendEvent(false, key, false);
                 }
 
                 (void)entity;
@@ -193,4 +234,4 @@ namespace Exodia {
 
         return true;
     }
-}; // namespace Exodia
+}; // namespace RType

Client/CMakeLists.txt

@@ -11,7 +11,9 @@
 #include "Exodia.hpp"
 #include "R-Type.hpp"
 
-namespace Exodia {
+using namespace Exodia;
+
+namespace RType {
 
     class RTypeLayer : public Exodia::Layer {
 
@@ -37,6 +39,10 @@ namespace Exodia {
         bool OnKeyPressedEvent(KeyPressedEvent &event);
         bool OnWindowResizeEvent(WindowResizeEvent &event);
 
+      private:
+        int GetPort();
+        void ConnectToServer(int port);
+
         ////////////////
         // Attributes //
         ////////////////
@@ -51,6 +57,6 @@ namespace Exodia {
         Network::IOContextManager _IOContextManager;
         Scope<Network::Network> _Network;
     };
-}; // namespace Exodia
+}; // namespace RType
 
 #endif /* !RTYPELAYER_HPP_ */

Client/src/Layer/RTypeLayer.cpp

@@ -17,7 +17,7 @@ namespace Exodia {
         // Constructor & Destructor //
         //////////////////////////////
       public:
-        RTypeClient(const ApplicationSpecification &spec) : Application(spec) { PushLayer(new RTypeLayer()); }
+        RTypeClient(const ApplicationSpecification &spec) : Application(spec) { PushLayer(new RType::RTypeLayer()); }
 
         ~RTypeClient() = default;
     };

Client/src/Layer/RTypeLayer.hpp

@@ -137,7 +137,7 @@ namespace Exodia {
                 sprite.Get().Texture =
                     SubTexture2D::CreateFromCoords(90123456789012678, {0.0f, 0.0f}, {33.3125f, 36.0f}, {1.0f, 1.0f});
 
-                _network.SendComponentOf(patata, "SpriteRendererComponent");
+                _network.SendComponentOf(false, patata, "SpriteRendererComponent");
             }
             _World->OnUpdateRuntime(timestep);
         } catch (std::exception &e) {