O2Jam combo animation, Fix thread synchronization, Added new modifier, Fixed original o2jam health rules, Fix song background for other supported file and if no image inside o2jam file, Fix Color3 not handled while using Vulkan Render, Make note normal disappear while it pressed

.clang-format

@@ -1,6 +1,6 @@
 Language: Cpp
 BasedOnStyle: LLVM
-UseTab: Never
+UseTab: Always
 IndentWidth: 4
 TabWidth: 4
 BreakBeforeBraces: Custom

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "GameResources"]
-	path = GameResources
-	url = https://github.com/Estrol/O2GameResources
+	path = resources
+	url = https://github.com/AlberttFrgk/O2GameResources

.vscode/launch.json

@@ -4,35 +4,43 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "(Windows) Attach",
-            "type": "cppvsdbg",
-            "request": "attach",
-        },
         {
             "program": "${workspaceFolder}/build/Game/Game",
             "name": "Game - Linux Debug",
             "type": "cppdbg",
             "request": "launch",
             "args": [],
             "cwd": "${workspaceFolder}/build/Game",
+            "preLaunchTask": "cmake-gcc-build"
         },
         {
-            "program": "${workspaceFolder}/build/Game/Debug/Game.exe",
-            "name": "Game - Windows Debug",
-            "type": "cppvsdbg",
+            "program": "${workspaceFolder}/build/Game/Game",
+            "name": "Game - Linux Release",
+            "type": "cppdbg",
             "request": "launch",
             "args": [],
             "cwd": "${workspaceFolder}/build/Game",
+            "preLaunchTask": "cmake-gcc-build"
         },
         {
-            "name": "Game - Compile and Debug",
-            "type": "cppvsdbg",
+            "program": "${workspaceFolder}/build/Game/Debug/Game.exe",
+            "name": "Game - Windows Debug (LLDB)",
+            "type": "lldb",
             "request": "launch",
-            "preLaunchTask": "cmake-msvc-build",
-            "program": "${workspaceFolder}/build/Game/Debug/Game",
+            "args": [],
             "cwd": "${workspaceFolder}/build/Game/Debug",
-            "args": []
+            "console": "integratedTerminal",
+            "preLaunchTask": "cmake-msvc-build"
+        },
+        {
+            "program": "${workspaceFolder}/build/Game/Release/Game.exe",
+            "name": "Game - Windows Release (LLDB)",
+            "type": "lldb",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder}/build/Game/Release",
+            "console": "integratedTerminal",
+            "preLaunchTask": "cmake-msvc-build"
         }
     ]
 }

.vscode/tasks.json

@@ -4,12 +4,22 @@
         {
             "label": "cmake-gcc-build",
             "type": "shell",
-            "command": "cmake --build ${workspaceRoot}/build -- -j 4"
+            "command": "cmake --build ${workspaceRoot}/build -- -j 4",
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared",
+                "focus": true
+            }
         },
         {
             "label": "cmake-msvc-build",
             "type": "shell",
-            "command": "cmake --build ${workspaceRoot}/build"
+            "command": "cmake --build ${workspaceRoot}/build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared",
+                "focus": true
+            }
         }
     ]
 }

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 message("Unnamed O2 Game Clone Project - CMake Build System")
 
 # check if CXX_COMPILER is not cl.exe then set 
@@ -61,11 +61,13 @@ find_package(ZLIB REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(BZip2 REQUIRED)
 find_package(Iconv REQUIRED)
-find_package(Sol2 REQUIRED)
-set(Sol2_LIBRARIES sol2)
+find_package(sol2 CONFIG REQUIRED)
+set(Sol2_LIBRARIES sol2::sol2)
 
 find_package(Lua REQUIRED)
-set(Lua_LIBRARIES lua)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale)
 
 find_package(Vulkan)
 
@@ -87,57 +89,26 @@ include_directories(
     ${Iconv_INCLUDE_DIRS} 
 )
 
-# third-party libraries
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-set(LIB_INDEX 3)
-else()
-set(LIB_INDEX 1)
-endif()
-
-message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE} ${LIB_INDEX}")
-
 if (WIN32)
 	set(THIRD_PARTY_LIBS
-		"${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-windows/${CMAKE_BUILD_TYPE}/bass.lib" 
-		"${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-windows/${CMAKE_BUILD_TYPE}/bass_fx.lib" 
+		"${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-windows/$<CONFIG>/bass.lib" 
+		"${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-windows/$<CONFIG>/bass_fx.lib" 
 	)
 
 elseif (UNIX AND NOT APPLE)
     set(THIRD_PARTY_LIBS 
-        "${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-linux/${CMAKE_BUILD_TYPE}/libbass.so"
-        "${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-linux/${CMAKE_BUILD_TYPE}/libbass_fx.so"
+        "${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-linux/$<CONFIG>/libbass.so"
+        "${PROJECT_SOURCE_DIR}/third-party/lib/${O2GAME_PLATFORM}-linux/$<CONFIG>/libbass_fx.so"
         dl 
         pthread 
         m 
     )
 endif()
 
-# check if FREETYPE_LIBRAIES is a list then check first index if optimized
-if (FREETYPE_LIBRARIES MATCHES ";")
-    list(GET FREETYPE_LIBRARIES ${LIB_INDEX} LIB_FREETYPE)
-else()
-    set(LIB_FREETYPE ${FREETYPE_LIBRARIES})
-endif()
-
-if (JPEG_LIBRARIES MATCHES ";")
-    list(GET JPEG_LIBRARIES ${LIB_INDEX} LIB_JPEG)
-else()
-    set(LIB_JPEG ${JPEG_LIBRARIES})
-endif()
-
-list(GET PNG_LIBRARIES ${LIB_INDEX} LIB_PNG)
-
-if (PNG_LIBRARIES MATCHES ";")
-    list(GET PNG_LIBRARIES ${LIB_INDEX} LIB_PNG)
-else()
-    set(LIB_PNG ${PNG_LIBRARIES})
-endif()
-
-if (BZIP2_LIBRARIES MATCHES ";")
-    list(GET BZIP2_LIBRARIES ${LIB_INDEX} LIB_BZIP2)
-else()
-    set(LIB_BZIP2 ${BZIP2_LIBRARIES})
-endif()
+set(LIB_FREETYPE Freetype::Freetype)
+set(LIB_JPEG JPEG::JPEG)
+set(LIB_PNG PNG::PNG)
+set(LIB_BZIP2 BZip2::BZip2)
 
 if (WIN32)
     set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_WIN32_KHR)
@@ -150,13 +121,14 @@ set(O2GAME_LIBRARIES
     ${SDL2_IMAGE_LIBRARIES} 
     ${SQLite3_LIBRARIES} 
     ${Sol2_LIBRARIES} 
-    ${Lua_LIBRARIES}
+    ${LUA_LIBRARIES}
     ${LIB_FREETYPE} 
     ${LIB_PNG} 
     ${LIB_JPEG} 
     ${LIB_BZIP2} 
     ${THIRD_PARTY_LIBS} 
     ${Iconv_LIBRARIES}
+    PkgConfig::FFMPEG
 )
 
 message("Libraries: ${O2GAME_LIBRARIES}")

CMakePresets.json

@@ -4,7 +4,7 @@
     {
       "name": "windows-base",
       "hidden": true,
-      "generator": "Visual Studio 17 2022",
+      "generator": "Visual Studio 18 2026",
       "binaryDir": "${sourceDir}/build",
       "installDir": "${sourceDir}/build",
       "cacheVariables": {
@@ -14,7 +14,7 @@
       },
       "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
       "toolset": {
-        "value": "host=x64,version=14.29",
+        "value": "host=x64",
         "strategy": "external"
       },
       "condition": {

Engine/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.15)
 
 project(EstEngine VERSION 0.1.0 LANGUAGES C CXX)
 
@@ -99,12 +99,9 @@ add_library(EstEngine
 	"src/Game.cpp"
 )
 
-if (WIN32)
-	set(glslangValidator "$ENV{VULKAN_SDK}/Bin/glslangValidator.exe")
-elseif (UNIX AND NOT APPLE)
-	set(glslangValidator "$ENV{VULKAN_SDK}/Bin/glslangValidator")
-else()
-	message(FATAL_ERROR "Unsupported platform")
+find_program(glslangValidator NAMES glslangValidator PATHS "${CMAKE_SOURCE_DIR}/build/vcpkg_installed/x64-windows/tools/glslang" "$ENV{VULKAN_SDK}/Bin")
+if(NOT glslangValidator)
+	message(FATAL_ERROR "glslangValidator not found! Ensure it is installed via vcpkg or VULKAN_SDK.")
 endif()
 
 execute_process(

Engine/include/Game.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <string>
 #include "Inputs/InputManager.h"
 #include "Overlay.h"
 #include "Rendering/Renderer.h"
@@ -51,6 +52,7 @@ class Game
     virtual void Render(double deltaTime);
     virtual void Input(double deltaTime);
     virtual void Mouse(double deltaTime);
+    virtual void OnDropFile(std::string path);
 
     GameWindow   *m_window;
     Renderer     *m_renderer;
@@ -87,4 +89,7 @@ class Game
     GameThread mRenderThread;
     GameThread mAudioThread;
     GameThread mLocalThread;
-};
+
+    std::mutex m_mutex;
+    std::condition_variable m_cv;
+};

Engine/include/Rendering/Renderer.h

@@ -11,7 +11,6 @@ enum class RendererMode {
     OPENGL,    // 0
     VULKAN,    // 1
     DIRECTX,   // 2
-    DIRECTX11, // 3
     DIRECTX12, // 4
     METAL,     // 5
 };

Engine/include/Rendering/Threading/GameThread.h

@@ -2,6 +2,7 @@
 #include <functional>
 #include <thread>
 #include <vector>
+#include <mutex>
 
 class GameThread
 {
@@ -19,6 +20,8 @@ class GameThread
     bool m_run;
     bool m_background;
 
+    std::mutex m_mutex;
+
     std::thread m_thread;
 
     std::function<void()>              m_main_cb;

Engine/include/Rendering/Vulkan/Texture2DVulkan.h

@@ -22,9 +22,12 @@ namespace vkTexture {
 
     Texture2D_Vulkan *TexLoadImage(std::filesystem::path imagePath);
     Texture2D_Vulkan *TexLoadImage(void *buffer, size_t size);
+    Texture2D_Vulkan *AllocateTexture(int width, int height);
     Texture2D_Vulkan *GetDummyImage();
     VkDescriptorSet   GetVkDescriptorSet(Texture2D_Vulkan *image);
 
+    void UpdateTexture(Texture2D_Vulkan *handle, void *buffer, int pitch);
+
     void QueryTexture(Texture2D_Vulkan *handle, int &outWidth, int &outHeight);
     void ReleaseTexture(Texture2D_Vulkan *handle);
 

Engine/include/Rendering/Window.h

@@ -26,7 +26,7 @@ class GameWindow
     float       GetHeightScale();
 
     void SetScaleOutput(bool value);
-    bool IsScaleOutput();
+    bool IsScaleOutput() const;
 
     void SetWindowTitle(std::string &title);
     void SetWindowSubTitle(std::string &subTitle);

Engine/include/Texture/Sprite2D.h

@@ -18,30 +18,41 @@ class Sprite2D
 public:
     Sprite2D() = default;
 
-    Sprite2D(std::vector<Texture2D *> textures, float delay = 1.0f);
-    Sprite2D(std::vector<std::string> textures, float delay = 1.0f);
-    Sprite2D(std::vector<std::filesystem::path> textures, float delay = 1.0f);
-    Sprite2D(std::vector<SDL_Texture *> textures, float delay = 1.0f);
+    Sprite2D(std::vector<Texture2D *> textures, double delay = 1.0);
+    Sprite2D(std::vector<std::string> textures, double delay = 1.0);
+    Sprite2D(std::vector<std::filesystem::path> textures, double delay = 1.0);
+    Sprite2D(std::vector<SDL_Texture *> textures, double delay = 1.0);
 
     ~Sprite2D();
 
     bool    AlphaBlend;
+    bool    FlipX = false;
+    bool    FlipY = false;
     Vector2 AnchorPoint;
     UDim2   Position;
     UDim2   Position2;
     UDim2   Size;
 
     void Draw(double delta, bool manual = false);
     void Draw(double delta, Rect *rect, bool manual = false);
+    void DrawStop(double delta, bool manual = false);
+    void DrawOnce(double delta, bool manual = false);
 
     Texture2D *GetTexture();
-    void       SetFPS(float fps);
+    void       SetFPS(double fps);
     void       Reset();
+    void       SetIndex(int index) { m_currentIndex = index; }
+    int        GetFrameCount() const { return static_cast<int>(m_textures.size()); }
+
+    double m_spritespeed = 1.0;
 
 private:
-    double m_delay = 1.0;
     float  m_currentTime = 0;
     int    m_currentIndex = 0;
 
+    bool m_drawOnce = false;
+
     std::vector<Texture2D *> m_textures;
+
+    void DrawInternal(double delta, bool playOnce, Rect* rect, bool manual);
 };

Engine/include/Texture/Texture2D.h

@@ -20,9 +20,10 @@ class Texture2D
 
 public:
     Texture2D();
-    Texture2D(std::string fileName);
-    Texture2D(std::filesystem::path path);
-    Texture2D(uint8_t *fileData, size_t size);
+    Texture2D(const std::string& fileName);
+    Texture2D(int width, int height);
+    Texture2D(const std::filesystem::path& path);
+    Texture2D(const uint8_t *fileData, size_t size);
     Texture2D(SDL_Texture *texture);
     Texture2D(Texture2D_Vulkan *texture);
     ~Texture2D();
@@ -33,9 +34,12 @@ class Texture2D
     void Draw(Rect *clipRect, bool manualDraw);
 
     void CalculateSize();
+    void UpdateTexture(uint8_t* buffer, int width, int height, int pitch);
 
     float Transparency;
     float Rotation;
+    bool  FlipX = false;
+    bool  FlipY = false;
     bool  AlphaBlend;
     bool  m_ready = false;
 
@@ -51,7 +55,7 @@ class Texture2D
     Rect GetOriginalRECT();
     void SetOriginalRECT(Rect size);
 
-    static Texture2D *FromTexture2D(Texture2D *tex);
+    // static Texture2D *FromTexture2D(Texture2D *tex);
 
     static Texture2D *FromBMP(uint8_t *fileData, size_t size);
     static Texture2D *FromBMP(std::string fileName);