Skip to content
This repository has been archived by the owner on May 3, 2021. It is now read-only.

Commit

Permalink
Removing deprecated dk2 asset reference from the AssetManager
Browse files Browse the repository at this point in the history
  • Loading branch information
HipsterSloth committed Oct 3, 2016
1 parent e59d128 commit ed28a92
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
10 changes: 1 addition & 9 deletions src/psmoveconfigtool/AssetManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <imgui.h>

//-- 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";
Expand All @@ -33,8 +32,7 @@ AssetManager *AssetManager::m_instance= NULL;

//-- public methods -----
AssetManager::AssetManager()
: m_dk2Texture()
, m_psmoveTexture()
: m_psmoveTexture()
, m_psnaviTexture()
, m_defaultFont()
{
Expand All @@ -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);
Expand Down Expand Up @@ -93,7 +86,6 @@ bool AssetManager::init()

void AssetManager::destroy()
{
m_dk2Texture.dispose();
m_psmoveTexture.dispose();
m_psnaviTexture.dispose();
m_psdualshock4Texture.dispose();
Expand Down
4 changes: 0 additions & 4 deletions src/psmoveconfigtool/AssetManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ class AssetManager
static AssetManager *getInstance()
{ return m_instance; }

const TextureAsset *getDK2TextureAsset()
{ return &m_dk2Texture; }

const TextureAsset *getPSMoveTextureAsset()
{ return &m_psmoveTexture; }

Expand All @@ -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;
Expand Down

0 comments on commit ed28a92

Please sign in to comment.