X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTilemap.cc;h=85c117e271a4833266c95fcf2554102fced07bb4;hp=9f24b1bce91547a200bf7de7090f9ce6a8110ca8;hb=5fa5f117f28922a7e539a432367960c1a61f837d;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/Moof/Tilemap.cc b/src/Moof/Tilemap.cc
index 9f24b1b..85c117e 100644
--- a/src/Moof/Tilemap.cc
+++ b/src/Moof/Tilemap.cc
@@ -36,7 +36,7 @@
 namespace Mf {
 
 
-class Tilemap::TilemapImpl : public Mippleton<TilemapImpl>
+class Tilemap::Impl : public Mippleton<Impl>
 {
 	static GLint filterFromString(const std::string& filter)
 	{
@@ -75,8 +75,8 @@ class Tilemap::TilemapImpl : public Mippleton<TilemapImpl>
 	}
 
 public:
-	TilemapImpl(const std::string& name) :
-		Mippleton<TilemapImpl>(name),
+	Impl(const std::string& name) :
+		Mippleton<Impl>(name),
 		magFilter_(GL_NEAREST),
 		minFilter_(GL_NEAREST),
 		nTilesS_(1),
@@ -89,7 +89,7 @@ public:
 
 	void loadFromFile()
 	{
-		Deserializer deserializer(Tilemap::getPathToResource(getName()));
+		Deserializer deserializer(Tilemap::getPath(getName()));
 
 		SerializablePtr root = deserializer.deserialize();
 
@@ -164,10 +164,8 @@ public:
 
 Tilemap::Tilemap(const std::string& name) :
 	Texture(name),
-	impl_(Tilemap::TilemapImpl::retain(name), &Tilemap::TilemapImpl::release)
+	impl_(Tilemap::Impl::getInstance(name))
 {
-	bind();
-
 	setMinFilter(impl_->minFilter_);
 	setMagFilter(impl_->magFilter_);
 	setWrapS(impl_->wrapS_);
@@ -225,9 +223,9 @@ bool Tilemap::getTileCoords(unsigned index, Scalar coords[8],
 }
 
 
-std::string Tilemap::getPathToResource(const std::string& name)
+std::string Tilemap::getPath(const std::string& name)
 {
-	return Resource::getPathToResource("tilemaps/" + name + ".json");
+	return Resource::getPath("tilemaps/" + name + ".json");
 }