mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

rogueviz::objmodels:: using gi_extension

Browse Source
This commit is contained in:
Zeno Rogue
2021-03-31 10:41:07 +02:00
parent d3bb52749f
commit 51b73ecd6e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rogueviz/hypcity.cpp
View File

@@ -24,7 +24,8 @@ model city("rogueviz/models/", "emilejohansson_p2.obj");
hyperpoint low, high; hyperpoint low, high;
void prepare_tf() { void prepare_tf() {
if(!city.models.empty()) return; if(!city.prepared) return;
city.prepared = true;
prec = 40; prec = 40;

16
rogueviz/objmodels.cpp
View File

@@ -21,7 +21,8 @@ bool model::available() {
return false; return false;
} }
void model::load_obj(model_type& objects) { void model::load_obj(model_data& md) {
auto& objects = md.objs;
fhstream fs(path+fname, "rt"); fhstream fs(path+fname, "rt");
if(!fs.f) if(!fs.f)
@@ -235,12 +236,19 @@ void model::load_obj(model_type& objects) {
cgi.extra_vertices(); cgi.extra_vertices();
} }
void model::render(const shiftmatrix& V) { model_data& model::get() {
auto& objs = models[cgi_string()]; auto& md = (unique_ptr<model_data>&) cgi.ext[fname];
if(objs.empty()) load_obj(objs); if(!md) {
md = std::make_unique<model_data>();
load_obj(*md);
}
return *md;
}
void model_data::render(const shiftmatrix& V) {
for(auto& obj: objs) { for(auto& obj: objs) {
queuepoly(V, obj->sh, obj->color); queuepoly(V, obj->sh, obj->color);
} }