Merge pull request #89 from Legacy-LuaSTG-Engine/feature/new-text-renderer

[graphics] [font] [feature] New FontCollection/TextLayout/TextRenderer

Author: Demonese

LuaSTG/CMakeLists.txt

@@ -56,6 +56,8 @@ set(LUASTG_ENGINE_SOURCES
     LuaSTG/GameResource/ResourcePostEffectShader.hpp
     LuaSTG/GameResource/ResourceModel.hpp
     LuaSTG/GameResource/ResourceModel.cpp
+    LuaSTG/GameResource/SharedSpriteRenderer.hpp
+    LuaSTG/GameResource/SharedSpriteRenderer.cpp
 
     LuaSTG/GameResource/ResourceDebug.cpp
     LuaSTG/GameResource/ResourceManager.cpp
@@ -155,6 +157,12 @@ set(LUASTG_ENGINE_SOURCES
     LuaSTG/LuaBinding/modern/Well512.cpp
     LuaSTG/LuaBinding/modern/ShellIntegration.hpp
     LuaSTG/LuaBinding/modern/ShellIntegration.cpp
+    LuaSTG/LuaBinding/modern/FontCollection.hpp
+    LuaSTG/LuaBinding/modern/FontCollection.cpp
+    LuaSTG/LuaBinding/modern/TextLayout.hpp
+    LuaSTG/LuaBinding/modern/TextLayout.cpp
+    LuaSTG/LuaBinding/modern/TextRenderer.hpp
+    LuaSTG/LuaBinding/modern/TextRenderer.cpp
 
     LuaSTG/LuaBinding/generated/BlendModeX.cpp
     LuaSTG/LuaBinding/generated/BlendModeX.hpp

LuaSTG/Core.cmake

@@ -44,6 +44,8 @@ set(Core_SRC
     Core/Graphics/Common/FreeTypeGlyphManager.cpp
     Core/Graphics/Common/TextRenderer.hpp
     Core/Graphics/Common/TextRenderer.cpp
+    Core/Graphics/Common/TextRenderer2.hpp
+    Core/Graphics/Common/TextRenderer2.cpp
 
     Core/Graphics/Direct3D11/Constants.hpp
     Core/Graphics/Direct3D11/Buffer.hpp
@@ -120,5 +122,6 @@ target_link_libraries(Core PUBLIC
     Core.ReferenceCounted
     Core.FileSystem
     Core.Image
+    Core.Font
     win32
 )

LuaSTG/Core/Graphics/Common/Sprite.cpp

@@ -1,178 +1,35 @@
 #include "Core/Graphics/Common/Sprite.hpp"
 
 namespace core::Graphics::Common {
-	void Sprite::updateRect() {
-		// 纹理坐标系需要归一化
-
-		Vector2U const size = m_texture->getSize();
-		float const u_scale = 1.0f / static_cast<float>(size.x);
-		float const v_scale = 1.0f / static_cast<float>(size.y);
-		m_uv = m_rect;
-		m_uv.a.x *= u_scale;
-		m_uv.a.y *= v_scale;
-		m_uv.b.x *= u_scale;
-		m_uv.b.y *= v_scale;
-
-		// 纹理坐标系 y 轴朝下，渲染坐标系 y 轴朝上
-
-		m_pos_rc = m_rect - m_center;
-		m_pos_rc.a.x *= m_scale;
-		m_pos_rc.a.y *= -m_scale;
-		m_pos_rc.b.x *= m_scale;
-		m_pos_rc.b.y *= -m_scale;
-	}
-
 	void Sprite::setTextureRect(RectF const& rc) {
 		m_rect = rc;
-		updateRect();
 	}
 	void Sprite::setTextureCenter(Vector2F const& pt) {
 		m_center = pt;
-		updateRect();
 	}
 	void Sprite::setUnitsPerPixel(float const v) {
 		m_scale = v;
-		updateRect();
-	}
-
-	void Sprite::draw(RectF const& rc) {
-		m_renderer->setTexture(m_texture.get());
-
-		IRenderer::DrawVertex const vert[4] = {
-			IRenderer::DrawVertex(rc.a.x, rc.a.y, m_z, m_uv.a.x, m_uv.a.y, m_color[0].color()),
-			IRenderer::DrawVertex(rc.b.x, rc.a.y, m_z, m_uv.b.x, m_uv.a.y, m_color[1].color()),
-			IRenderer::DrawVertex(rc.b.x, rc.b.y, m_z, m_uv.b.x, m_uv.b.y, m_color[2].color()),
-			IRenderer::DrawVertex(rc.a.x, rc.b.y, m_z, m_uv.a.x, m_uv.b.y, m_color[3].color()),
-		};
-
-		m_renderer->drawQuad(vert);
-	}
-	void Sprite::draw(Vector3F const& p1, Vector3F const& p2, Vector3F const& p3, Vector3F const& p4) {
-		m_renderer->setTexture(m_texture.get());
-
-		IRenderer::DrawVertex const vert[4] = {
-			IRenderer::DrawVertex(p1.x, p1.y, p1.z, m_uv.a.x, m_uv.a.y, m_color[0].color()),
-			IRenderer::DrawVertex(p2.x, p2.y, p2.z, m_uv.b.x, m_uv.a.y, m_color[1].color()),
-			IRenderer::DrawVertex(p3.x, p3.y, p3.z, m_uv.b.x, m_uv.b.y, m_color[2].color()),
-			IRenderer::DrawVertex(p4.x, p4.y, p4.z, m_uv.a.x, m_uv.b.y, m_color[3].color()),
-		};
-
-		m_renderer->drawQuad(vert);
-	}
-	void Sprite::draw(Vector2F const& pos) {
-		draw(pos, Vector2F(1.0f, 1.0f));
-	}
-	void Sprite::draw(Vector2F const& pos, float const scale) {
-		draw(pos, Vector2F(scale, scale));
-	}
-	void Sprite::draw(Vector2F const& pos, float const scale, float const rotation) {
-		if (std::abs(rotation) < std::numeric_limits<float>::min()) {
-			draw(pos, Vector2F(scale, scale));
-			return;
-		}
-
-		draw(pos, Vector2F(scale, scale), rotation);
-	}
-	void Sprite::draw(Vector2F const& pos, Vector2F const& scale) {
-		m_renderer->setTexture(m_texture.get());
-
-		auto const rect = RectF(
-			m_pos_rc.a.x * scale.x,
-			m_pos_rc.a.y * scale.y,
-			m_pos_rc.b.x * scale.x,
-			m_pos_rc.b.y * scale.y
-		);
-
-		IRenderer::DrawVertex const vert[4] = {
-			IRenderer::DrawVertex(pos.x + rect.a.x, pos.y + rect.a.y, m_z, m_uv.a.x, m_uv.a.y, m_color[0].color()),
-			IRenderer::DrawVertex(pos.x + rect.b.x, pos.y + rect.a.y, m_z, m_uv.b.x, m_uv.a.y, m_color[1].color()),
-			IRenderer::DrawVertex(pos.x + rect.b.x, pos.y + rect.b.y, m_z, m_uv.b.x, m_uv.b.y, m_color[2].color()),
-			IRenderer::DrawVertex(pos.x + rect.a.x, pos.y + rect.b.y, m_z, m_uv.a.x, m_uv.b.y, m_color[3].color()),
-		};
-
-		m_renderer->drawQuad(vert);
-	}
-	void Sprite::draw(Vector2F const& pos, Vector2F const& scale, float const rotation) {
-		if (std::abs(rotation) < std::numeric_limits<float>::min()) {
-			draw(pos, scale);
-			return;
-		}
-
-		m_renderer->setTexture(m_texture.get());
-
-		auto const rect = RectF(
-			m_pos_rc.a.x * scale.x,
-			m_pos_rc.a.y * scale.y,
-			m_pos_rc.b.x * scale.x,
-			m_pos_rc.b.y * scale.y
-		);
-
-		IRenderer::DrawVertex vert[4] = {
-			IRenderer::DrawVertex(rect.a.x, rect.a.y, m_z, m_uv.a.x, m_uv.a.y, m_color[0].color()),
-			IRenderer::DrawVertex(rect.b.x, rect.a.y, m_z, m_uv.b.x, m_uv.a.y, m_color[1].color()),
-			IRenderer::DrawVertex(rect.b.x, rect.b.y, m_z, m_uv.b.x, m_uv.b.y, m_color[2].color()),
-			IRenderer::DrawVertex(rect.a.x, rect.b.y, m_z, m_uv.a.x, m_uv.b.y, m_color[3].color()),
-		};
-
-		float const sin_v = std::sinf(rotation);
-		float const cos_v = std::cosf(rotation);
-
-	#define rotate_xy(UNIT) \
-		{\
-			float const tx = vert[UNIT].x * cos_v - vert[UNIT].y * sin_v;\
-			float const ty = vert[UNIT].x * sin_v + vert[UNIT].y * cos_v;\
-			vert[UNIT].x = tx;\
-			vert[UNIT].y = ty;\
-		}
-
-		rotate_xy(0);
-		rotate_xy(1);
-		rotate_xy(2);
-		rotate_xy(3);
-
-		vert[0].x += pos.x; vert[0].y += pos.y;
-		vert[1].x += pos.x; vert[1].y += pos.y;
-		vert[2].x += pos.x; vert[2].y += pos.y;
-		vert[3].x += pos.x; vert[3].y += pos.y;
-
-		m_renderer->drawQuad(vert);
 	}
 
 	bool Sprite::clone(ISprite** const pp_sprite) {
-		auto const right = new Sprite(m_renderer.get(), m_texture.get());
+		auto const right = new Sprite(m_texture.get());
 		right->m_rect = m_rect;
-		right->m_pos_rc = m_pos_rc;
-		right->m_uv = m_uv;
 		right->m_center = m_center;
-		right->m_z = m_z;
 		right->m_scale = m_scale;
-		right->m_color[0] = m_color[0];
-		right->m_color[1] = m_color[1];
-		right->m_color[2] = m_color[2];
-		right->m_color[3] = m_color[3];
 		*pp_sprite = right;
 		return true;
 	}
 
-	Sprite::Sprite(IRenderer* const p_renderer, ITexture2D* const p_texture)
-		: m_renderer(p_renderer)
-		, m_texture(p_texture)
-		, m_z(0.5f)
-		, m_scale(1.0f) {
-		m_color[0] = Color4B(0xFFFFFFFFu);
-		m_color[1] = Color4B(0xFFFFFFFFu);
-		m_color[2] = Color4B(0xFFFFFFFFu);
-		m_color[3] = Color4B(0xFFFFFFFFu);
+	Sprite::Sprite(ITexture2D* const p_texture) : m_texture(p_texture), m_scale(1.0f) {
 		Vector2U const size = m_texture->getSize();
 		m_rect = RectF(0.0f, 0.0f, static_cast<float>(size.x), static_cast<float>(size.y));
 		m_center = Vector2F(m_rect.b.x * 0.5f, m_rect.b.y * 0.5f);
-		updateRect();
 	}
 	Sprite::~Sprite() = default;
 }
 namespace core::Graphics {
-	bool ISprite::create(IRenderer* const p_renderer, ITexture2D* const p_texture, ISprite** const pp_sprite) {
-		*pp_sprite = new Common::Sprite(p_renderer, p_texture);
+	bool ISprite::create(ITexture2D* const p_texture, ISprite** const pp_sprite) {
+		*pp_sprite = new Common::Sprite(p_texture);
 		return true;
 	}
 }

LuaSTG/Core/Graphics/Common/Sprite.hpp

@@ -4,76 +4,35 @@
 #include "Core/Graphics/Sprite.hpp"
 
 namespace core::Graphics::Common {
-	class Sprite final
-		: public implement::ReferenceCounted<ISprite>
-	{
-	public:
-		// ISprite
-
-		ITexture2D* getTexture() override { return m_texture.get(); }
-		void setTexture(ITexture2D* const p_texture) override { m_texture = p_texture; }
-
-		void setTextureRect(RectF const& rc) override;
-		RectF getTextureRect() override { return m_rect; }
-
-		void setTextureCenter(Vector2F const& pt) override;
-		Vector2F getTextureCenter() override { return m_center; }
-
-		void setUnitsPerPixel(float v) override;
-		float getUnitsPerPixel() override { return m_scale; }
-
-		void setZ(float const z) override { m_z = z; }
-		float getZ() override { return m_z; }
-
-		void setColor(Color4B const color) override {
-			m_color[0] = color;
-			m_color[1] = color;
-			m_color[2] = color;
-			m_color[3] = color;
-		}
-		void setColor(Color4B const* const color) override {
-			m_color[0] = color[0];
-			m_color[1] = color[1];
-			m_color[2] = color[2];
-			m_color[3] = color[3];
-		}
-		void getColor(Color4B* const color) override {
-			color[0] = m_color[0];
-			color[1] = m_color[1];
-			color[2] = m_color[2];
-			color[3] = m_color[3];
-		}
-
-		void draw(RectF const& rc) override;
-		void draw(Vector3F const& p1, Vector3F const& p2, Vector3F const& p3, Vector3F const& p4) override;
-		void draw(Vector2F const& pos) override;
-		void draw(Vector2F const& pos, float scale) override;
-		void draw(Vector2F const& pos, float scale, float rotation) override;
-		void draw(Vector2F const& pos, Vector2F const& scale) override;
-		void draw(Vector2F const& pos, Vector2F const& scale, float rotation) override;
-
-		bool clone(ISprite** pp_sprite) override;
-
-		// Sprite
-
-		Sprite(IRenderer* p_renderer, ITexture2D* p_texture);
-		Sprite(Sprite const&) = delete;
-		Sprite(Sprite&&) = delete;
-		Sprite& operator=(Sprite const&) = delete;
-		Sprite& operator=(Sprite&&) = delete;
-		~Sprite();
-
-		void updateRect();
-
-	private:
-		SmartReference<IRenderer> m_renderer;
-		SmartReference<ITexture2D> m_texture;
-		RectF m_rect;
-		RectF m_pos_rc;
-		RectF m_uv;
-		Vector2F m_center;
-		float m_z;
-		float m_scale;
-		Color4B m_color[4];
-	};
+    class Sprite final : public implement::ReferenceCounted<ISprite> {
+    public:
+        // ISprite
+
+        ITexture2D* getTexture() override { return m_texture.get(); }
+        void setTexture(ITexture2D* const p_texture) override { m_texture = p_texture; }
+        void setTextureRect(RectF const& rc) override;
+        RectF getTextureRect() override { return m_rect; }
+        void setTextureCenter(Vector2F const& pt) override;
+        Vector2F getTextureCenter() override { return m_center; }
+        void setUnitsPerPixel(float v) override;
+        float getUnitsPerPixel() override { return m_scale; }
+
+        bool clone(ISprite** pp_sprite) override;
+
+        // Sprite
+
+        Sprite(ITexture2D* p_texture);
+        Sprite(Sprite const&) = delete;
+        Sprite(Sprite&&) = delete;
+        ~Sprite();
+
+        Sprite& operator=(Sprite const&) = delete;
+        Sprite& operator=(Sprite&&) = delete;
+
+    private:
+        SmartReference<ITexture2D> m_texture;
+        RectF m_rect;
+        Vector2F m_center;
+        float m_scale;
+    };
 }

LuaSTG/Core/Graphics/Common/TextLayout-TextRenderer.md

@@ -0,0 +1,31 @@
+ImageAtlas
+    getImage
+    add
+    get
+    remove
+    clear
+
+SpriteAtlas
+    getImageAtlas
+    getTexture
+    add
+    get
+    remove
+    clear
+
+GlyphCache
+    code: integer
+    rect: Rect -- rect on image
+    uv: Rect -- rect on texture
+    pen: Vector2 -- glyph image left-top position
+    advance: Vector2 -- pen move to next position
+
+GlyphCacheManager
+    setFont(font: Font)
+    setDefaultSize(size_in_pixel: number)
+    add(code: integer | string, size_in_pixel: number?): GlyphCache?, string
+    get(code: integer | string, size_in_pixel: number?): GlyphCache?
+    remove(code: integer | string, size_in_pixel: number?): boolean
+    clear()
+    getSpriteAtlas(): SpriteAtlas
+    getSprite(code: integer | string, size_in_pixel: number?): Sprite?