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

added some missing conformal::configure()

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-08 13:50:13 +02:00
parent 31164e12d6
commit 84af8f2b32
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rug.cpp
View File

@ -376,6 +376,7 @@ void buildTorusRug() {
using namespace torusconfig; using namespace torusconfig;
calcparam_rug(); calcparam_rug();
conformal::configure();
struct toruspoint { struct toruspoint {
int x,y; int x,y;
@ -1280,6 +1281,7 @@ void prepareTexture() {
dynamicval<eStereo> d(vid.stereo_mode, sOFF); dynamicval<eStereo> d(vid.stereo_mode, sOFF);
calcparam_rug(); calcparam_rug();
conformal::configure();
glbuf->enable(); glbuf->enable();
current_display->set_viewport(0); current_display->set_viewport(0);
@ -1785,6 +1787,7 @@ hyperpoint gethyper(ld x, ld y) {
double px = rx1 * TEXTURESIZE, py = (1-ry1) * TEXTURESIZE; double px = rx1 * TEXTURESIZE, py = (1-ry1) * TEXTURESIZE;
calcparam_rug(); calcparam_rug();
conformal::configure();
hyperpoint h = hr::gethyper(px, py); hyperpoint h = hr::gethyper(px, py);
calcparam(); calcparam();

2
textures.cpp
View File

@ -936,6 +936,7 @@ bool texture_config::load() {
if(!data.readtexture(texturename)) return false; if(!data.readtexture(texturename)) return false;
if(!data.loadTextureGL()) return false; if(!data.loadTextureGL()) return false;
calcparam(); calcparam();
conformal::configure();
drawthemap(); drawthemap();
config.tstate = config.tstate_max = tsActive; config.tstate = config.tstate_max = tsActive;
string s = move(texture_tuner); string s = move(texture_tuner);
@ -1516,6 +1517,7 @@ void texture_config::remap() {
else if(tstate == tsAdjusting) { else if(tstate == tsAdjusting) {
printf("perform_mapping %d/%d\n", config.tstate, config.tstate_max); printf("perform_mapping %d/%d\n", config.tstate, config.tstate_max);
calcparam(); calcparam();
conformal::configure();
drawthemap(); drawthemap();
perform_mapping(); perform_mapping();
finish_mapping(); finish_mapping();