Revert "Feature/its all about fonts"

1-echo · Jun 28, 2023 · 7f2b7e0 · 7f2b7e0
1 parent 775b0b4
commit 7f2b7e0
Show file tree

Hide file tree

Showing 30 changed files with 235 additions and 912 deletions.
diff --git a/scripts/IconGlyphs/icons.lua b/scripts/IconGlyphs/icons.lua
@@ -1,9 +1,7 @@
 -- Generated by https://github.com/Nats-ji/IconFontCppHeadersAndLuaTables for LuaJLT and Lua 5.3+
 -- from https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/master/meta.json
 -- for use with https://github.com/Templarian/MaterialDesign-Webfont/blob/master/fonts/materialdesignicons-webfont.ttf
-local IconGlyphs = {}
-
-IconGlyphs.icons = {
+local IconGlyphs = {
   AbTesting = "\u{f01c9}",	-- U+F01C9 ab-testing, tags: Developer / Languages
   Abacus = "\u{f16e0}",	-- U+F16E0 abacus, tags: Math
   AbjadArabic = "\u{f1328}",	-- U+F1328 abjad-arabic, aliases: writing-system-arabic, tags: Alpha / Numeric
@@ -7101,14 +7099,4 @@ IconGlyphs.icons = {
   ZodiacTaurus = "\u{f0a87}",	-- U+F0A87 zodiac-taurus, aliases: horoscope-taurus
   ZodiacVirgo = "\u{f0a88}",	-- U+F0A88 zodiac-virgo, aliases: horoscope-virgo
 }
-
-IconGlyphs.metatable = {
-  __index = function(table, key)
-    AddTextGlyphs(IconGlyphs.icons[key])
-    return IconGlyphs.icons[key]
-  end
-}
-
-setmetatable(IconGlyphs, IconGlyphs.metatable)
-
-return IconGlyphs
+return IconGlyphs
diff --git a/src/CET.cpp b/src/CET.cpp
@@ -60,11 +60,6 @@ LuaVM& CET::GetVM() noexcept
     return m_vm;
 }
 
-Fonts& CET::GetFonts() noexcept
-{
-    return m_fonts;
-}
-
 bool CET::IsRunning() noexcept
 {
     return s_isRunning;
@@ -75,9 +70,8 @@ CET::CET()
     , m_persistentState(m_paths, m_options)
     , m_bindings(m_paths, m_options)
     , m_window(&m_bindings, &m_d3d12)
-    , m_fonts(m_options, m_paths)
-    , m_d3d12(m_window, m_paths, m_options, m_fonts)
-    , m_vm(m_paths, m_bindings, m_d3d12, m_fonts)
+    , m_d3d12(m_window, m_paths, m_options)
+    , m_vm(m_paths, m_bindings, m_d3d12)
     , m_overlay(m_bindings, m_options, m_persistentState, m_vm)
 {
     m_vm.Initialize();

diff --git a/src/CET.h b/src/CET.h
@@ -8,7 +8,6 @@
 #include "overlay/Overlay.h"
 #include "scripting/LuaVM.h"
 #include "common/CETTasks.h"
-#include "Fonts.h"
 
 struct CET
 {
@@ -25,7 +24,6 @@ struct CET
     VKBindings& GetBindings() noexcept;
     Overlay& GetOverlay() noexcept;
     LuaVM& GetVM() noexcept;
-    Fonts& GetFonts() noexcept;
 
     static bool IsRunning() noexcept;
 
@@ -37,7 +35,6 @@ struct CET
     PersistentState m_persistentState;
     VKBindings m_bindings;
     Window m_window;
-    Fonts m_fonts;
     D3D12 m_d3d12;
     LuaVM m_vm;
     Overlay m_overlay;