mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-13 01:20:09 +00:00
Code Issues Releases Wiki Activity

compilation in C++11

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-19 14:58:39 +02:00
parent 599783d4ab
commit fe266d3485
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drawing.cpp
View File

@ -919,7 +919,8 @@ void draw_s2xe(dqi_poly *p, dqi_poly *npoly) {
vector<point_data> pd; vector<point_data> pd;
for(int i=0; i<p->cnt; i++) { for(int i=0; i<p->cnt; i++) {
hyperpoint h = p->V * glhr::gltopoint( (*p->tab)[p->offset+i]); hyperpoint h = p->V * glhr::gltopoint( (*p->tab)[p->offset+i]);
auto& next = pd.emplace_back(); pd.emplace_back();
auto& next = pd.back();
auto dp = product_decompose(h); auto dp = product_decompose(h);
next.direction = dp.second; next.direction = dp.second;
next.z = dp.first; next.z = dp.first;

8
nonisotropic.cpp
View File

@ -566,7 +566,7 @@ EX namespace product {
hrmap *pmap; hrmap *pmap;
geometry_information *pcgip; geometry_information *pcgip;
template<class T> auto in_actual(const T& t) { template<class T> auto in_actual(const T& t) -> decltype(t()) {
dynamicval<eGeometry> g(geometry, gProduct); dynamicval<eGeometry> g(geometry, gProduct);
dynamicval<geometry_information*> gc(cgip, pcgip); dynamicval<geometry_information*> gc(cgip, pcgip);
dynamicval<hrmap*> gu(currentmap, pmap); dynamicval<hrmap*> gu(currentmap, pmap);
@ -583,7 +583,7 @@ EX namespace product {
heptagon *getOrigin() override { return underlying_map->getOrigin(); } heptagon *getOrigin() override { return underlying_map->getOrigin(); }
template<class T> auto in_underlying(const T& t) { template<class T> auto in_underlying(const T& t) -> decltype(t()) {
pcgip = cgip; pcgip = cgip;
dynamicval<hrmap*> gpm(pmap, this); dynamicval<hrmap*> gpm(pmap, this);
dynamicval<eGeometry> g(geometry, underlying); dynamicval<eGeometry> g(geometry, underlying);
@ -593,7 +593,7 @@ EX namespace product {
} }
cell *getCell(cell *u, int h) { cell *getCell(cell *u, int h) {
cell*& c = at[{u, h}]; cell*& c = at[make_pair(u, h)];
if(!c) { c = newCell(u->type+2, u->master); where[c] = {u, h}; } if(!c) { c = newCell(u->type+2, u->master); where[c] = {u, h}; }
return c; return c;
} }
@ -724,7 +724,7 @@ EX namespace product {
} }
#if HDR #if HDR
template<class T> auto in_underlying_geometry(const T& f) { template<class T> auto in_underlying_geometry(const T& f) -> decltype(f()) {
if(!prod) return f(); if(!prod) return f();
dynamicval<eGeometry> g(geometry, underlying); dynamicval<eGeometry> g(geometry, underlying);
dynamicval<geometry_information*> gc(cgip, underlying_cgip); dynamicval<geometry_information*> gc(cgip, underlying_cgip);