mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-04-29 14:13:11 +00:00
Code Issues Releases Wiki Activity

crystal::rug:: correct centering

Browse Source
This commit is contained in:
Zeno Rogue 2018-12-04 18:10:36 +01:00
parent 22c6f02cc9
commit aa1b102b78
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crystal.cpp
View File

@ -755,6 +755,8 @@ ld crug_rotation[MAXDIM][MAXDIM];
int ho = 1; int ho = 1;
ldcoord rug_center;
void init_rotation() { void init_rotation() {
for(int i=0; i<MAXDIM; i++) for(int i=0; i<MAXDIM; i++)
for(int j=0; j<MAXDIM; j++) for(int j=0; j<MAXDIM; j++)
@ -783,6 +785,7 @@ void next_home_orientation() {
hyperpoint coord_to_flat(ldcoord co) { hyperpoint coord_to_flat(ldcoord co) {
hyperpoint res = hpxyz(0, 0, 0); hyperpoint res = hpxyz(0, 0, 0);
co = co - rug_center;
for(int a=0; a<MAXDIM; a++) for(int a=0; a<MAXDIM; a++)
for(int b=0; b<3; b++) for(int b=0; b<3; b++)
res[b] += crug_rotation[b][a] * co[a]; res[b] += crug_rotation[b][a] * co[a];
@ -807,6 +810,22 @@ void apply_rotation(const transmatrix t) {
} }
} }
void centerrug(ld aspd) {
if(vid.sspeed >= 4.99) aspd = 1000;
auto m = crystal_map();
ldcoord at = m->get_coord(cwt.at) - rug_center;
ld R = sqrt(at|at);
if(R < 1e-9) rug_center = m->get_coord(cwt.at);
else {
aspd *= (2+3*R*R);
if(aspd > R) aspd = R;
rug_center = rug_center + at * aspd / R;
}
}
void build_rugdata() { void build_rugdata() {
using namespace rug; using namespace rug;
rug::clear_model(); rug::clear_model();

1
hyper.h
View File

@ -4164,6 +4164,7 @@ namespace crystal {
ld compass_angle(); ld compass_angle();
string compass_help(); string compass_help();
void may_place_compass(cell *c); void may_place_compass(cell *c);
void centerrug(ld aspd);
} }
hyperpoint get_warp_corner(cell *c, int cid); hyperpoint get_warp_corner(cell *c, int cid);

4
hypgraph.cpp
View File

@ -956,6 +956,10 @@ void spinEdge(ld aspd) {
} }
void centerpc(ld aspd) { void centerpc(ld aspd) {
if(geometry == gCrystal)
crystal::centerrug(aspd);
if(ors::mode == 2 && vid.sspeed < 5) return; if(ors::mode == 2 && vid.sspeed < 5) return;
if(vid.sspeed >= 4.99) aspd = 1000; if(vid.sspeed >= 4.99) aspd = 1000;
DEBB(DF_GRAPH, (debugfile,"center pc\n")); DEBB(DF_GRAPH, (debugfile,"center pc\n"));