X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresourcemanager.cpp;h=bcc4839b6b6073cb5b356c16aa4be3c261522023;hb=ca450e5f2a5da6375d12190123d1acd35580ac15;hp=6461c33620eb3aa386418afadad48cab8f6a51d6;hpb=f17d748c753f0ffa03d53369cc7aaf3288a5c1e7;p=libs%2Fgl.git

diff --git a/source/resourcemanager.cpp b/source/resourcemanager.cpp
index 6461c336..bcc4839b 100644
--- a/source/resourcemanager.cpp
+++ b/source/resourcemanager.cpp
@@ -4,6 +4,7 @@
 #include <msp/strings/format.h>
 #include <msp/time/utils.h>
 #include "resourcemanager.h"
+#include "resources.h"
 #include "resourcewatcher.h"
 
 using namespace std;
@@ -11,6 +12,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+resource_load_error::resource_load_error(const string &name, const string &err):
+	runtime_error(format("%s: %s", name, err))
+{ }
+
 resource_load_error::resource_load_error(const string &name, const exception &exc):
 	runtime_error(format("%s: %s: %s", name, Debug::demangle(typeid(exc).name()), exc.what()))
 { }
@@ -70,19 +75,29 @@ void *ResourceManager::get_data_for_resource(const Resource &r)
 }
 
 void ResourceManager::set_resource_location(Resource &r, DataFile::Collection &c, const string &n)
+{
+	set_resource_location(r, ResourceLocation(c, n));
+}
+
+void ResourceManager::set_resource_location(Resource &r, const ResourceLocation &l)
 {
 	ManagedResource &managed = get_item(resources, &r);
-	managed.collection = &c;
-	managed.name = n;
+	managed.location = l;
 
 	if(policy==LOAD_IMMEDIATELY)
 		load_resource(r);
 }
 
+const ResourceManager::ResourceLocation *ResourceManager::get_resource_location(const Resource &r) const
+{
+	const ManagedResource &managed = get_item(resources, &r);
+	return managed.location.collection ? &managed.location : 0;
+}
+
 void ResourceManager::load_resource(Resource &r)
 {
 	ManagedResource &managed = get_item(resources, &r);
-	if(!managed.collection)
+	if(!managed.location.collection)
 		throw runtime_error("no location");
 
 	if(managed.state!=ManagedResource::NOT_LOADED)
@@ -91,7 +106,9 @@ void ResourceManager::load_resource(Resource &r)
 	if(async_loads)
 	{
 		managed.state = ManagedResource::LOAD_QUEUED;
-		queue.push_back(&managed);
+		LoadQueue::iterator i;
+		for(i=queue.begin(); (i!=queue.end() && (*i)->load_priority>=managed.load_priority); ++i) ;
+		queue.insert(i, &managed);
 	}
 	else
 	{
@@ -101,7 +118,7 @@ void ResourceManager::load_resource(Resource &r)
 	}
 }
 
-bool ResourceManager::is_resource_loaded(const Resource &r)
+bool ResourceManager::is_resource_loaded(const Resource &r) const
 {
 	ManagedResource *managed = reinterpret_cast<ManagedResource *>(r.get_manager_data());
 	return managed ? managed->state==ManagedResource::LOADED : false;
@@ -110,6 +127,8 @@ bool ResourceManager::is_resource_loaded(const Resource &r)
 void ResourceManager::resource_used(const Resource &r)
 {
 	ManagedResource *managed = reinterpret_cast<ManagedResource *>(r.get_manager_data());
+	if(!managed)
+		return;
 	if(managed->state==ManagedResource::NOT_LOADED && policy!=LOAD_MANUALLY)
 		load_resource(*managed->resource);
 
@@ -242,9 +261,19 @@ bool ResourceManager::age_order(ManagedResource *mr1, ManagedResource *mr2)
 }
 
 
+ResourceManager::ResourceLocation::ResourceLocation():
+	collection(0)
+{ }
+
+ResourceManager::ResourceLocation::ResourceLocation(DataFile::Collection &c, const string &n):
+	collection(&c),
+	name(n)
+{ }
+
+
 ResourceManager::ManagedResource::ManagedResource(Resource &r):
 	resource(&r),
-	collection(0),
+	load_priority(r.get_load_priority()),
 	io(0),
 	loader(0),
 	state(NOT_LOADED),
@@ -254,8 +283,12 @@ ResourceManager::ManagedResource::ManagedResource(Resource &r):
 
 void ResourceManager::ManagedResource::start_loading()
 {
-	io = collection->open_raw(name);
-	loader = resource->load(*io);
+	io = location.collection->open_raw(location.name);
+	if(!io)
+		throw resource_load_error(location.name, "open failed");
+
+	const Resources *res = dynamic_cast<Resources *>(location.collection);
+	loader = resource->load(*io, res);
 	if(!loader)
 	{
 		delete io;
@@ -350,7 +383,7 @@ void ResourceManager::LoadingThread::main()
 			catch(const exception &e)
 			{
 				MutexLock lock(queue_mutex);
-				error_queue.push_back(resource_load_error(managed->name, e));
+				error_queue.push_back(resource_load_error(managed->location.name, e));
 				managed->state = ManagedResource::LOAD_ERROR;
 			}
 
@@ -407,12 +440,18 @@ bool ResourceManager::LoadingThread::try_remove_resource(ManagedResource &r)
 	{
 		i = find(sync_queue.begin(), sync_queue.end(), &r);
 		if(i!=sync_queue.end())
+		{
 			sync_queue.erase(i);
+			--size;
+		}
 	}
 	else if(i==async_queue.begin())
 		return false;
 	else
+	{
 		async_queue.erase(i);
+		--size;
+	}
 
 	return true;
 }