Sfoglia il codice sorgente

Fix Android TextSprite and BitmapFont compiler errors

Replace std::map::emplace() with implicit std::map::insert(). More overhead, but nothing we can do about Android stdlibc++ lacking support.
dottools 9 anni fa
parent
commit
67233cb590

+ 3 - 3
engine/source/2d/sceneobject/TextSprite.cc

@@ -780,7 +780,7 @@ void TextSprite::setCharacterBlendColor(const U32 charNum, const ColorF color)
    }
    else
    {
-      mCharInfo.emplace(charNum, BitmapFontCharacterInfo(color));
+      mCharInfo[charNum] = BitmapFontCharacterInfo(color);
    }
 }
 
@@ -826,7 +826,7 @@ void TextSprite::setCharacterScale(const U32 charNum, const F32 scaleX, const F3
 {
    if (mCharInfo.find(charNum) == mCharInfo.end())
    {
-      mCharInfo.emplace(charNum, BitmapFontCharacterInfo());
+      mCharInfo[charNum] = BitmapFontCharacterInfo();
    }
    mCharInfo[charNum].mScaleX = scaleX;
    mCharInfo[charNum].mScaleY = scaleY;
@@ -873,7 +873,7 @@ void TextSprite::setCharacterOffset(const U32 charNum, const F32 offsetX, const
 {
    if (mCharInfo.find(charNum) == mCharInfo.end())
    {
-      mCharInfo.emplace(charNum, BitmapFontCharacterInfo());
+      mCharInfo[charNum] = BitmapFontCharacterInfo();
    }
    mCharInfo[charNum].mOffsetX = offsetX;
    mCharInfo[charNum].mOffsetY = offsetY;

+ 1 - 1
engine/source/bitmapFont/BitmapFont.cc

@@ -188,7 +188,7 @@ namespace font
             }
             ci.mCharID = CharID;
             ci.ProcessCharacter(mWidth, mHeight);
-            mChar.emplace(CharID, ci);
+            mChar[CharID] = ci;
          }
          else if (dStrcmp(Read, "kerning") == 0 && dStrcmp(Read, "kernings") != 0)
          {