Forráskód Böngészése

Updates to fix building on Linux with Text Sprite changes

Harley Laue 9 éve
szülő
commit
0477bc42e1

+ 4 - 4
engine/source/2d/sceneobject/TextSprite.h

@@ -231,11 +231,11 @@ protected:
 
 private:
    void RenderLetter(BatchRender* pBatchRenderer, Vector2& cursor, U32 charID, F32 ratio, U32 charNum);
-   void TextSprite::ApplyAlignment(Vector2& cursor, U32 totalRows, U32 row, F32 length, U32 charCount, F32 ratio);
-   F32 TextSprite::getCursorAdvance(U32 charID, S32 prevCharID, F32 ratio);
-   F32 TextSprite::getCursorAdvance(const BitmapFontCharacter& bmChar, S32 prevCharID, F32 ratio);
+   void ApplyAlignment(Vector2& cursor, U32 totalRows, U32 row, F32 length, U32 charCount, F32 ratio);
+   F32 getCursorAdvance(U32 charID, S32 prevCharID, F32 ratio);
+   F32 getCursorAdvance(const BitmapFontCharacter& bmChar, S32 prevCharID, F32 ratio);
    F32 GetLineHeight() { return (mAutoLineHeight) ? mFontSize : mCustomLineHeight; }
-   void TextSprite::CalculateSpatials(F32 ratio);
+   void CalculateSpatials(F32 ratio);
 };
 
 #endif // _TEXT_SPRITE_H_

+ 3 - 3
engine/source/bitmapFont/BitmapFont.h

@@ -24,11 +24,11 @@
 #define _BITMAP_FONT_H_
 
 #ifndef _BITMAP_FONT_CHARACTER_H_
-#include "bitmapFont\BitmapFontCharacter.h"
+#include "bitmapFont/BitmapFontCharacter.h"
 #endif
 
 #ifndef _UTILITY_H_
-#include "2d/core/utility.h"
+#include "2d/core/Utility.h"
 #endif
 
 #ifndef _TEXTURE_MANAGER_H_
@@ -72,4 +72,4 @@ namespace font
    };
 }
 
-#endif // _BITMAP_FONT_H_
+#endif // _BITMAP_FONT_H_

+ 3 - 3
engine/source/bitmapFont/BitmapFontCharacter.h

@@ -24,11 +24,11 @@
 #define _BITMAP_FONT_CHARACTER_H_
 
 #ifndef _UTILITY_H_
-#include "2d/core/utility.h"
+#include "2d/core/Utility.h"
 #endif
 
 #ifndef _VECTOR2_H_
-#include "2d/Core/Vector2.h"
+#include "2d/core/Vector2.h"
 #endif
 
 namespace font
@@ -54,4 +54,4 @@ namespace font
    };
 }
 
-#endif // _BITMAP_FONT_CHARACTER_H_
+#endif // _BITMAP_FONT_CHARACTER_H_