1.1 --- a/src/dataset.inl	Tue Feb 25 23:47:48 2014 +0200
     1.2 +++ b/src/dataset.inl	Sat Mar 01 22:04:29 2014 +0200
     1.3 @@ -5,28 +5,38 @@
     1.4  namespace goatgfx {
     1.5  
     1.6  template <typename T>
     1.7 -DataSet<T>::DataSet(T (*load_func)(const char*), void (*destr_func)(T))
     1.8 +DataSet<T>::DataSet(T (*create_func)(), bool (*load_func)(T, const char*), bool (*done_func)(T), void (*destr_func)(T))
     1.9  {
    1.10 +	create = create_func;
    1.11  	load = load_func;
    1.12 +	done = done_func;
    1.13  	destroy = destr_func;
    1.14 +
    1.15 +	rman = resman_create();
    1.16 +	resman_set_load_func(rman, dataset_load_func, this);
    1.17 +	resman_set_done_func(rman, dataset_done_func, this);
    1.18 +	resman_set_destroy_func(rman, dataset_destroy_func, this);
    1.19  }
    1.20  
    1.21  template <typename T>
    1.22  DataSet<T>::~DataSet()
    1.23  {
    1.24 -	clear();
    1.25 +	resman_free(rman);
    1.26  }
    1.27  
    1.28  template <typename T>
    1.29  void DataSet<T>::clear()
    1.30  {
    1.31 -	if(destroy) {
    1.32 -		typename std::map<std::string, T>::iterator it = data.begin();
    1.33 -		while(it != data.end()) {
    1.34 -			destroy(it++->second);
    1.35 -		}
    1.36 -	}
    1.37 +	resman_free(rman);
    1.38  	data.clear();
    1.39 +
    1.40 +	rman = resman_create();
    1.41 +}
    1.42 +
    1.43 +template <typename T>
    1.44 +void DataSet<T>::update()
    1.45 +{
    1.46 +	resman_poll(rman);
    1.47  }
    1.48  
    1.49  template <typename T>
    1.50 @@ -37,17 +47,68 @@
    1.51  		return iter->second;
    1.52  	}
    1.53  
    1.54 -	std::string path = goatgfx::datafile_path(name);
    1.55 +	const char *fname, *slash;
    1.56 +	if((slash = strrchr(name, '/'))) {
    1.57 +		fname = slash + 1;
    1.58 +	} else {
    1.59 +		fname = name;
    1.60 +	}
    1.61 +
    1.62 +	std::string path = datafile_path(fname);
    1.63  	if(path.empty()) {
    1.64  		fprintf(stderr, "can't find data file: %s\n", name);
    1.65  		return 0;
    1.66  	}
    1.67  
    1.68 -	T res = load(path.c_str());
    1.69 -	if(res) {
    1.70 -		data[name] = res;
    1.71 -	}
    1.72 +	T res = create();
    1.73 +	resman_lookup(rman, path.c_str(), res);
    1.74  	return res;
    1.75  }
    1.76  
    1.77 +
    1.78 +// --- static functions to pass as callback to resman ---
    1.79 +
    1.80 +template <typename T>
    1.81 +int DataSet<T>::dataset_load_func(const char *fname, int id, void *cls)
    1.82 +{
    1.83 +	DataSet<T> *dset = (DataSet<T>*)cls;
    1.84 +	T data = (T)resman_get_res_data(dset->rman, id);
    1.85 +
    1.86 +	if(!dset->load(data, fname)) {
    1.87 +		return -1;
    1.88 +	}
    1.89 +	return 0;
    1.90 +}
    1.91 +
    1.92 +template <typename T>
    1.93 +int DataSet<T>::dataset_done_func(int id, void *cls)
    1.94 +{
    1.95 +	DataSet<T> *dset = (DataSet<T>*)cls;
    1.96 +
    1.97 +	T data = (T)resman_get_res_data(dset->rman, id);
    1.98 +	int load_res = resman_get_res_result(dset->rman, id);
    1.99 +
   1.100 +	if(load_res != 0) {
   1.101 +		fprintf(stderr, "failed to load resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
   1.102 +	} else {
   1.103 +		printf("done loading resource %d (%s)\n", id, resman_get_res_name(dset->rman, id));
   1.104 +	}
   1.105 +
   1.106 +	if(dset->done) {
   1.107 +		dset->done(data);
   1.108 +	}
   1.109 +	return 0;
   1.110 +}
   1.111 +
   1.112 +template <typename T>
   1.113 +void DataSet<T>::dataset_destroy_func(int id, void *cls)
   1.114 +{
   1.115 +	DataSet<T> *dset = (DataSet<T>*)cls;
   1.116 +	T data = (T)resman_get_res_data(dset->rman, id);
   1.117 +
   1.118 +	if(dset->destroy) {
   1.119 +		dset->destroy(data);
   1.120 +	}
   1.121 +}
   1.122 +
   1.123  }	// namespace goatgfx