mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-06 03:22:49 +00:00
Code Issues Releases Wiki Activity

embeddings:: 3d model fixes

Browse Source
This commit is contained in:
Zeno Rogue 2023-02-11 02:37:04 +01:00
parent f820f356b1
commit 7cf7c6b216
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-models.cpp
View File

@ -15,7 +15,7 @@ ld eyepos;
#if MAXMDIM >= 4 #if MAXMDIM >= 4
#define S (cgi.scalefactor / 0.805578) #define S (cgi.scalefactor / 0.805578)
#define SH (cgi.scalefactor / 0.805578 * vid.height_width / 1.5) #define SH (embedded_plane ? cgi.human_height : (cgi.scalefactor / 0.805578 * (vid.height_width / 1.5)))
#define revZ ((WDIM == 2 || gproduct) ? -1 : 1) #define revZ ((WDIM == 2 || gproduct) ? -1 : 1)
@ -390,7 +390,9 @@ void geometry_information::make_foot_3d(hpcshape& sh) {
add_cone(zc(0.4), leg5, zc(0.45)); add_cone(zc(0.4), leg5, zc(0.45));
add_texture(sh); add_texture(sh);
// shift_last(-LEG0); // shift_last(-LEG0);
for(int i=last->s; i<isize(hpc); i++) hpc[i] = cpush(0, -0.0125*S) * hpc[i]; ld sc = 1;
if(cgi.emb->is_euc_in_hyp()) sc *= exp(-vid.depth);
for(int i=last->s; i<isize(hpc); i++) hpc[i] = lxpush(-0.0125*S) * hpc[i];
} }
void geometry_information::make_head_only() { void geometry_information::make_head_only() {
@ -508,6 +510,7 @@ hyperpoint yzspin(ld alpha, hyperpoint h) {
if(embedded_plane) { if(embedded_plane) {
h = cgi.emb->actual_to_logical(h); h = cgi.emb->actual_to_logical(h);
h = cspin(1, 2, alpha) * h; h = cspin(1, 2, alpha) * h;
h[2] *= cgi.human_height;
h = cgi.emb->logical_to_actual(h); h = cgi.emb->logical_to_actual(h);
return h; return h;
} }
@ -641,6 +644,7 @@ void geometry_information::animate_bird(hpcshape& orig, hpcshape_animated& anima
if(abs(h[1]) > body) { if(abs(h[1]) > body) {
ld off = h[1] > 0 ? body : -body; ld off = h[1] > 0 ? body : -body;
h[2] += abs(h[1] - off) * sin(alpha); h[2] += abs(h[1] - off) * sin(alpha);
if(embedded_plane) h[2] *= cgi.human_height;
h[1] = off + (h[1] - off) * cos(alpha); h[1] = off + (h[1] - off) * cos(alpha);
h = cgi.emb->logical_to_actual(h); h = cgi.emb->logical_to_actual(h);
h = normalize(h); h = normalize(h);
@ -656,7 +660,7 @@ void geometry_information::slimetriangle(hyperpoint a, hyperpoint b, hyperpoint
dynamicval<int> d(vid.texture_step, 8); dynamicval<int> d(vid.texture_step, 8);
ld sca = 1; ld sca = 1;
if(mhybrid) sca = .5; if(mhybrid) sca = .5;
if(cgi.emb->is_euc_in_noniso()) sca *= .3; if(cgi.emb->is_euc_in_noniso()) sca *= .3 * geom3::euclid_embed_scale;
texture_order([&] (ld x, ld y) { texture_order([&] (ld x, ld y) {
ld z = 1-x-y; ld z = 1-x-y;
ld r = scalefactor * hcrossf7 * (0 + pow(max(x,max(y,z)), .3) * 0.8) * sca; ld r = scalefactor * hcrossf7 * (0 + pow(max(x,max(y,z)), .3) * 0.8) * sca;