From 43a22ca1352bcec8e20322e38f7642e3651cd320 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 3 May 2018 12:15:48 +0200 Subject: [PATCH] texture:: fixed some situations where texture where not remapped after changing parameters --- textures.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/textures.cpp b/textures.cpp index 40078cc2..be49b8e8 100644 --- a/textures.cpp +++ b/textures.cpp @@ -653,6 +653,7 @@ void applyMagic() { } } } + config.perform_mapping(); } enum eTexturePanstate {tpsModel, tpsMove, tpsScale, tpsAffine, tpsZoom, tpsProjection, tpsCell, tpsTriangle, tpsTune}; @@ -700,6 +701,7 @@ void mousemovement() { if(nonzero && !newmove) { View = inverse(spintox(mouseeu)) * spintox(lastmouse) * View; vid.scale = vid.scale * sqrt(intvalxy(C0, mouseeu)) / sqrt(intvalxy(C0, lastmouse)); + config.perform_mapping(); } if(nonzero) lastmouse = mouseeu; newmove = false; @@ -1452,7 +1454,7 @@ void texture_config::remap(eTextureState old_tstate, eTextureState old_tstate_ma } } } - else if(old_tstate >= tsAdjusting) { + else if(old_tstate >= tsAdjusting || old_tstate_max >= tsAdjusting) { printf("perform_mapping %d/%d\n", config.tstate, config.tstate_max); calcparam(); drawthemap();