Commit 854b4ef8 authored by amandaghassaei's avatar amandaghassaei

small changes

parent df0b4720
...@@ -68,6 +68,8 @@ function initControls(globals){ ...@@ -68,6 +68,8 @@ function initControls(globals){
globals.warn("No crease pattern available for FOLD format."); globals.warn("No crease pattern available for FOLD format.");
return; return;
} }
globals.pausedForPatternView = globals.threeView.running();
globals.model.pause();
globals.navMode = "pattern"; globals.navMode = "pattern";
$("#navPattern").parent().addClass("open"); $("#navPattern").parent().addClass("open");
$("#navSimulation").parent().removeClass("open"); $("#navSimulation").parent().removeClass("open");
...@@ -77,6 +79,7 @@ function initControls(globals){ ...@@ -77,6 +79,7 @@ function initControls(globals){
$("#navPattern").parent().removeClass("open"); $("#navPattern").parent().removeClass("open");
setLink("#navSimulation", function(){ setLink("#navSimulation", function(){
globals.navMode = "simulation"; globals.navMode = "simulation";
if (globals.pausedForPatternView) globals.model.resume();
$("#navSimulation").parent().addClass("open"); $("#navSimulation").parent().addClass("open");
$("#navPattern").parent().removeClass("open"); $("#navPattern").parent().removeClass("open");
$("#svgViewer").hide(); $("#svgViewer").hide();
......
...@@ -64,6 +64,8 @@ function initGlobals(){ ...@@ -64,6 +64,8 @@ function initGlobals(){
triangulateFOLDexport: false, triangulateFOLDexport: false,
exportFoldAngle: false, exportFoldAngle: false,
pausedForPatternView: false,
userInteractionEnabled: false, userInteractionEnabled: false,
vrEnabled: false vrEnabled: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment