1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-08 06:59:55 +00:00
Commit Graph

241 Commits

Author SHA1 Message Date
Arthur O'Dwyer
d163a01b8a Remove USE_UNORDERED_MAP because it has bit-rotted.
Trying to compile with `-DUSE_UNORDERED_MAP` produces lots of compiler errors
like these, because of missing `std::hash` specializations.
Also, `#define unordered_map map` is just evil!

```
./nonisotropic.cpp:875:36: note: in instantiation of template class 'std::__1::unordered_map<hr::nilv::mvec, hr::heptagon *,
      std::__1::hash<hr::nilv::mvec>, std::__1::equal_to<hr::nilv::mvec>, std::__1::allocator<std::__1::pair<const hr::nilv::mvec, hr::heptagon
      *> > >' requested here
    unordered_map<mvec, heptagon*> at;
                                   ^

./nonisotropic.cpp:239:58: note: in instantiation of template class 'std::__1::unordered_map<std::__1::pair<hr::heptagon *, hr::heptagon *>,
      hr::heptagon *, std::__1::hash<std::__1::pair<hr::heptagon *, hr::heptagon *> >, std::__1::equal_to<std::__1::pair<hr::heptagon *,
      hr::heptagon *> >, std::__1::allocator<std::__1::pair<const std::__1::pair<hr::heptagon *, hr::heptagon *>, hr::heptagon *> > >'
      requested here
    unordered_map<pair<heptagon*, heptagon*>, heptagon*> at;
                                                         ^

./nonisotropic.cpp:457:49: error: no matching member function for call to 'iadj'
      while(h1->distance < h2->distance) back = iadj(h2, down) * back, h2 = h2->cmove(down);
                                                ^~~~
cell.cpp:42:15: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  transmatrix iadj(heptagon *h, int d) {
              ^
cell.cpp:41:22: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  struct transmatrix iadj(cell *c, int i) { cell *c1 = c->cmove(i); return adj(c1, c->c.spin(i)); }
                     ^
```
2020-10-19 13:15:29 -04:00
Zeno Rogue
052854ec74 hyperweb:: auto-resizing 2020-10-15 16:35:44 +02:00
Zeno Rogue
d64c5e338c extra guards 2020-10-15 16:33:52 +02:00
Zeno Rogue
f41ce7c42a changed the WEB size so that the sidemenu is used by default 2020-09-22 15:50:38 +02:00
Zeno Rogue
e05256725e EX setcameraangle 2020-09-11 11:03:53 +02:00
Zeno Rogue
fc283bd527 allow larger letters 2020-08-01 16:41:44 +02:00
Zeno Rogue
82f32607e6 MAJOR CHANGE: replaced (transmatrix,band_shift) pair with shiftmatrix 2020-07-28 22:06:14 +02:00
Zeno Rogue
f3c35de400 more guards cont. 2020-07-03 14:48:36 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
6f6586b3f2
Merge branch 'master' into hooks-naming 2020-04-19 13:39:07 +02:00
Zeno Rogue
9c61da86f3 removed unused global variable 2020-04-17 15:48:10 +02:00
Zeno Rogue
0472bf764f moved all projection-related parameters to a special struct; another copy of that struct created for rug 2020-04-17 00:53:58 +02:00
Arthur O'Dwyer
0d42168139 Make hookset<T> a pointer type, just like purehookset.
No more declaring `hookset<T> *hooks_foo`; now it's just
`hookset<T> hooks_foo` at global scope. This clears the way to
make `hookset<T>` into a class type if we want.
2020-04-12 10:50:18 -04:00
Zeno Rogue
134d7493ed added margins for mobiles 2020-04-06 09:13:20 +02:00
Zeno Rogue
9a84dfb497 adjusted mobile to the new system 2020-04-06 09:13:20 +02:00
Kai A. Hiller
f0cdc21dea Fix setting doublebuffering 2020-03-26 11:17:27 +01:00
Zeno Rogue
e564622a48 rewritten undo: part 1 2020-03-07 04:47:10 +01:00
Zeno Rogue
2e0cf7fe53 band_shift correctly applied in shader-based band model 2019-12-27 00:49:58 +01:00
Zeno Rogue
26fb19e7a8 subdivided game.cpp; split movepcto into separate functions 2019-12-08 20:07:02 +01:00
Zeno Rogue
8386a14d6a 'circles' are now drawn on all copies in quotient geometries 2019-12-06 14:03:02 +01:00
Zeno Rogue
982f01e6e5 tracking the specific copy of the player in confusing geometries 2019-11-23 19:05:24 +01:00
Zeno Rogue
838d6a583a removed namespace stereo which is no longer used 2019-11-16 03:03:09 +01:00
Zeno Rogue
b46d647752 current_display macros now work outside namespace hr 2019-11-14 17:21:53 +01:00
Zeno Rogue
3eee611eca nisot::local_perspective moved to display_data 2019-11-14 17:20:55 +01:00
Zeno Rogue
aeaaf7586a refactored map functions: ddspin, iddspin, spacedist, spin_angle, virtualRebase[simple], adj 2019-11-14 16:51:50 +01:00
Zeno Rogue
ef9e2236ba viewctr is no more... major reduction of redundancy/complexity 2019-11-14 00:26:50 +01:00
Zeno Rogue
af9b049057 fixed the rug becoming black on some computers when resizing window or during the start animation 2019-11-03 15:52:19 +01:00
Zeno Rogue
1eb27b3393 prevent losing Rug texture on open/close window 2019-11-03 15:13:40 +01:00
Zeno Rogue
68c7514c2c clear shaders on resetGL 2019-10-26 17:02:20 +02:00
Zeno Rogue
d68ce01b63 gradient function considers 4 coordinates 2019-10-21 22:34:37 +02:00
Zeno Rogue
09fcd14aa7 redesigned shader system 2019-10-21 22:34:20 +02:00
Zeno Rogue
cfc36c7bda fisheye and ball models in nonisotropic spaces 2019-10-05 12:34:14 +02:00
Zeno Rogue
ec465b2afc separate shader for stretched Sol, to avoid glitches 2019-10-04 13:03:50 +02:00
Zeno Rogue
d69cb4e946 SolN manifold 2019-10-03 20:10:48 +02:00
Zeno Rogue
d6ab96f821 non-isotropic hyperbolic space 2019-10-01 05:03:46 +02:00
Zeno Rogue
5c1568d288 added CAP_VR 2019-09-26 13:23:10 +02:00
Zeno Rogue
a59dc8be58 fixed binocular vision (isotropic only for now) 2019-09-26 13:23:10 +02:00
Zeno Rogue
2a950369ba solv:: CAP_SOLV 2019-09-13 17:45:31 +02:00
Zeno Rogue
334ffd644a hyperweb compiles 2019-09-13 03:47:55 +02:00
Zeno Rogue
d1bf6fef5e replaced product::product_sphere() 2019-09-12 22:50:16 +02:00
Zeno Rogue
848eb8f48b export everything: modules compiled separately 2019-09-12 22:50:16 +02:00
Zeno Rogue
82f24b4b6c exporting necessary stuff all over (in progress) 2019-09-12 22:50:16 +02:00
Zeno Rogue
caf838ed22 accessors created for shader uniforms 2019-09-12 22:50:16 +02:00
Zeno Rogue
9647cbd47e added #include hyper.h to all cpp files 2019-09-12 22:50:16 +02:00
Zeno Rogue
98ddecc63e removed init.cpp 2019-09-12 22:50:16 +02:00
Zeno Rogue
02269267c9 slr:: drawing of looped images, better shader in general, special sightrange setting 2019-09-12 22:50:15 +02:00
Zeno Rogue
1e6970ca28 hybrid:: refactored the common parts of prod and sl2, also used them when applicable 2019-09-12 22:50:15 +02:00
Zeno Rogue
136b931609 PSL(2,R) 2019-09-12 22:50:15 +02:00
Zeno Rogue
0811f8f2d0 product:: no crash on load when saved 2019-09-12 22:50:14 +02:00
Zeno Rogue
e5fb06e6cd product:: HUD items displayed correctly 2019-09-12 22:50:14 +02:00
Zeno Rogue
43a3d0130e product:: shader-side H2xE 2019-09-12 22:50:13 +02:00
Zeno Rogue
00f4f4fca5 fully turnable product spaces 2019-09-12 22:50:13 +02:00
Zeno Rogue
6958cbcbd9 product:: preliminary version (no turning) 2019-09-12 22:50:13 +02:00
Zeno Rogue
f3dd779947 no more crash when saving config in arcm 2019-09-12 22:50:13 +02:00
Zeno Rogue
96bf478482 renamed DIM to GDIM 2019-09-12 22:50:13 +02:00
Zeno Rogue
8b1c7bffe4 initial reformatting of comments for Doxygen 2019-09-12 22:50:13 +02:00
Zeno Rogue
0ef57dde15 further cleanup 2019-09-12 22:50:13 +02:00
Zeno Rogue
ad03115097 further cleanup 2019-09-12 22:50:13 +02:00
Zeno Rogue
609d1b91d3 further cleanup 2019-09-12 22:50:13 +02:00
Zeno Rogue
5ea055b39e split namespace conformal into models and history 2019-09-12 22:50:12 +02:00
Zeno Rogue
a76a5dd265 further cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
c2d56fb9bc autohdr.h applied in more files 2019-09-12 22:50:12 +02:00
Zeno Rogue
24a2e6178a unused function displaynum removed 2019-09-12 22:50:12 +02:00
Zeno Rogue
8ac64fc2a0 nilv:: Nil shader, and improved geodesics 2019-09-12 22:50:11 +02:00
Zeno Rogue
9350053c49 renamed mdSolPerspective to mdGeodesic 2019-09-12 22:50:11 +02:00
Zeno Rogue
4f27b12ca2 nilv:: preliminary implementation 2019-09-12 22:50:11 +02:00
Zeno Rogue
1e81ed606d solv:: graphical coordinates are now always standard -- local_perspective used in all models 2019-09-12 22:50:10 +02:00
Zeno Rogue
90aa7b5c02 solv:: removed ILP for simplicity and better performance 2019-09-12 22:50:10 +02:00
Zeno Rogue
60778a6896 new renderer for Solv 2019-09-12 22:50:10 +02:00
Zeno Rogue
a3a22598ba delete[] xbuffer 2019-09-12 22:50:10 +02:00
Zeno Rogue
2f804e9f1e fixes for older compilers 2019-09-12 22:50:10 +02:00
Zeno Rogue
598603c937 geodesics in Sol 2019-09-12 22:50:09 +02:00
Zeno Rogue
946570da31 moved zpush from 3dmodels to hyperpoint 2019-09-12 22:50:09 +02:00
Zeno Rogue
e5e0dfbac1 correct gdpushing of UTF8 224-240 2019-09-12 22:50:08 +02:00
Zeno Rogue
5476b33e94 fixed to work on OPENGL 1.0 2019-09-12 22:50:08 +02:00
Zeno Rogue
0f98146d20 3D:: correct shift matrix in stereo mode 2019-09-12 22:50:08 +02:00
Zeno Rogue
3da305b4ca fog is now affected by the background color 2019-09-12 22:50:06 +02:00
Zeno Rogue
5519252fd0 added some missing CAP_* guards 2019-09-12 22:50:04 +02:00
Zeno Rogue
b52c093d58 dual:: fixed setfsize to affect both sizes 2019-09-12 22:50:04 +02:00
Zeno Rogue
1e07644c43 fixed cgi possibly generated incorrectly (especially in dual) 2019-09-12 22:50:04 +02:00
Zeno Rogue
8295251cdc multigame support, including dualmode 2019-09-12 22:50:03 +02:00
Zeno Rogue
7a4ee025d8 3D:: reload floor textures 2019-09-12 22:50:03 +02:00
Zeno Rogue
b6e303ec7d MAJOR refactoring: all geometry-dependent data (tessf, geom3::, shapes, hpc) are now contained in a structure 2019-09-12 22:50:03 +02:00
Zeno Rogue
6aeba2d906 fixed glDepthMask and thus shadows 2019-09-12 22:50:00 +02:00
Zeno Rogue
3e7b29a188 3D:: fixed how elliptic geometry works 2019-09-12 22:50:00 +02:00
Zeno Rogue
5c76509ded always clear depth, not depending on the current need 2019-09-12 22:50:00 +02:00
Zeno Rogue
df3e21b310 debug cleanup 2019-09-12 22:50:00 +02:00
Zeno Rogue
9a21401b9c item/monster icons in 3d 2019-09-12 22:49:56 +02:00
Zeno Rogue
9946ceb877 fixed circle drawing 2019-09-12 22:43:01 +02:00
Zeno Rogue
3b5733c935 enabled antialiasing in web 2019-09-12 22:43:01 +02:00
Zeno Rogue
c8e950cd40 added some missing CAP_ and MAXMDIM guards 2019-09-12 22:43:01 +02:00
Zeno Rogue
5d77c86658 scrdist_text removed 2019-09-12 22:43:00 +02:00
Zeno Rogue
5895540ae9 removed mdText as it was equivalent to mdUnchanged 2019-09-12 22:43:00 +02:00
Zeno Rogue
c19ffb3597 fixes to projection streamlining 2019-09-12 22:43:00 +02:00
Zeno Rogue
3c9e4db46e major cleanup of projection setting 2019-09-12 22:43:00 +02:00
Zeno Rogue
b07a5a5c69 removed transparency from monsters in 3D 2019-09-12 22:42:59 +02:00
Zeno Rogue
f3e0ae4904 fixed using for C++11 2019-09-12 22:38:47 +02:00
Zeno Rogue
31427a6d24 3d:: fixed halfplane_scale in GL 2019-09-12 22:38:47 +02:00
Zeno Rogue
8ea5a618ad 3d:: clipping without OpenGL 2019-09-12 22:38:47 +02:00
Zeno Rogue
2121aacaaf 3d:: clipping configurable 2019-09-12 22:38:47 +02:00