Updated xfont

libs/xassets/xfont.cpp

@@ -2,11 +2,11 @@
 
 XFont::XFont()
     : XAsset()
-    , mFontName("")
+    , mFontName()
     , mPixelHeight(0)
     , mGlyphCount(0)
-    , mMaterial(new XMaterial())
+    , mMaterial()
-    , mGlowMaterial(new XMaterial())
+    , mGlowMaterial()
     , mGlyphs()
 {
     SetType(ASSET_TYPE_FONT);
@@ -20,15 +20,42 @@ XFont::~XFont()
 
 void XFont::Clear()
 {
-    mFontName = "";
+    mFontName.Clear();
     mPixelHeight = 0;
     mGlyphCount = 0;
-    delete mMaterial;
+    mMaterial.Clear();
-    delete mGlowMaterial;
+    mGlowMaterial.Clear();
     mGlyphs.clear();
 }
 
 void XFont::ParseData(QDataStream *aStream)
 {
+    if (GetPtr() == -1)
+    {
+        mFontName.ParsePtr(aStream, false);
 
+        qint32 glyphsPtr;
+        *aStream
+            >> mPixelHeight
+            >> mGlyphCount;
+
+        mMaterial.ParsePtr(aStream, false);
+        mGlowMaterial.ParsePtr(aStream, false);
+
+        *aStream >> glyphsPtr;
+
+        mFontName.ParseData(aStream);
+        mMaterial.ParseData(aStream);
+        mGlowMaterial.ParseData(aStream);
+
+        if (glyphsPtr == -1)
+        {
+            for (int i = 0; i < mGlyphCount; i++)
+            {
+                XGlyph newGlyph;
+                newGlyph.ParseData(aStream);
+                mGlyphs.append(newGlyph);
+            }
+        }
+    }
 }

libs/xassets/xfont.h

@@ -15,11 +15,11 @@ public:
     void ParseData(QDataStream *aStream) override;
 
 private:
-    QString mFontName;
+    XString mFontName;
     int mPixelHeight;
     int mGlyphCount;
-    XMaterial *mMaterial;
+    XMaterial mMaterial;
-    XMaterial *mGlowMaterial;
+    XMaterial mGlowMaterial;
     QVector<XGlyph> mGlyphs;
 };