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

.gitmodules

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

Engine/include/Game.h

@@ -87,4 +87,7 @@ class Game
     GameThread mRenderThread;
     GameThread mAudioThread;
     GameThread mLocalThread;
-};
+
+    std::mutex m_mutex;
+    std::condition_variable m_cv;
+};

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/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,10 +18,10 @@ 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();
 
@@ -33,15 +33,22 @@ class Sprite2D
 
     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();
 
+    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,9 @@ 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(const std::filesystem::path& path);
+    Texture2D(const uint8_t *fileData, size_t size);
     Texture2D(SDL_Texture *texture);
     Texture2D(Texture2D_Vulkan *texture);
     ~Texture2D();
@@ -51,7 +51,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);

Engine/src/Configuration.cpp

@@ -86,7 +86,7 @@ void Configuration::Set(std::string key, std::string prop, std::string value)
 
 void Configuration::Font_SetPath(std::filesystem::path path)
 {
-    FontPath = path;
+    FontPath = std::filesystem::current_path() / "Resources";
 }
 
 std::filesystem::path Configuration::Font_GetPath()

Engine/src/Fonts/FontResources.cpp

@@ -1,4 +1,4 @@
-#pragma warning(disable : 4838) // Goddamit
+#pragma warning(disable : 4838) // Goddamit
 #pragma warning(disable : 4309)
 
 #include <Misc/md5.h>
@@ -25,9 +25,9 @@
 // BEGIN FONT FALLBACK
 
 #include "FallbackFonts/arial.ttf.h"
-#include "FallbackFonts/ch.ttf.h"
-#include "FallbackFonts/jp.ttf.h"
-#include "FallbackFonts/kr.ttf.h"
+//#include "FallbackFonts/ch.ttf.h"
+//#include "FallbackFonts/jp.ttf.h"
+//#include "FallbackFonts/kr.ttf.h"
 #include <Logs.h>
 
 // END FONT FALLBACK
@@ -92,14 +92,37 @@ void FontResources::PreloadFontCaches()
 
     GameWindow *wnd = GameWindow::GetInstance();
 
-    auto skinPath = Configuration::Font_GetPath();
-    auto fontPath = skinPath / "Fonts";
+    auto path = Configuration::Font_GetPath();
+    auto fontPath = path / "Fonts";
 
     auto normalfont = fontPath / "normal.ttf";
     auto jpFont = fontPath / "jp.ttf";
     auto krFont = fontPath / "kr.ttf";
     auto chFont = fontPath / "ch.ttf";
 
+    static const ImWchar glyphRanges[] = { // Optimized
+        (ImWchar)0x0020, (ImWchar)0x052F,
+        (ImWchar)0x2000, (ImWchar)0x27BF,
+        (ImWchar)0x2E80, (ImWchar)0x2FA1,
+        (ImWchar)0x1F300, (ImWchar)0x1FAFF,
+        (ImWchar)0x2660, (ImWchar)0x2663,
+        (ImWchar)0x2665, (ImWchar)0x2666,
+        (ImWchar)0x2600, (ImWchar)0x2606,
+        (ImWchar)0x2618, (ImWchar)0x2619,
+        (ImWchar)0x263A, (ImWchar)0x263B,
+        (ImWchar)0x2708, (ImWchar)0x2714,
+        (ImWchar)0x2728, (ImWchar)0x2734,
+        (ImWchar)0x2740, (ImWchar)0x274B,
+        (ImWchar)0x2756, (ImWchar)0x2758,
+        (ImWchar)0x2764, (ImWchar)0x2767,
+        (ImWchar)0x2794, (ImWchar)0x27BE,
+        (ImWchar)0x27F0, (ImWchar)0x27FF,
+        (ImWchar)0x2900, (ImWchar)0x297F,
+        (ImWchar)0x2A00, (ImWchar)0x2AFF,
+        (ImWchar)0x0000, (ImWchar)0x0000
+    };
+
+
     {
         float originScale = (wnd->GetBufferWidth() + wnd->GetBufferHeight()) / 15.6f;
         float targetScale = (wnd->GetWidth() + wnd->GetHeight()) / 15.6f;
@@ -118,9 +141,9 @@ void FontResources::PreloadFontCaches()
 
         {
             if (std::filesystem::exists(normalfont)) {
-                Font.Font = io.Fonts->AddFontFromFileTTF((const char *)normalfont.u8string().c_str(), fontSize, &conf);
+                Font.Font = io.Fonts->AddFontFromFileTTF((const char *)normalfont.u8string().c_str(), fontSize, &conf, glyphRanges); // glyphRanges, fixing missing fonts
             } else {
-                Font.Font = io.Fonts->AddFontFromMemoryTTF((void *)get_arial_font_data(), get_arial_font_size(), fontSize, &conf);
+                Font.Font = io.Fonts->AddFontFromMemoryTTF((void *)get_arial_font_data(), get_arial_font_size(), fontSize, &conf, glyphRanges);
             }
         }
 
@@ -151,7 +174,7 @@ void FontResources::PreloadFontCaches()
                         case TextRegion::Chinese:
                         {
                             if (std::filesystem::exists(chFont)) {
-                                io.Fonts->AddFontFromFileTTF((const char *)chFont.u8string().c_str(), fontSize, &conf, io.Fonts->GetGlyphRangesChineseSimplifiedCommon());
+                                io.Fonts->AddFontFromFileTTF((const char *)chFont.u8string().c_str(), fontSize, &conf, io.Fonts->GetGlyphRangesChineseFull());
                             }
 
                             break;