| Index: core/src/fxge/ge/fx_ge.cpp
|
| diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp
|
| index 6ba6cf59791420136e885e187c3f68806b70715c..d37ed5c714064e3883380404ab3e68033d7d5fd5 100644
|
| --- a/core/src/fxge/ge/fx_ge.cpp
|
| +++ b/core/src/fxge/ge/fx_ge.cpp
|
| @@ -7,59 +7,51 @@
|
| #include "../../../include/fxge/fx_ge.h"
|
| #include "text_int.h"
|
| static CFX_GEModule* g_pGEModule = NULL;
|
| -CFX_GEModule::CFX_GEModule()
|
| -{
|
| - m_pFontCache = NULL;
|
| - m_pFontMgr = NULL;
|
| - m_FTLibrary = NULL;
|
| - m_pCodecModule = NULL;
|
| - m_pPlatformData = NULL;
|
| -}
|
| -CFX_GEModule::~CFX_GEModule()
|
| -{
|
| - delete m_pFontCache;
|
| - m_pFontCache = NULL;
|
| - delete m_pFontMgr;
|
| - m_pFontMgr = NULL;
|
| - DestroyPlatform();
|
| -}
|
| -CFX_GEModule* CFX_GEModule::Get()
|
| -{
|
| - return g_pGEModule;
|
| -}
|
| -void CFX_GEModule::Create()
|
| -{
|
| - g_pGEModule = new CFX_GEModule;
|
| - g_pGEModule->m_pFontMgr = new CFX_FontMgr;
|
| - g_pGEModule->InitPlatform();
|
| - g_pGEModule->SetTextGamma(2.2f);
|
| -}
|
| -void CFX_GEModule::Use(CFX_GEModule* pModule)
|
| -{
|
| - g_pGEModule = pModule;
|
| -}
|
| -void CFX_GEModule::Destroy()
|
| -{
|
| - delete g_pGEModule;
|
| - g_pGEModule = NULL;
|
| -}
|
| -CFX_FontCache* CFX_GEModule::GetFontCache()
|
| -{
|
| - if (m_pFontCache == NULL) {
|
| - m_pFontCache = new CFX_FontCache();
|
| - }
|
| - return m_pFontCache;
|
| -}
|
| -void CFX_GEModule::SetTextGamma(FX_FLOAT gammaValue)
|
| -{
|
| - gammaValue /= 2.2f;
|
| - int i = 0;
|
| - while (i < 256) {
|
| - m_GammaValue[i] = (uint8_t)(FXSYS_pow((FX_FLOAT)i / 255, gammaValue) * 255.0f + 0.5f);
|
| - i++;
|
| - }
|
| -}
|
| -const uint8_t* CFX_GEModule::GetTextGammaTable()
|
| -{
|
| - return m_GammaValue;
|
| +CFX_GEModule::CFX_GEModule() {
|
| + m_pFontCache = NULL;
|
| + m_pFontMgr = NULL;
|
| + m_FTLibrary = NULL;
|
| + m_pCodecModule = NULL;
|
| + m_pPlatformData = NULL;
|
| +}
|
| +CFX_GEModule::~CFX_GEModule() {
|
| + delete m_pFontCache;
|
| + m_pFontCache = NULL;
|
| + delete m_pFontMgr;
|
| + m_pFontMgr = NULL;
|
| + DestroyPlatform();
|
| +}
|
| +CFX_GEModule* CFX_GEModule::Get() {
|
| + return g_pGEModule;
|
| +}
|
| +void CFX_GEModule::Create() {
|
| + g_pGEModule = new CFX_GEModule;
|
| + g_pGEModule->m_pFontMgr = new CFX_FontMgr;
|
| + g_pGEModule->InitPlatform();
|
| + g_pGEModule->SetTextGamma(2.2f);
|
| +}
|
| +void CFX_GEModule::Use(CFX_GEModule* pModule) {
|
| + g_pGEModule = pModule;
|
| +}
|
| +void CFX_GEModule::Destroy() {
|
| + delete g_pGEModule;
|
| + g_pGEModule = NULL;
|
| +}
|
| +CFX_FontCache* CFX_GEModule::GetFontCache() {
|
| + if (m_pFontCache == NULL) {
|
| + m_pFontCache = new CFX_FontCache();
|
| + }
|
| + return m_pFontCache;
|
| +}
|
| +void CFX_GEModule::SetTextGamma(FX_FLOAT gammaValue) {
|
| + gammaValue /= 2.2f;
|
| + int i = 0;
|
| + while (i < 256) {
|
| + m_GammaValue[i] =
|
| + (uint8_t)(FXSYS_pow((FX_FLOAT)i / 255, gammaValue) * 255.0f + 0.5f);
|
| + i++;
|
| + }
|
| +}
|
| +const uint8_t* CFX_GEModule::GetTextGammaTable() {
|
| + return m_GammaValue;
|
| }
|
|
|