X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fdataset.inl;h=41277a1d9ff7cc93eb3b59f54136a56911e10639;hp=1df20d5d89347f9c5a88a38f29840e00d786e259;hb=0d27f859021b4af5dbb5404ef5af012546abf335;hpb=572bf1ef8d54ef5a7cba7cdf38515cb16c4c312c

diff --git a/src/dataset.inl b/src/dataset.inl
index 1df20d5..41277a1 100644
--- a/src/dataset.inl
+++ b/src/dataset.inl
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "logger.h"
 
 template <typename T>
 DataSet<T>::DataSet(T (*create_func)(), bool (*load_func)(T, const char*), bool (*done_func)(T), void (*destr_func)(T))
@@ -46,10 +47,44 @@ T DataSet<T>::get(const char *name) const
 
 	T res = create();
 	data[name] = res;
-	resman_lookup(rman, name, res);
+	resman_add(rman, name, res);
 	return res;
 }
 
+template <typename T>
+int DataSet<T>::pending() const
+{
+	return resman_pending(rman);
+}
+
+template <typename T>
+void DataSet<T>::wait() const
+{
+	resman_waitall(rman);
+}
+
+template <typename T>
+void DataSet<T>::add_loaded_callback(LoadedCallbackFunc func, void *cls)
+{
+	std::pair<LoadedCallbackFunc, void*> cb;
+	cb.first = func;
+	cb.second = cls;
+	loaded_cb.push_back(cb);
+}
+
+template <typename T>
+bool DataSet<T>::remove_loaded_callback(LoadedCallbackFunc func)
+{
+	int numcb = (int)loaded_cb.size();
+	for(int i=0; i<numcb; i++) {
+		if(loaded_cb[i].first == func) {
+			loaded_cb.erase(loaded_cb.begin() + i);
+			return true;
+		}
+	}
+	return false;
+}
+
 
 // --- static functions to pass as callback to resman ---
 
@@ -58,6 +93,7 @@ int DataSet<T>::dataset_load_func(const char *fname, int id, void *cls)
 {
 	DataSet<T> *dset = (DataSet<T>*)cls;
 	T data = (T)resman_get_res_data(dset->rman, id);
+	if(!data) return -1;
 
 	if(!dset->load(data, fname)) {
 		return -1;
@@ -74,14 +110,19 @@ int DataSet<T>::dataset_done_func(int id, void *cls)
 	int load_res = resman_get_res_result(dset->rman, id);
 
 	if(load_res != 0) {
-		fprintf(stderr, "failed to load resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
+		error_log("failed to load resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
 	} else {
-		printf("done loading resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
+		info_log("done loading resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
 	}
 
 	if(dset->done) {
 		dset->done(data);
 	}
+
+	int numcb = (int)dset->loaded_cb.size();
+	for(int i=0; i<numcb; i++) {
+		dset->loaded_cb[i].first(data, dset->loaded_cb[i].second);
+	}
 	return 0;
 }