mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-24 05:17:17 +00:00
fixed obsolete stuff in rogueviz
This commit is contained in:
parent
82f24b4b6c
commit
eb5392a434
@ -131,7 +131,6 @@ namespace flocking {
|
|||||||
iter++;
|
iter++;
|
||||||
}
|
}
|
||||||
ld d = delta / 1000.;
|
ld d = delta / 1000.;
|
||||||
using namespace hyperpoint_vec;
|
|
||||||
int N = isize(vdata);
|
int N = isize(vdata);
|
||||||
vector<transmatrix> pats(N);
|
vector<transmatrix> pats(N);
|
||||||
vector<ld> vels(N);
|
vector<ld> vels(N);
|
||||||
@ -265,7 +264,6 @@ namespace flocking {
|
|||||||
// (in quotient spaces, the representants closest to the current view
|
// (in quotient spaces, the representants closest to the current view
|
||||||
// are taken), and normalize the result to project it back to the hyperboloid
|
// are taken), and normalize the result to project it back to the hyperboloid
|
||||||
// (the same method is commonly used on the sphere AFAIK)
|
// (the same method is commonly used on the sphere AFAIK)
|
||||||
using namespace hyperpoint_vec;
|
|
||||||
hyperpoint h = Hypc;
|
hyperpoint h = Hypc;
|
||||||
for(int i=0; i<N; i++) if(gmatrix.count(vdata[i].m->base)) {
|
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;
|
vdata[i].m->pat = gmatrix[vdata[i].m->base] * vdata[i].m->at;
|
||||||
|
@ -140,8 +140,6 @@ void iterate() {
|
|||||||
for(int y=0; y<Y-1; y++) for(int x=0; x<X-1; x++)
|
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') {
|
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 here = point2(vx[y][x], vy[y][x]);
|
||||||
hyperpoint v0 = point2(vx[y][x+1], vy[y][x+1]) - here;
|
hyperpoint v0 = point2(vx[y][x+1], vy[y][x+1]) - here;
|
||||||
hyperpoint v1 = point2(vx[y+1][x], vy[y+1][x]) - here;
|
hyperpoint v1 = point2(vx[y+1][x], vy[y+1][x]) - here;
|
||||||
|
@ -4,8 +4,6 @@ namespace rogueviz {
|
|||||||
namespace pentagonal {
|
namespace pentagonal {
|
||||||
transmatrix ts[3];
|
transmatrix ts[3];
|
||||||
|
|
||||||
using namespace hyperpoint_vec;
|
|
||||||
|
|
||||||
hyperpoint facingdir(array<hyperpoint,3>& a) {
|
hyperpoint facingdir(array<hyperpoint,3>& a) {
|
||||||
hyperpoint tmp = (a[1]-a[0]) ^ (a[2]-a[0]);
|
hyperpoint tmp = (a[1]-a[0]) ^ (a[2]-a[0]);
|
||||||
tmp /= sqrt(tmp|tmp);
|
tmp /= sqrt(tmp|tmp);
|
||||||
@ -257,7 +255,7 @@ void create_model() {
|
|||||||
|
|
||||||
printf("createmodel with ticks = %d\n", ticks);
|
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);
|
hyperpoint hs = hyperbolic ? hpxyz(0,0,-1) : hpxyz(0,0,0);
|
||||||
|
|
||||||
|
@ -6,8 +6,6 @@
|
|||||||
|
|
||||||
namespace rogueviz { namespace staircase {
|
namespace rogueviz { namespace staircase {
|
||||||
|
|
||||||
using namespace hyperpoint_vec;
|
|
||||||
|
|
||||||
ld scurvature = 0;
|
ld scurvature = 0;
|
||||||
ld acurvature = 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) {
|
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));
|
vector<vector<rug::rugpoint*> > rps(iy+1, vector<rug::rugpoint*> (ix+1));
|
||||||
for(int y=0; y<=iy; y++)
|
for(int y=0; y<=iy; y++)
|
||||||
for(int x=0; x<=ix; x++) {
|
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) {
|
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));
|
vector<vector<rug::rugpoint*> > rps(i+1, vector<rug::rugpoint*> (i+1));
|
||||||
for(int y=0; y<=i; y++)
|
for(int y=0; y<=i; y++)
|
||||||
for(int x=0; x<=i; x++) {
|
for(int x=0; x<=i; x++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user