From 9a76d440004554ade2d062c8f11bae7add64732a Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 7 May 2018 21:47:10 +0200
Subject: [PATCH] fixed the non-bitruncated order-4 tilings

---
 floorshapes.cpp | 9 ++++-----
 pattern2.cpp    | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/floorshapes.cpp b/floorshapes.cpp
index 17da0de6..62e3f08e 100644
--- a/floorshapes.cpp
+++ b/floorshapes.cpp
@@ -134,7 +134,7 @@ void generate_matrices_scale(ld scale, int noft) {
   mesher ohex = msh(gNormal, 6, 0.329036, 0.566256, 0.620672, 0, 1);
   mesher ohept = msh(gNormal, 7, hexf7, hcrossf7, hcrossf7, M_PI/7, 1);
   if(nonbitrunc) {
-    mesher nall = msh(geometry, S7, rhexf, tessf, tessf, M_PI/7, scale);
+    mesher nall = msh(geometry, S7, rhexf, tessf, tessf, -M_PI, scale);
     bool use = geosupport_graveyard() < 2;
     if(use && noft == 1) {
       mesher opure = msh(gNormal, 7, 0.620672, 1.090550, 1.090550, M_PI/7, 1);
@@ -192,6 +192,8 @@ void bshape2(hpcshape& sh, int p, int shapeid, matrixlist& m) {
   T = spin(m.o.bspi) * T;
   for(auto &p: lst) p = T * p;
   
+  if(osym % rots && rots % osym) printf("warning: rotation oddity (shapeid %d, osym=%d rots=%d)\n", shapeid, osym, rots);
+
   if(rots > osym && rots % osym == 0) {
     int rep = rots / osym;
     int s = lst.size();
@@ -200,8 +202,6 @@ void bshape2(hpcshape& sh, int p, int shapeid, matrixlist& m) {
     rots /= rep;
     }
   
-  if(osym % rots) printf("warning: rotation oddity (shapeid %d)\n", shapeid);
-
   bshape(sh, p);
 
   for(int r=0; r<nsym; r+=osym/rots) {
@@ -286,8 +286,7 @@ void generate_floorshapes() {
     auto& fsh = *pfsh;
     generate_matrices_scale(fsh.scale, fsh.noftype);
     fsh.b.resize(2);
-    if(nonbitrunc && (S7&1) && fsh.shapeid2) {
-      printf("using shapeid2: %d\n", fsh.shapeid2);
+    if(nonbitrunc && geosupport_graveyard() < 2 && fsh.shapeid2) {
       bshape2(fsh.b[0], fsh.prio, fsh.shapeid2, hept_matrices);
       bshape2(fsh.b[1], fsh.prio, fsh.shapeid2, hept_matrices);
       }
diff --git a/pattern2.cpp b/pattern2.cpp
index 35c52975..901c0108 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -994,7 +994,8 @@ int geosupport_graveyard() {
   if(tc) return tc;
   
   if(S3 == 3 && S7 == 7) return 1;
-  if(S3 == 4 && !(S7&1)) return 2;
+  // nice chessboard pattern, but not the actual Graveyard
+  if(S3 == 4 && !(S7&1)) return 1;
   return 0;
   }