yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed image management

Browse Source
This commit is contained in:
yvt 2013-12-08 16:52:57 +09:00
parent 983019f187
commit f4db0992ef
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Draw/GLImageManager.cpp
View File

@ -51,6 +51,7 @@ namespace spades {
if(it == images.end()){
GLImage *img = CreateImage(name);
images[name] = img;
img->AddRef();
return img;
}
it->second->AddRef();
@ -60,16 +61,7 @@ namespace spades {
GLImage *GLImageManager::CreateImage(const std::string &name) {
SPADES_MARK_FUNCTION();
Bitmap *bmp;
bmp = Bitmap::Load(name);
/*
IStream *stream = FileManager::OpenForReading(name.c_str());
try{
bmp = Bitmap::FromTarga(stream);
}catch(...){
delete stream;
throw;
}*/
Handle<Bitmap> bmp(Bitmap::Load(name), false);
return GLImage::FromBitmap(bmp, device);
}

1
Sources/Draw/GLModelManager.cpp
View File

@ -51,6 +51,7 @@ namespace spades {
if(it == models.end()){
GLModel *m = CreateModel(name);
models[name] = m;
m->AddRef();
return m;
}
it->second->AddRef(); // model manager owns this reference