Removed old TrueType

src/dawn/display/font/truetype/CMakeLists.txt

@@ -6,5 +6,5 @@
 # Sources
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE
-    NewTrueTypeFaceTexture.cpp
+    TrueTypeFaceTexture.cpp
 )

src/dawn/display/font/truetype/TrueTypeFaceTexture.cpp

@@ -3,13 +3,13 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
-#include "NewTrueTypeFaceTexture.hpp"
+#include "TrueTypeFaceTexture.hpp"
 
 using namespace Dawn;
 
-NewTrueTypeFaceTexture::NewTrueTypeFaceTexture(
+TrueTypeFaceTexture::TrueTypeFaceTexture(
   FT_Face face,
-  struct NewTrueTypeFaceTextureStyle style
+  struct TrueTypeFaceTextureStyle style
 ) {
   assertTrue(style.fontSize < 256);
 
@@ -29,7 +29,7 @@ NewTrueTypeFaceTexture::NewTrueTypeFaceTexture(
   FT_ULong c;
 
   // First pass, determine the textures' dimensions.
-  for(c = NEW_TRUETYPE_CHAR_BEGIN; c < NEW_TRUETYPE_CHAR_END; c++) {
+  for(c = TRUE_TYPE_CHAR_BEGIN; c < TRUE_TYPE_CHAR_END; c++) {
     // Load the character
     auto ret = FT_Load_Char(face, c, FT_LOAD_BITMAP_METRICS_ONLY);
     if(ret) {
@@ -52,8 +52,8 @@ NewTrueTypeFaceTexture::NewTrueTypeFaceTexture(
   uint8_t *buffer = (uint8_t *)memoryFillWithZero(w * h * sizeof(uint8_t));
 
   size_t offset = 0;
-  struct NewTrueTypeCharacter info;
-  for(c = NEW_TRUETYPE_CHAR_BEGIN; c < NEW_TRUETYPE_CHAR_END; c++) {
+  struct TrueTypeCharacter info;
+  for(c = TRUE_TYPE_CHAR_BEGIN; c < TRUE_TYPE_CHAR_END; c++) {
     // Load the character
     if(FT_Load_Char(face, c, FT_LOAD_RENDER)) {
       assertUnreachable();
@@ -86,10 +86,10 @@ NewTrueTypeFaceTexture::NewTrueTypeFaceTexture(
   memoryFree(buffer);
 }
 
-struct NewTrueTypeCharacter NewTrueTypeFaceTexture::getCharacterData(FT_ULong c) {
+struct TrueTypeCharacter TrueTypeFaceTexture::getCharacterData(FT_ULong c) {
   return this->characterData[c];
 }
 
-NewTrueTypeFaceTexture::~NewTrueTypeFaceTexture() {
+TrueTypeFaceTexture::~TrueTypeFaceTexture() {
   FT_Done_Face(this->face);
 }

src/dawn/display/font/truetype/TrueTypeFaceTexture.hpp

@@ -4,15 +4,15 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "display/font/truetype/NewTrueTypeShared.hpp"
+#include "display/font/truetype/TrueTypeShared.hpp"
 #include "util/mathutils.hpp"
 #include "display/Texture.hpp"
 #include "util/UsageLock.hpp"
 
 namespace Dawn {
-  class NewTrueTypeAsset;
+  class TrueTypeAsset;
 
-  struct NewTrueTypeCharacter {
+  struct TrueTypeCharacter {
     float_t advanceX;
     float_t advanceY;
     glm::vec2 bitmapSize;
@@ -20,20 +20,20 @@ namespace Dawn {
     float_t textureY;
   };
 
-  struct NewTrueTypeFaceTextureStyle {
+  struct TrueTypeFaceTextureStyle {
     uint32_t fontSize;
     flag_t style;
 
-    bool operator < (const struct NewTrueTypeFaceTextureStyle& r) const {
+    bool operator < (const struct TrueTypeFaceTextureStyle& r) const {
       return std::tie(fontSize, style) < std::tie(r.fontSize, r.style);
     }
   };
 
-  class NewTrueTypeFaceTexture {
+  class TrueTypeFaceTexture {
     public:
       FT_Face face;
-      std::map<FT_ULong, struct NewTrueTypeCharacter> characterData;
-      struct NewTrueTypeFaceTextureStyle style;
+      std::map<FT_ULong, struct TrueTypeCharacter> characterData;
+      struct TrueTypeFaceTextureStyle style;
       UsageLock locks;
       Texture texture;
 
@@ -43,9 +43,9 @@ namespace Dawn {
        * @param face The freetype face object.
        * @param style Style that this font has, used for locking.
        */
-      NewTrueTypeFaceTexture(
+      TrueTypeFaceTexture(
         FT_Face face,
-        struct NewTrueTypeFaceTextureStyle style
+        struct TrueTypeFaceTextureStyle style
       );
 
       /**
@@ -54,13 +54,13 @@ namespace Dawn {
        * @param c Character to get data for.
        * @return The Character data for the given character.
        */
-      struct NewTrueTypeCharacter getCharacterData(FT_ULong c);
+      struct TrueTypeCharacter getCharacterData(FT_ULong c);
 
       /**
        * Destroys this true type face texture.
        */
-      ~NewTrueTypeFaceTexture();
+      ~TrueTypeFaceTexture();
 
-      friend class NewTrueTypeAsset;
+      friend class TrueTypeAsset;
   };
 }