1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-10-31 19:36:16 +00:00
Commit Graph

74 Commits

Author SHA1 Message Date
Zeno Rogue
b1cb66e468
Merge pull request #129 from Quuxplusone/unordered-map
Remove USE_UNORDERED_MAP because it has bit-rotted.
2020-11-05 20:03:13 +01:00
Zeno Rogue
96d28d173a MXDIM, and some extra comments 2020-11-01 17:37:51 +01:00
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
ade824e97c ray:: partially works in web 2020-10-15 16:37:43 +02:00
Zeno Rogue
35d26d1595 mymake now works with Emscripten 2020-10-12 01:28:50 +02:00
Zeno Rogue
7cc9e146cb enabled CAP_EDIT in ISWEB 2020-09-21 12:04:23 +02:00
Zeno Rogue
6f2e7e90d5 expansion analyzer now can use libgmp for better analysis 2020-07-05 00:55:56 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
dacc93ee50 added limits.h 2020-05-31 17:31:16 +02:00
Zeno Rogue
11ce15a67b CAP_VIDEO 2020-05-22 14:30:45 +02:00
Zeno Rogue
b5219ad0fe moved CAP_NCONF and CAP_RVSLIDES back to rogueviz 2020-05-15 12:04:29 +02:00
Arthur O'Dwyer
36136dab6a Fix some unguarded bits of CAP_BT and CAP_CRYSTAL.
Found by trying to build with `-DISMINI=0`, not that that
comes even close to working.
2020-05-03 21:21:46 -04:00
Arthur O'Dwyer
f2b7746c1b Move all defaulting-of-CAP_FOO to sysconfig.h.
- The phrase `#ifdef CAP_` should never appear anywhere.

- The phrase `#ifndef CAP_` should appear only in sysconfig.h.

- The phrases `#if CAP_` and `#if !CAP_` may appear wherever,
    as long as "sysconfig.h" is included first.

The rules for `CAP_FOO` equally apply to `ISFOO`.

There are many one-off macros still tested with `#ifdef`,
including `HAVE_ACHIEVEMENTS`, `PRINT_ACHIEVEMENTS`,
`FAKEWEB`, `FAKE_SDL`, `EASY`, and `WHATEVER`. I don't
have much grasp on what these are used for or how they're
configured, so I'm leaving them alone.
2020-05-03 15:12:12 -04:00
Zeno Rogue
427410b5cb added #include <cassert> 2020-04-19 14:00:15 +02:00
Zeno Rogue
84cf5d6e3a added missing guards, mostly for CAP_WRL 2020-04-16 21:00:28 +02:00
Zeno Rogue
f150245a72 basic WRL export (no menus) 2020-04-15 11:49:29 +02:00
Arthur O'Dwyer
2461b29ea2 Include <sstream> for the benefit of "hprint.cpp". 2020-03-23 14:45:59 -04:00
Zeno Rogue
64c63b7899 CAP_RAY 2020-03-21 10:49:07 +01:00
Zeno Rogue
5f19b8cb40 mingw threads are used if OLD_MINGW is used, not for all WINDOWS 2020-03-08 11:57:51 +01:00
Zeno Rogue
d0f39ae9a8 ZLIB is now always required 2020-03-07 12:21:25 +01:00
Arthur O'Dwyer
3f129ff6e5 Define GL_SILENCE_DEPRECATION on OSX.
This is gross and inexplicable, but Xcode now spews warnings whenever
you use any part of OpenGL on Mac.
https://www.reddit.com/r/opengl/comments/b44tyu/apple_is_deprecating_opengl/
https://www.reddit.com/r/opengl/comments/8okcf1/opengl_deprecated_in_macos_1014/
Fortunately the workaround for now is to just suppress the warnings.

    In file included from hyper.cpp:26:
    ./glhr.cpp:21:20: error: 'glGetError' is deprecated: first deprecated
          in macOS 10.14 - OpenGL API deprecated. (Define GL_SILENCE_DEPRECATION
          to silence these warnings) [-Werror,-Wdeprecated-declarations]
      GLenum errCode = glGetError();
                       ^
2020-02-16 10:10:50 -05:00
Arthur O'Dwyer
d0a6212fd4 Remove all GCC 4.6 support; new minimum is GCC 5.4. 2020-02-15 16:22:15 -05:00
Zeno Rogue
8c87f123a0 CAP_ZLIB to tell whether we need ZLIB 2020-02-15 14:10:49 +01:00
Zeno Rogue
fa64573971 fixed the thread locking 2020-01-28 17:58:55 +01:00
Zeno Rogue
f20a6bf2f6 zlib used for (de)compression 2020-01-26 00:30:13 +01:00
Zeno Rogue
4fd196c6d8 added _WIN32_WINNT as required by mingw threads 2020-01-18 17:21:33 +01:00
Zeno Rogue
b5d43fd480 threads in MinGW 2020-01-16 18:11:59 +01:00
Zeno Rogue
9444401ffa fixup to last 2020-01-16 18:11:01 +01:00
Zeno Rogue
5382038c4e field quotient discovery 2020-01-16 17:13:57 +01:00
Zeno Rogue
1539d85a45 added <unordered_set> 2019-12-06 14:03:12 +01:00
Zeno Rogue
4bd4e11c7e may combile with ISSTEAM but no CAP_DAILY 2019-11-30 18:06:48 +01:00
Zeno Rogue
e1d6f547a4 fixed GCC46 testing 2019-09-13 19:23:22 +02:00
Zeno Rogue
d4df8a970c improved ONLY_GCC46 2019-09-13 19:07:19 +02:00
Zeno Rogue
2a950369ba solv:: CAP_SOLV 2019-09-13 17:45:31 +02:00
Zeno Rogue
6958cbcbd9 product:: preliminary version (no turning) 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
4422b910c0 header cleanup: rug 2019-09-12 22:50:12 +02:00
Zeno Rogue
c97ab10700 pushed unimplemented Product 2019-09-12 22:50:09 +02:00
Zeno Rogue
54f1ad4163 CAP_MEMORY_RESERVE disabled in WEB 2019-09-12 22:50:09 +02:00
Zeno Rogue
31c99e486f CAP_NOSHADER 2019-09-12 22:50:09 +02:00
Zeno Rogue
fe635cc7d8 CAP_MEMORY_RESERVE and memory reserve handled in mobile (if CAP_MEMORY_RESERVE was 1) 2019-09-12 22:50:08 +02:00
Zeno Rogue
977c5f2d69 CAP_MOUSEGRAB 2019-09-12 22:50:08 +02:00
Zeno Rogue
609fc29119 memory settings saved; adjusted for the lack of get_new_handler on steam 2019-09-12 22:50:06 +02:00
Zeno Rogue
c8e950cd40 added some missing CAP_ and MAXMDIM guards 2019-09-12 22:43:01 +02:00
Zeno Rogue
22c88d0960 moved loadOldConfig to legacy.cpp and disabled it 2019-09-12 22:43:00 +02:00
Zeno Rogue
c25561bb91 fixup for Steam/Windows compilers 2019-09-12 22:38:45 +02:00
?
b52097ebe7 added missing CAP_SHAPES, and changed CAP_SAVE to CAP_FILES 2019-09-12 22:38:42 +02:00
?
54f278963c renamed MAXDIM to MAXMDIM (conflict with crystal) 2019-09-12 22:38:42 +02:00
?
d08e58f404 3d:: 2D/3D is now selectable at runtime 2019-09-12 22:38:40 +02:00
?
e73d2f2f22 some work on 3D view 2019-09-12 22:38:39 +02:00