mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-15 01:34:49 +00:00
Code Issues Releases Wiki Activity
8,952 Commits 1 Branch 65 Tags 131 MiB
dbcc88b42a
Commit Graph

296 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
a0865998db mapeditor now saves/loads file online 2020-09-21 12:02:23 +02:00
Zeno Rogue
9f1762f0c1 mapstream:: export saveMap, loadMap, and a hook for special saving/loading 2020-09-21 12:02:07 +02:00
Zeno Rogue
3e66b520ba draw editor:: dt_finish 2020-09-21 12:01:22 +02:00
Zeno Rogue
e26f8f5a5b optimized inverses 2020-09-16 23:49:17 +02:00
Zeno Rogue
e74eeca2c3 the 'copy' button in the Map Editor works with the mouse now 2020-09-16 23:49:17 +02:00
Zeno Rogue
8173fc0504 more guards 2020-08-03 23:25:08 +02:00
Zeno Rogue
a66136625d save/load arb geometry 2020-08-02 12:56:43 +02:00
Zeno Rogue
3505f17460 redone modecode 2020-08-02 12:55:37 +02:00
Zeno Rogue
ecbd8806e7 added some missing guards 2020-07-30 02:29:59 +02:00
Zeno Rogue
6e0de94ff1 fixed discrepancy in last 2020-07-28 22:06:14 +02:00
Zeno Rogue
b6872b66a1 mapeditor:: in_front_dist now works with mouseaim sensitivity off 2020-07-28 22:06:14 +02:00
Zeno Rogue
92715e5799 fixed weird shadow of Text button 2020-07-28 22:06:14 +02:00
Zeno Rogue
d5950e7cf9 drawing tool now works in 3D, and if you are drawing inside a movement animation 2020-07-28 22:06:14 +02:00
Zeno Rogue
dcda11d740 fixed a bug while saving/loading INVERSE maps 2020-07-28 22:06:14 +02:00
Zeno Rogue
82f32607e6 MAJOR CHANGE: replaced (transmatrix,band_shift) pair with shiftmatrix 2020-07-28 22:06:14 +02:00
Zeno Rogue
351eda2b5d generalized PSL to ~SL (discrepancies still appear) 2020-07-24 02:30:50 +02:00
Zeno Rogue
7deb98154f fixed save/load text 2020-07-12 21:39:34 +02:00
Zeno Rogue
bcd2a6230f text in drawing tool 2020-07-12 21:39:34 +02:00
Zeno Rogue
3f53698f36 fixed unused variables in mapeditor 2020-07-04 13:33:14 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
c5a7b15e98 an option to start in draw editor, and to clear shapes 2020-05-01 12:27:49 +02:00
Zeno Rogue
38d668ee7c text in drawing tool (not yet addable) 2020-04-26 11:01:45 +02:00
Zeno Rogue
009b05c919 reworked some modifier keys 2020-04-19 22:43:16 +02:00
Zeno Rogue
6f6586b3f2
Merge branch 'master' into hooks-naming 2020-04-19 13:39:07 +02:00
Zeno Rogue
4ffbe27784 pen width and paint color are now defined in mapeditor.cpp not texture.cpp 2020-04-18 16:10:56 +02:00
Zeno Rogue
f504eef7df fixed the lacking virtual desctructor 2020-04-18 14:32:54 +02:00
Zeno Rogue
c24658bf38 more drawing tool improvements; no crash drawing tool; restart editors will ask for confirmation 2020-04-17 20:34:49 +02:00
Zeno Rogue
62c6651392 drawing tool improvements 2020-04-17 20:18:50 +02:00
Zeno Rogue
ad233a1e19 drawing tool 2020-04-17 20:04:33 +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
934e3d9a42 Consistently name every hookset with prefix hooks_. NFC. 
I'm sure this causes massive merge-conflicts in the non-public code,
but I think it'd be a good idea, if only to avoid confusion between
e.g. `clearMemory` and the-variable-formerly-known-as `clearmemory`.
 2020-04-12 10:49:32 -04:00
Zeno Rogue
e4a8b73819 nisot:: nicer precision setting 2020-04-11 15:08:24 +02:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
b2a6ae304d fixed a bug in loading maps from old versions 2020-03-22 09:48:24 +01:00
Zeno Rogue
2ccb48f765 WFC can be experimented with 2020-03-07 04:47:10 +01:00
Zeno Rogue
27e19ca5ca mapeditor:: canvas_default_wall can be set now 2020-01-28 17:58:55 +01:00
Zeno Rogue
2271a67506 removed the MAX_EDGE limit 2020-01-18 16:03:32 +01:00
Zeno Rogue
31b9310552 fixup mineadj -> mine_adjacency_rule 2019-12-27 11:57:23 +01:00
Zeno Rogue
cb4ce17598 mapeditor:: read/write mineadj 2019-12-27 11:33:22 +01:00
Zeno Rogue
c247936e34 removed the functions queuechr -- use queuestr now 2019-12-26 23:38:28 +01:00
Zeno Rogue
d5c8aebf16 renamed binary:: to bt:: and binarytiling to bt::in() 2019-12-14 12:05:01 +01:00
Zeno Rogue
f772f9b7fd replaced 'archimedean' with 'arcm::in()' 2019-12-14 11:57:23 +01:00
Zeno Rogue
0a9ec78c18 remplace euclid6, euclid4, 'euclid && \!archimedean && \!penrose' with standard_tiling(), euc::in(dimension, s7) 2019-12-14 11:57:23 +01:00
Zeno Rogue
ddb5d07ff6 cleanup in Euclidean 2019-12-08 10:59:09 +01:00
Zeno Rogue
59e58693f4 mapeditor:: correct and efficient ghosts when using a larger range or quotient spaces 2019-12-06 14:03:54 +01:00
Zeno Rogue
25bc0f56de kth-turn product space (via CLI) 2019-11-30 18:06:48 +01:00
Zeno Rogue
0ff27cc5b8 save torus periods 2019-11-30 18:06:47 +01:00
Zeno Rogue
1cba452f07 rewritten the Euclidean geometry 2019-11-30 18:06:47 +01:00
Zeno Rogue
9b329ef901 fixed loading product maps (especially Archimedean product maps) 2019-11-23 23:09:06 +01:00
Zeno Rogue
222e4aa78b mapeditor:: save geometry details 2019-11-23 21:08:47 +01:00
Zeno Rogue
021f99aafa save compatibility: field quotient configured 2019-11-22 23:16:06 +01:00
Zeno Rogue
85a08d205d refactored celldraw 2019-10-25 12:44:41 +02:00
Zeno Rogue
848eb8f48b export everything: modules compiled separately 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
96d7496043 refactored all the operations on View 2019-09-12 22:50:15 +02:00
Zeno Rogue
a03eb0d913 fixed new geometry handling for Archimedean 2019-09-12 22:50:15 +02:00
Zeno Rogue
2f954d0538 nicer handling of WDIM, GDIM, MDIM, sig 2019-09-12 22:50:15 +02:00
Zeno Rogue
201098efe9 convenience functions zforward_dir and zpush0 2019-09-12 22:50:15 +02:00
Zeno Rogue
c83b5b9ad8 product:: draw editor 2019-09-12 22:50:14 +02:00
Zeno Rogue
96bf478482 renamed DIM to GDIM 2019-09-12 22:50:13 +02:00
Zeno Rogue
cd4bee08f7 disabled just_direction in mapeditor distances 2019-09-12 22:50:13 +02:00
Zeno Rogue
aede994403 mapeditor:: geodesic spheres and constant X/Y/Z in nonisotropic, also the grid is configurable 2019-09-12 22:50:13 +02:00
Zeno Rogue
0b4cba3c23 mapeditor:: geodesic spherical coordinates in nisot, works correctly in 3D 2019-09-12 22:50:13 +02:00
Zeno Rogue
cc0584f7d1 mapeditor:: fixed UI elements crashing into each other 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
4ec7652861 cleanup mapeditor 2019-09-12 22:50:12 +02:00
Zeno Rogue
a76a5dd265 further cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
f4eda1d76e removed function fixdir 2019-09-12 22:50:12 +02:00
Zeno Rogue
c131e21198 namespace hyperpoint_vec removed 2019-09-12 22:50:12 +02:00
Zeno Rogue
9565ce198f fixed a crash on loading saved maps 2019-09-12 22:50:11 +02:00
Zeno Rogue
dd212d756b fixed the monster color in the minimap for Dragons etc 2019-09-12 22:50:08 +02:00
Zeno Rogue
f35e383214 fixed a crash in draw editor 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
949b0d60db mapedtior:: fixed loading arcm maps 2019-09-12 22:50:04 +02:00
Zeno Rogue
1c6e6bafb4 moved the parameters from geom3:: to videopar 2019-09-12 22:50:04 +02:00
Zeno Rogue
e8417e5c51 dual:: mapeditor save feature works correctly 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
1b93ecd5a3 vernum uniformization 2019-09-12 22:50:02 +02:00
Zeno Rogue
f7d580fa9c replaced fts variants with a single fts 2019-09-12 22:50:02 +02:00
Zeno Rogue
8518f97ded text files are now read with scan(fhstream&...) functions and written with print(...) functions 2019-09-12 22:50:02 +02:00
Zeno Rogue
d796635dfa draw: 3d models now should appear correctly 2019-09-12 22:50:01 +02:00
Zeno Rogue
bfb0b3f070 quicker editing of 3d models 2019-09-12 22:50:01 +02:00
Zeno Rogue
bfdb292d5f draw: fixed color changing 2019-09-12 22:50:01 +02:00
Zeno Rogue
89a4daaf53 draw: change grid position in 3D 2019-09-12 22:50:01 +02:00
Zeno Rogue
90b206dec3 draw: 'statue' displayed when editing statues; floors display 'pick something' in 3D 2019-09-12 22:50:01 +02:00
Zeno Rogue
995fea41b4 better point placing in 3D modeller 2019-09-12 22:50:01 +02:00
Zeno Rogue
b85f6e66b1 2d3d:: save always3 when saving map 2019-09-12 22:50:00 +02:00
Zeno Rogue
3da6090320 dialog:: addBoolItem_action, addBoolItem_action_neg, addBoolItem_choice used when applicable 2019-09-12 22:43:00 +02:00
Zeno Rogue
3ac1e45130 backward compatibility after changing NODIR 2019-09-12 22:43:00 +02:00
Zeno Rogue
562f43dc1f throw exception on rspin in 3D 2019-09-12 22:42:59 +02:00
Zeno Rogue
1820919095 draw editor displays all coordinates in 3D 2019-09-12 22:42:59 +02:00
Zeno Rogue
5fb9578000 3d:: draw:: fixed z-level changing 2019-09-12 22:42:58 +02:00
Zeno Rogue
36b4b60d46 3d::draw:: added shading 2019-09-12 22:42:58 +02:00
Zeno Rogue
80d14c0196 add_action_push consistently; improved some menu hotkeys and ordering; improved some naming 2019-09-12 22:42:58 +02:00
Zeno Rogue
a52755bf50 some fixes due to weird action in git 2019-09-12 22:38:43 +02:00
?
699109ef2a 3d:: draw:: model from triangles 2019-09-12 22:38:43 +02:00
?
c46bedd23b 3d::draw:: crosshair 2019-09-12 22:38:42 +02:00
?
41ed04b2ee 3d:: basic adjustment of the graphics editor to 3D 2019-09-12 22:38:42 +02:00
?
f879a2c21c draw:: z-level can now be set for each layer 2019-09-12 22:38:42 +02:00