1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 23:10:26 +00:00

hybrid knows actual geometry

This commit is contained in:
Zeno Rogue 2019-08-25 19:49:30 +02:00
parent 3e715440cb
commit 7feb2ddcb3

View File

@ -584,9 +584,10 @@ EX namespace hybrid {
hrmap *pmap; hrmap *pmap;
geometry_information *pcgip; geometry_information *pcgip;
geometry actual_geometry;
template<class T> auto in_actual(const T& t) -> decltype(t()) { template<class T> auto in_actual(const T& t) -> decltype(t()) {
dynamicval<eGeometry> g(geometry, gProduct); dynamicval<eGeometry> g(geometry, actual_geometry);
dynamicval<geometry_information*> gc(cgip, pcgip); dynamicval<geometry_information*> gc(cgip, pcgip);
dynamicval<hrmap*> gu(currentmap, pmap); dynamicval<hrmap*> gu(currentmap, pmap);
dynamicval<hrmap*> gup(pmap, NULL); dynamicval<hrmap*> gup(pmap, NULL);
@ -605,6 +606,7 @@ EX namespace hybrid {
template<class T> auto in_underlying(const T& t) -> decltype(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<hrmap*> gag(actual_geometry, geometry);
dynamicval<eGeometry> g(geometry, underlying); dynamicval<eGeometry> g(geometry, underlying);
dynamicval<geometry_information*> gc(cgip, underlying_cgip); dynamicval<geometry_information*> gc(cgip, underlying_cgip);
dynamicval<hrmap*> gu(currentmap, underlying_map); dynamicval<hrmap*> gu(currentmap, underlying_map);