preliminary physics, sound, hud

[chaz/yoink] / src / Moof / Texture.cc

diff --git a/src/Moof/Texture.cc b/src/Moof/Texture.cc
index dc9407afc9da1af082ed577da1ab99a6b27bc1e6..e8f5d86d1f2e65fd85d413c5b93b26bfcedc6ac3 100644 (file)
--- a/src/Moof/Texture.cc
+++ b/src/Moof/Texture.cc
@@ -51,7 +51,7 @@ namespace Mf {
  * objects and avoid having duplicate textures loaded to GL.
  */
 
-class Texture::TextureImpl : public Mippleton<TextureImpl>
+class Texture::Impl : public Mippleton<Impl>
 {
 
        /**
@@ -129,8 +129,8 @@ public:
         * Construction is initialization.
         */
 
-       explicit TextureImpl(const std::string& name) :
-               Mippleton<TextureImpl>(name),
+       explicit Impl(const std::string& name) :
+               Mippleton<Impl>(name),
                surface_(0),
                width_(0),
                height_(0),
@@ -145,10 +145,10 @@ public:
 
                // we want to know when the GL context is recreated
                Dispatcher::instance().addHandler("video.context_recreated",
-                               boost::bind(&TextureImpl::contextRecreated, this, _1), this);
+                               boost::bind(&Impl::contextRecreated, this, _1), this);
        }
 
-       ~TextureImpl()
+       ~Impl()
        {
                if (surface_)
                {
@@ -239,7 +239,7 @@ public:
        {
                SDL_Surface* surface;
 
-               surface = IMG_Load(Texture::getPathToResource(getName()).c_str());
+               surface = IMG_Load(Texture::getPath(getName()).c_str());
 
                if (!surface)
                {
@@ -383,13 +383,12 @@ public:
        static GLuint   globalObject_;  ///< Global GL texture handle.
 };
 
-GLuint Texture::TextureImpl::globalObject_ = 0;
+GLuint Texture::Impl::globalObject_ = 0;
 
 
 Texture::Texture(const std::string& name) :
        // pass through
-       impl_(Texture::TextureImpl::retain(name), &Texture::TextureImpl::release)
-{}
+       impl_(Texture::Impl::retain(name), &Texture::Impl::release) {}
 
 
 /**
@@ -417,7 +416,7 @@ GLuint Texture::getObject() const
 void Texture::resetBind()
 {
        glBindTexture(GL_TEXTURE_2D, 0);
-       TextureImpl::globalObject_ = 0;
+       Impl::globalObject_ = 0;
 }
 
 
@@ -459,10 +458,10 @@ void Texture::setWrapT(GLuint wrap)
 }
 
 
-std::string Texture::getPathToResource(const std::string& name)
+std::string Texture::getPath(const std::string& name)
 {
-       // TODO named texture resources must be png for now
-       return Resource::getPathToResource("textures/" + name + ".png");
+       std::string path = Resource::getPath("textures/" + name + ".png");
+       return path;
 }