diff --git a/src/psmoveconfigtool/AssetManager.cpp b/src/psmoveconfigtool/AssetManager.cpp index d3a89955..dcfc3408 100644 --- a/src/psmoveconfigtool/AssetManager.cpp +++ b/src/psmoveconfigtool/AssetManager.cpp @@ -14,7 +14,6 @@ #include //-- constants ----- -static const char *k_dk2_texture_filename= "./assets/textures/DK2diffuse.jpg"; static const char *k_psmove_texture_filename= "./assets/textures/PSMoveDiffuse.jpg"; static const char *k_psnavi_texture_filename= "./assets/textures/PSNaviDiffuse.jpg"; static const char *k_psdualshock4_texture_filename = "./assets/textures/PSDS4Diffuse.jpg"; @@ -33,8 +32,7 @@ AssetManager *AssetManager::m_instance= NULL; //-- public methods ----- AssetManager::AssetManager() - : m_dk2Texture() - , m_psmoveTexture() + : m_psmoveTexture() , m_psnaviTexture() , m_defaultFont() { @@ -49,11 +47,6 @@ bool AssetManager::init() { bool success= true; - if (success) - { - success= loadTexture(k_dk2_texture_filename, &m_dk2Texture); - } - if (success) { success= loadTexture(k_psmove_texture_filename, &m_psmoveTexture); @@ -93,7 +86,6 @@ bool AssetManager::init() void AssetManager::destroy() { - m_dk2Texture.dispose(); m_psmoveTexture.dispose(); m_psnaviTexture.dispose(); m_psdualshock4Texture.dispose(); diff --git a/src/psmoveconfigtool/AssetManager.h b/src/psmoveconfigtool/AssetManager.h index f8bb02ad..85530cde 100644 --- a/src/psmoveconfigtool/AssetManager.h +++ b/src/psmoveconfigtool/AssetManager.h @@ -53,9 +53,6 @@ class AssetManager static AssetManager *getInstance() { return m_instance; } - const TextureAsset *getDK2TextureAsset() - { return &m_dk2Texture; } - const TextureAsset *getPSMoveTextureAsset() { return &m_psmoveTexture; } @@ -73,7 +70,6 @@ class AssetManager bool loadFont(const char *filename, float pixelHeight, FontAsset *fontAsset); // Utility Textures - TextureAsset m_dk2Texture; TextureAsset m_psmoveTexture; TextureAsset m_psnaviTexture; TextureAsset m_psdualshock4Texture;