diff --git a/floorshapes.cpp b/floorshapes.cpp index 902f3db7..daf0ef24 100644 --- a/floorshapes.cpp +++ b/floorshapes.cpp @@ -282,17 +282,6 @@ void generate_floorshapes() { } } - hyperpoint mid3(hyperpoint h1, hyperpoint h2, hyperpoint h3) { - using namespace hyperpoint_vec; - return mid(h1+h2+h3, h1+h2+h3); - } - - hyperpoint mid_at(hyperpoint h1, hyperpoint h2, ld v) { - using namespace hyperpoint_vec; - hyperpoint h = h1 * (1-v) + h2 * v; - return mid(h, h); - } - namespace gp { int pshid[3][8][32][32][8]; int nextid; diff --git a/hyperpoint.cpp b/hyperpoint.cpp index 2474e01d..02eb39b1 100644 --- a/hyperpoint.cpp +++ b/hyperpoint.cpp @@ -604,4 +604,15 @@ transmatrix rotmatrix(double rotation, int c0, int c1) { return t; } +hyperpoint mid3(hyperpoint h1, hyperpoint h2, hyperpoint h3) { + using namespace hyperpoint_vec; + return mid(h1+h2+h3, h1+h2+h3); + } + +hyperpoint mid_at(hyperpoint h1, hyperpoint h2, ld v) { + using namespace hyperpoint_vec; + hyperpoint h = h1 * (1-v) + h2 * v; + return mid(h, h); + } + }