Move fonts to their own directory and remove font scale

OGRECave · Feb 25, 2024 · c2a4953 · c2a4953
1 parent a312430
commit c2a4953
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/Liberation.fontdef → fonts/Liberation.fontdef b/Liberation.fontdef → fonts/Liberation.fontdef
diff --git a/LiberationMono-Regular.ttf → fonts/LiberationMono-Regular.ttf b/LiberationMono-Regular.ttf → fonts/LiberationMono-Regular.ttf
diff --git a/LiberationSans-Regular.ttf → fonts/LiberationSans-Regular.ttf b/LiberationSans-Regular.ttf → fonts/LiberationSans-Regular.ttf
diff --git a/ogre_mesh_viewer.py b/ogre_mesh_viewer.py
@@ -516,6 +516,9 @@ def locateResources(self):
         # explicitly add mesh location to be safe
         if not rgm.resourceLocationExists(self.filedir, Ogre.RGN_DEFAULT):
             rgm.addResourceLocation(self.filedir, "FileSystem", Ogre.RGN_DEFAULT)
+
+        # add fonts to default resource group
+        rgm.addResourceLocation("./fonts", "FileSystem", Ogre.RGN_DEFAULT)
 
     def loadResources(self):
         rgm = Ogre.ResourceGroupManager.getSingleton()
@@ -557,7 +560,6 @@ def setup(self):
 
         imgui_overlay.addFont("Liberation/Sans", Ogre.RGN_DEFAULT)
         self.logwin.font = imgui_overlay.addFont("Liberation/Mono", Ogre.RGN_DEFAULT)
-        self.logwin.font.Scale = round(pixel_ratio)
 
         imgui_overlay.show()
         Ogre.Overlay.OverlayManager.getSingleton().addOverlay(imgui_overlay)