diff --git a/js/controls.js b/js/controls.js index 609237f532efd95b95358614ce6baf81cd447848..a6882bc724caee6153cfc54e67480cff885ad688 100644 --- a/js/controls.js +++ b/js/controls.js @@ -68,6 +68,8 @@ function initControls(globals){ globals.warn("No crease pattern available for FOLD format."); return; } + globals.pausedForPatternView = globals.threeView.running(); + globals.model.pause(); globals.navMode = "pattern"; $("#navPattern").parent().addClass("open"); $("#navSimulation").parent().removeClass("open"); @@ -77,6 +79,7 @@ function initControls(globals){ $("#navPattern").parent().removeClass("open"); setLink("#navSimulation", function(){ globals.navMode = "simulation"; + if (globals.pausedForPatternView) globals.model.resume(); $("#navSimulation").parent().addClass("open"); $("#navPattern").parent().removeClass("open"); $("#svgViewer").hide(); diff --git a/js/globals.js b/js/globals.js index 994e11012c41d52f599e2de4266f446d8e3d08e2..197bc1738381c75852b396e5ff8591db5fb82eee 100644 --- a/js/globals.js +++ b/js/globals.js @@ -64,6 +64,8 @@ function initGlobals(){ triangulateFOLDexport: false, exportFoldAngle: false, + pausedForPatternView: false, + userInteractionEnabled: false, vrEnabled: false