mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-10-31 19:36:16 +00:00
Code Issues Releases Wiki Activity

rv:: objmodels fixes

Browse Source
This commit is contained in:
Zeno Rogue 2022-03-01 08:46:06 +01:00
parent 4d234a96f8
commit 19019c907a
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rogueviz/objmodels.cpp
View File

@ -81,7 +81,8 @@ void model::load_obj(model_data& md) {
emit_material(); emit_material();
nextcol = 0xFFFFFFFF; nextcol = 0xFFFFFFFF;
texname = ""; texname = "";
mtlname = scanline(fsm); fsm.get<char>();
scan(fsm, mtlname);
} }
if(s == "map_Kd") { if(s == "map_Kd") {
scan(fsm, texname); scan(fsm, texname);
@ -93,8 +94,13 @@ void model::load_obj(model_data& md) {
next_object: next_object:
object *co = nullptr; object *co = nullptr;
bool textured = false; bool textured = false;
string oname = scanline(fs); fs.get<char>();
string oname;
scan(fs, oname);
println(hlog, "reading object: ", oname); println(hlog, "reading object: ", oname);
md.objindex.push_back(isize(md.objs));
hyperpoint ctr = Hypc;
int cqty = 0;
while(true) { while(true) {
if(feof(fs.f)) { if(feof(fs.f)) {
if(co) cgi.finishshape(); if(co) cgi.finishshape();
@ -117,6 +123,7 @@ void model::load_obj(model_data& md) {
h[1] /= 100; h[1] /= 100;
h[2] /= 100; h[2] /= 100;
vertices.push_back(h); vertices.push_back(h);
ctr += h; cqty++;
} }
else if(s == "vt") { else if(s == "vt") {
ld u, v; ld u, v;
@ -134,7 +141,10 @@ void model::load_obj(model_data& md) {
else if(s == "usemtl") { else if(s == "usemtl") {
if(co) cgi.finishshape(); if(co) cgi.finishshape();
if(co) println(hlog, "vertices = ", co->sh.e-co->sh.s, " tvertices = ", isize(co->tv.tvertices)); if(co) println(hlog, "vertices = ", co->sh.e-co->sh.s, " tvertices = ", isize(co->tv.tvertices));
string mtlname = scanline(fs); fs.get<char>();
string mtlname;
scan(fs, mtlname);
//string mtlname = scanline(fs);
co = nullptr; co = nullptr;
if(mtlname.find("Layer_Layer0") != string::npos) continue; if(mtlname.find("Layer_Layer0") != string::npos) continue;
objects.push_back(make_shared<object>()); objects.push_back(make_shared<object>());
@ -196,6 +206,14 @@ void model::load_obj(model_data& md) {
tot.push_back(textured ? tvertices[vis[i].t] : point3(0,0,0)); tot.push_back(textured ? tvertices[vis[i].t] : point3(0,0,0));
} }
if(!co) continue; if(!co) continue;
if(shift_to_ctr) {
hyperpoint ctr1 = ctr / cqty;
ctr1[3] = 0;
println(hlog, "ctr1 = ", ctr1, "hys = ", hys[0]);
for(auto& h: hys)
h -= ctr1;
}
hyperpoint norm = (hys[1] - hys[0]) ^ (hys[2] - hys[0]); hyperpoint norm = (hys[1] - hys[0]) ^ (hys[2] - hys[0]);
norm /= hypot_d(3, norm); norm /= hypot_d(3, norm);
@ -255,7 +273,8 @@ void model::load_obj(model_data& md) {
println(hlog, "reading finished"); println(hlog, "reading finished");
cgi.extra_vertices(); md.objindex.push_back(isize(md.objs));
cgi.extra_vertices();
} }
model_data& model::get() { model_data& model::get() {
@ -277,8 +296,8 @@ model_data& model::get() {
} }
void model_data::render(const shiftmatrix& V) { void model_data::render(const shiftmatrix& V) {
for(auto& obj: objs) { for(auto& obj: objs) if(obj->color) {
queuepoly(V, obj->sh, obj->color); queuepoly(V, obj->sh, obj->color);
} }
} }
@ -303,6 +322,7 @@ auto cf = addHook(hooks_configfile, 100, [] {
->editable(1, 100, 1, "3D model precision", "higher-precision models take more time to load and to render.", 'p') ->editable(1, 100, 1, "3D model precision", "higher-precision models take more time to load and to render.", 'p')
->set_sets([] { dialog::numberdark = dialog::DONT_SHOW; }) ->set_sets([] { dialog::numberdark = dialog::DONT_SHOW; })
; ;
param_b(shift_to_ctr, "shift_to_ctr");
}); });
} }