namespace Mf {
-class Tilemap::TilemapImpl : public Mippleton<TilemapImpl>
+class Tilemap::Impl : public Mippleton<Impl>
{
static GLint filterFromString(const std::string& filter)
{
}
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),
void loadFromFile()
{
- Deserializer deserializer(Tilemap::getPathToResource(getName()));
+ Deserializer deserializer(Tilemap::getPath(getName()));
- SerializablePtr root = deserializer.deserialize();
+ SerializableP root = deserializer.deserialize();
if (root)
{
- std::map<std::string,SerializablePtr> rootObj;
+ Serializable::Map rootObj;
if (root->get(rootObj))
{
- std::map<std::string,SerializablePtr>::iterator it;
+ Serializable::Map::iterator it;
if ((it = rootObj.find("tiles_s")) != rootObj.end())
{
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_);
}
-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");
}