diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 02:13:03 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-10 02:13:03 +0200 |
| commit | 1704badc306fc8c7c6609aff9f809aee3ac00d3a (patch) | |
| tree | 76e1ba37bb0ec12bb744a6015f56613ba088e148 /src/inventory.h | |
| parent | 949383a2f7c0707667f76615fc748ff4879e2cc1 (diff) | |
| download | minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.tar.gz minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.tar.bz2 minetest-1704badc306fc8c7c6609aff9f809aee3ac00d3a.zip | |
work-in-progress texture atlas optimization
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/inventory.h b/src/inventory.h index e7c7adaee..ca07bf46d 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -122,12 +122,9 @@ public: #ifndef SERVER video::ITexture * getImage() { - /*if(m_content >= USEFUL_CONTENT_COUNT) - return NULL; - - return g_irrlicht->getTexture(g_content_inventory_texture_paths[m_content]);*/ - - return g_irrlicht->getTexture(content_features(m_content).inventory_texture); + //TODO + //return g_irrlicht->getTexture(content_features(m_content).inventory_texture); + return NULL; } #endif std::string getText() @@ -264,7 +261,9 @@ public: name = "cloud.png"; // Get such a texture - return g_irrlicht->getTexture(name); + //return g_irrlicht->getTexture(name); + //TODO + return NULL; } #endif std::string getText() @@ -351,10 +350,12 @@ public: std::ostringstream os; os<<"[progressbar"<<value_f; - TextureSpec spec; + /*TextureSpec spec; spec.addTid(g_irrlicht->getTextureId(basename)); spec.addTid(g_irrlicht->getTextureId(os.str())); - return g_irrlicht->getTexture(spec); + return g_irrlicht->getTexture(spec);*/ + //TODO + return NULL; /*// Make texture name for the new texture with a progress bar float value_f = (float)toolprogress / (float)maxprogress; |