From e80ff78999f4d68d70dc9ec1058eb3f1d25240c4 Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Mon, 3 Sep 2007 18:22:52 +0000 Subject: [PATCH] added const correctness to texture manager load/unload functions. also custom shape getImageUrl git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@385 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CustomShape.hpp | 2 +- src/projectM-engine/TextureManager.cpp | 4 ++-- src/projectM-engine/TextureManager.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/projectM-engine/CustomShape.hpp b/src/projectM-engine/CustomShape.hpp index 0dc092507..8aa526a2c 100755 --- a/src/projectM-engine/CustomShape.hpp +++ b/src/projectM-engine/CustomShape.hpp @@ -93,7 +93,7 @@ public: /// Returns any image url (usually used for texture maps) associated with the custom shape /// Will return empty string if none is set - inline const std::string & getImageUrl() { + inline const std::string & getImageUrl() const { return imageUrl; } diff --git a/src/projectM-engine/TextureManager.cpp b/src/projectM-engine/TextureManager.cpp index deaa8c781..7680e98ac 100644 --- a/src/projectM-engine/TextureManager.cpp +++ b/src/projectM-engine/TextureManager.cpp @@ -5,12 +5,12 @@ TextureManager::TextureManager(std::string _presetURL): presetURL(_presetURL) ; } -void TextureManager::loadTextures(PresetOutputs::cshape_container &shapes) +void TextureManager::loadTextures(const PresetOutputs::cshape_container &shapes) { ; } -void TextureManager::unloadTextures(PresetOutputs::cshape_container &shapes) +void TextureManager::unloadTextures(const PresetOutputs::cshape_container &shapes) { ; } diff --git a/src/projectM-engine/TextureManager.hpp b/src/projectM-engine/TextureManager.hpp index 3d286f7ab..72d9cc70c 100644 --- a/src/projectM-engine/TextureManager.hpp +++ b/src/projectM-engine/TextureManager.hpp @@ -14,8 +14,8 @@ class TextureManager public: TextureManager(std::string _presetURL); - void loadTextures(PresetOutputs::cshape_container &shapes); - void unloadTextures(PresetOutputs::cshape_container &shapes); + void loadTextures(const PresetOutputs::cshape_container &shapes); + void unloadTextures(const PresetOutputs::cshape_container &shapes); GLuint getTexture(std::string imageUrl); };