From dba536ea854752f19f709f84f5fb42912c37aab3 Mon Sep 17 00:00:00 2001 From: amandaghassaei Date: Sun, 25 Jun 2017 11:31:59 -0400 Subject: [PATCH] eod --- assets/Tessellations/test.svg | 26 +++++++++++++++++++++----- index.html | 10 +++++----- js/controls.js | 8 ++++---- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/assets/Tessellations/test.svg b/assets/Tessellations/test.svg index b9c7b4d..593a2c1 100644 --- a/assets/Tessellations/test.svg +++ b/assets/Tessellations/test.svg @@ -2,9 +2,25 @@ - - - - + width="5984px" height="4480px" viewBox="-344 2432 5984 4480" enable-background="new -344 2432 5984 4480" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + diff --git a/index.html b/index.html index 5f4d970..d57ec6f 100755 --- a/index.html +++ b/index.html @@ -686,7 +686,7 @@
- Fold Angle :
+ Fold Percent :
@@ -702,7 +702,7 @@
- Fold Angle (-1 to 1) :
+ Fold Percent :


@@ -895,8 +895,8 @@


Instructions:

    -
  • Slide the Fold Angle slider to control the degree of folding of the pattern (1 is fully folded, 0 is unfolded, - and -1 is fully folded with the opposite mountain/valley assignments).
    • +
  • Slide the Fold Percent slider to control the degree of folding of the pattern (100% is fully folded, 0% is unfolded, + and -100% is fully folded with the opposite mountain/valley assignments).
  • Drag to rotate the model, scroll to zoom.
  • Import other patterns under the Examples menu.
  • Upload your own crease patterns in SVG or FOLD formats, following these instructions.
    • @@ -1010,7 +1010,7 @@ If the simulation looks choppy, consider lowering the Num simulation steps per render setting under Animation Settings in the right hand menu.

    VR mode currently does not support all the UI of the regular app, so you will need someone in the "outside world" to - help you load new files, change the fold angle, etc. + help you load new files, change the fold percent, etc.

diff --git a/js/controls.js b/js/controls.js index 1096093..8bbe2ff 100755 --- a/js/controls.js +++ b/js/controls.js @@ -249,13 +249,13 @@ function initControls(globals){ }); var creasePercentNavSlider, creasePercentSlider; - creasePercentSlider = setSliderInput("#creasePercent", globals.creasePercent, -1, 1, 0.01, function(val){ - globals.creasePercent = val; + creasePercentSlider = setSliderInput("#creasePercent", globals.creasePercent*100, -100, 100, 1, function(val){ + globals.creasePercent = val/100; globals.shouldChangeCreasePercent = true; creasePercentNavSlider.slider('value', val); }); - creasePercentNavSlider = setSlider("#creasePercentNav>div", globals.creasePercent, -1, 1, 0.01, function(val){ - globals.creasePercent = val; + creasePercentNavSlider = setSlider("#creasePercentNav>div", globals.creasePercent*100, -100, 100, 1, function(val){ + globals.creasePercent = val/100; globals.shouldChangeCreasePercent = true; creasePercentSlider.slider('value', val); $('#creasePercent>input').val(val); -- GitLab