changed chamfered to bitruncated

This commit is contained in:
Zeno Rogue
2018-01-06 22:34:03 +01:00
parent 1427147fbc
commit 5bf6d54c7d
40 changed files with 357 additions and 357 deletions
+4 -4
View File
@@ -53,7 +53,7 @@ void precalc() {
// dynamicval<eGeometry> g(geometry, gNormal);
// precalc(); }
// for(int i=0; i<S84; i++) spinmatrix[i] = spin(i * M_PI / S42);
if(a4 && nonchamfered) {
if(a4 && nonbitrunc) {
crossf = .5;
hexf = .5;
hcrossf = crossf * sqrt(2) / 2;
@@ -119,7 +119,7 @@ void precalc() {
else {
hcrossf = hdist(xpush(tessf) * C0, spin(2*M_PI/S7) * xpush(tessf) * C0) / 2;
}
crossf = nonchamfered ? tessf : hcrossf;
crossf = nonbitrunc ? tessf : hcrossf;
fmin = 0, fmax = tessf;
for(int p=0; p<100; p++) {
@@ -132,9 +132,9 @@ void precalc() {
}
hexf = fmin;
rhexf = nonchamfered ? hcrossf : hexf;
rhexf = nonbitrunc ? hcrossf : hexf;
if(!euclid && !nonchamfered && !(S7&1))
if(!euclid && !nonbitrunc && !(S7&1))
hexshift = ALPHA/2 + ALPHA * ((S7-1)/2) + M_PI;
finish: