From 3de2a41092de93b27559c34f5199720a4fe5d989 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 26 Jul 2026 16:39:54 +0300
Subject: [PATCH] add 3d text 'font' property

---
 src/graphics/core/Font.cpp            | 4 +++-
 src/graphics/render/TextsRenderer.cpp | 6 +++++-
 src/presets/NotePreset.cpp            | 2 ++
 src/presets/NotePreset.hpp            | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/graphics/core/Font.cpp b/src/graphics/core/Font.cpp
index 7aaa67e80..9f1f0a434 100644
--- a/src/graphics/core/Font.cpp
+++ b/src/graphics/core/Font.cpp
@@ -162,6 +162,8 @@ static inline void draw_text(
     const FontStylesScheme* styles,
     size_t styleMapOffset
 ) {
+    bool is3d = std::is_same<Batch, Batch3D>();
+
     static FontStylesScheme defStyles {{{}}, {0}};
 
     if (styles == nullptr) {
@@ -200,7 +202,7 @@ static inline void draw_text(
             if (charpage == page){
                 batch.texture(font.getPage(charpage));
                 draw_glyph(
-                    batch, pos, glm::vec2(x, y - yOffset / static_cast<float>(font.getLineHeight())), c, right, up, interval, style
+                    batch, pos, glm::vec2(x, y - yOffset * (is3d ? -1 : 1) / static_cast<float>(font.getLineHeight())), c, right, up, interval, style
                 );
             }
             else if (charpage > page && charpage < next){
diff --git a/src/graphics/render/TextsRenderer.cpp b/src/graphics/render/TextsRenderer.cpp
index ac93d1e43..b5965dcc4 100644
--- a/src/graphics/render/TextsRenderer.cpp
+++ b/src/graphics/render/TextsRenderer.cpp
@@ -58,7 +58,10 @@ void TextsRenderer::renderNote(
         }
         opacity = preset.xrayOpacity;
     }
-    auto& font = assets.require<Font>(FONT_DEFAULT);
+
+    auto specifiedFont = assets.get<Font>(preset.font);
+    auto& font =
+        specifiedFont ? *specifiedFont : assets.require<Font>(FONT_DEFAULT);
 
     glm::vec3 xvec = note.getAxisX();
     glm::vec3 yvec = note.getAxisY();
@@ -118,6 +121,7 @@ void TextsRenderer::renderNote(
     }
     auto color = preset.color;
     batch.setColor(glm::vec4(color.r, color.g, color.b, color.a * opacity));
+
     font.draw(
         batch,
         text,
diff --git a/src/presets/NotePreset.cpp b/src/presets/NotePreset.cpp
index 59865e80a..a1d68994d 100644
--- a/src/presets/NotePreset.cpp
+++ b/src/presets/NotePreset.cpp
@@ -13,6 +13,7 @@ dv::value NotePreset::serialize() const {
         {"render_distance", renderDistance},
         {"xray_opacity", xrayOpacity},
         {"perspective", perspective},
+        {"font", font},
     });
 }
 
@@ -27,4 +28,5 @@ void NotePreset::deserialize(const dv::value& src) {
     src.at("render_distance").get(renderDistance);
     src.at("xray_opacity").get(xrayOpacity);
     src.at("perspective").get(perspective);
+    src.at("font").get(font);
 }
diff --git a/src/presets/NotePreset.hpp b/src/presets/NotePreset.hpp
index fecdaf18d..e8d030c78 100644
--- a/src/presets/NotePreset.hpp
+++ b/src/presets/NotePreset.hpp
@@ -28,6 +28,7 @@ struct NotePreset : public Serializable {
     float renderDistance = 32.0f;
     float xrayOpacity = 0.0f;
     float perspective = 1.0f;
+    std::string font {};
 
     dv::value serialize() const override;
     void deserialize(const dv::value& src) override;