mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-05-16 06:04:07 +00:00
patNormal and patTrihepta now use the functions from geometry2.cpp
This commit is contained in:
parent
628edd6650
commit
f5f218b7f9
29
pattern2.cpp
29
pattern2.cpp
@ -1926,40 +1926,19 @@ namespace linepatterns {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case patNormal: {
|
case patNormal: {
|
||||||
double x = hexvdist; // sphere?.401:euclid?.3 : .328;
|
|
||||||
if(gp::on) {
|
|
||||||
for(int t=0; t<c->type; t++)
|
for(int t=0; t<c->type; t++)
|
||||||
if(c->mov[t] && c->mov[t] < c)
|
if(c->mov[t] && c->mov[t] < c)
|
||||||
queuelinef(V * gp::get_corner_position(c, t),
|
queueline(V * get_corner_position(c, t),
|
||||||
V * gp::get_corner_position(c, (t+1)%c->type),
|
V * get_corner_position(c, (t+1)%c->type),
|
||||||
col, 1 + vid.linequality);
|
col, 1 + vid.linequality);
|
||||||
}
|
|
||||||
else if(euclid || !pseudohept(c)) for(int t=0; t<c->type; t++)
|
|
||||||
if(euclid ? c->mov[t]<c : (((t^1)&1) || c->mov[t] < c)) {
|
|
||||||
queuelinef(V * ddspin(c,t,-S7) * xpush0(x),
|
|
||||||
V * ddspin(c,t,+S7) * xpush0(x),
|
|
||||||
col, 1 + vid.linequality);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case patTrihepta:
|
case patTrihepta:
|
||||||
if(gp::on) {
|
|
||||||
if(pseudohept(c)) for(int t=0; t<c->type; t++)
|
if(pseudohept(c)) for(int t=0; t<c->type; t++)
|
||||||
queuelinef(V * gp::get_corner_position(c, t%c->type, 2),
|
queueline(V * get_warp_corner(c, t%c->type),
|
||||||
V * gp::get_corner_position(c, (t+1)%c->type, 2),
|
V * get_warp_corner(c, (t+1)%c->type),
|
||||||
col, 1 + vid.linequality);
|
col, 1 + vid.linequality);
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(!pseudohept(c)) for(int i=0; i<c->type; i++) {
|
|
||||||
cell *c2 = c->mov[i];
|
|
||||||
if(!c2 || !pseudohept(c2)) continue;
|
|
||||||
double x = hexhexdist / 2; // sphere?.3651:euclid?.2611:.2849;
|
|
||||||
queuelinef(V * ddspin(c,i,-S14) * xpush0(x),
|
|
||||||
V * ddspin(c,i,+S14) * xpush0(x),
|
|
||||||
col, 1 + vid.linequality);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case patTriNet:
|
case patTriNet:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user