From eb5392a434fc8bbbe283e60dc3df174b752ea678 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 6 Sep 2019 00:29:40 +0200
Subject: [PATCH] fixed obsolete stuff in rogueviz

---
 rogueviz-flocking.cpp   | 2 --
 rogueviz-newconf.cpp    | 2 --
 rogueviz-pentagonal.cpp | 4 +---
 rogueviz-staircase.cpp  | 4 ----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/rogueviz-flocking.cpp b/rogueviz-flocking.cpp
index c6967d40..2bf7f25c 100644
--- a/rogueviz-flocking.cpp
+++ b/rogueviz-flocking.cpp
@@ -131,7 +131,6 @@ namespace flocking {
       iter++;
       }      
     ld d = delta / 1000.;
-    using namespace hyperpoint_vec;
     int N = isize(vdata);
     vector<transmatrix> pats(N);
     vector<ld> vels(N);
@@ -265,7 +264,6 @@ namespace flocking {
         // (in quotient spaces, the representants closest to the current view
         // are taken), and normalize the result to project it back to the hyperboloid
         // (the same method is commonly used on the sphere AFAIK)
-        using namespace hyperpoint_vec;
         hyperpoint h = Hypc;
         for(int i=0; i<N; i++) if(gmatrix.count(vdata[i].m->base)) {
           vdata[i].m->pat = gmatrix[vdata[i].m->base] * vdata[i].m->at;
diff --git a/rogueviz-newconf.cpp b/rogueviz-newconf.cpp
index ee40f7bc..c7499d4c 100644
--- a/rogueviz-newconf.cpp
+++ b/rogueviz-newconf.cpp
@@ -140,8 +140,6 @@ void iterate() {
   for(int y=0; y<Y-1; y++) for(int x=0; x<X-1; x++) 
     if(fmap[y][x] == '1' && fmap[y+1][x] == '1' && fmap[y][x+1] == '1') {
     
-    using namespace hyperpoint_vec;
-
     hyperpoint here = point2(vx[y][x], vy[y][x]);
     hyperpoint v0   = point2(vx[y][x+1], vy[y][x+1]) - here;
     hyperpoint v1   = point2(vx[y+1][x], vy[y+1][x]) - here;
diff --git a/rogueviz-pentagonal.cpp b/rogueviz-pentagonal.cpp
index 0003de7c..755cf3d3 100644
--- a/rogueviz-pentagonal.cpp
+++ b/rogueviz-pentagonal.cpp
@@ -4,8 +4,6 @@ namespace rogueviz {
 namespace pentagonal {
 transmatrix ts[3];
 
-using namespace hyperpoint_vec;
-
 hyperpoint facingdir(array<hyperpoint,3>& a) {
   hyperpoint tmp = (a[1]-a[0]) ^ (a[2]-a[0]);
   tmp /= sqrt(tmp|tmp);
@@ -257,7 +255,7 @@ void create_model() {
   
   printf("createmodel with ticks = %d\n", ticks);
 
-  transmatrix t = hyperbolic ? rotmatrix(M_PI, 0, 2) * xpush(sin(ticks * M_PI * 2 / anims::period)) : rotmatrix(ticks * M_PI * 2 / anims::period, 0, 2);
+  transmatrix t = hyperbolic ? hr::cspin(0, 2, M_PI) * xpush(sin(ticks * M_PI * 2 / anims::period)) : hr::cspin(0, 2, ticks * M_PI * 2 / anims::period);
   
   hyperpoint hs = hyperbolic ? hpxyz(0,0,-1) : hpxyz(0,0,0);
   
diff --git a/rogueviz-staircase.cpp b/rogueviz-staircase.cpp
index 94d29310..e93e3ce8 100644
--- a/rogueviz-staircase.cpp
+++ b/rogueviz-staircase.cpp
@@ -6,8 +6,6 @@
 
 namespace rogueviz { namespace staircase {
 
-using namespace hyperpoint_vec;
-
 ld scurvature = 0;
 ld acurvature = 0;
 
@@ -38,7 +36,6 @@ rug::rugpoint *pt(hyperpoint h, hyperpoint c) {
   }
 
 void addRect(hyperpoint h, hyperpoint hx, hyperpoint hy, hyperpoint v, hyperpoint vx, hyperpoint vy, int ix, int iy) {
-  using namespace hyperpoint_vec;
   vector<vector<rug::rugpoint*> > rps(iy+1, vector<rug::rugpoint*> (ix+1));
   for(int y=0; y<=iy; y++)
   for(int x=0; x<=ix; x++) {
@@ -51,7 +48,6 @@ void addRect(hyperpoint h, hyperpoint hx, hyperpoint hy, hyperpoint v, hyperpoin
   }
 
 void addTri(hyperpoint h, hyperpoint hx, hyperpoint hy, hyperpoint v, hyperpoint vx, hyperpoint vy, int i) {
-  using namespace hyperpoint_vec;
   vector<vector<rug::rugpoint*> > rps(i+1, vector<rug::rugpoint*> (i+1));
   for(int y=0; y<=i; y++)
   for(int x=0; x<=i; x++) {