Commit dba536ea authored by amandaghassaei's avatar amandaghassaei

eod

parent f3f16284
......@@ -2,9 +2,25 @@
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="3456px" height="6912px" viewBox="0 0 3456 6912" enable-background="new 0 0 3456 6912" xml:space="preserve">
<rect x="765.766" y="680" fill="#FFFFFF" stroke="#000000" stroke-miterlimit="10" width="1747.059" height="1541.176"/>
<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="765.766" y1="680" x2="2512.823" y2="2221.177"/>
<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="765.766" y1="2221.177" x2="1639.294" y2="1450.589"/>
<line fill="none" stroke="#FF0000" stroke-miterlimit="10" x1="1639.294" y1="1450.589" x2="2512.823" y2="680"/>
width="5984px" height="4480px" viewBox="-344 2432 5984 4480" enable-background="new -344 2432 5984 4480" xml:space="preserve">
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="282.887" y1="2695.431" x2="-221.668" y2="3199.986"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="282.887" y1="3704.542" x2="-221.668" y2="4209.098"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="-221.668" y1="3704.542" x2="282.887" y2="4209.098"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="282.887" y1="4713.652" x2="-221.668" y2="5218.209"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="-221.668" y1="2695.431" x2="282.887" y2="3199.986"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="30.609" y1="3199.986" x2="-221.668" y2="3452.264"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="30.609" y1="3199.986" x2="282.887" y2="3452.264"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="-221.668" y1="3452.264" x2="30.609" y2="3704.543"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="282.887" y1="3452.264" x2="30.609" y2="3704.543"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="30.609" y1="4209.098" x2="-221.668" y2="4461.375"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="30.609" y1="4209.098" x2="282.887" y2="4461.375"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="-221.668" y1="4461.375" x2="30.609" y2="4713.652"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="282.887" y1="4461.375" x2="30.609" y2="4713.652"/>
<line fill="none" stroke="#0000FF" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="-221.668" y1="4713.652" x2="282.887" y2="5218.209"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M-221.668,4209.098h504.553"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M-221.668,3704.542h504.553"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M-221.668,3199.986h504.555"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M-221.668,4713.652h504.553"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M30.609,2695.431v2522.778"/>
<rect x="-221.668" y="2695.431" fill="none" stroke="#000000" stroke-miterlimit="10" width="504.555" height="2522.778"/>
</svg>
......@@ -686,7 +686,7 @@
<!--<div class="form-group">-->
<!--<div class="input-group">-->
<div class="sliderInput floatRight" id="creasePercentNav">
<span class="label-slider">Fold Angle : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<span class="label-slider">Fold Percent : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<!--<input value="" placeholder="" class="form-control" type="text">-->
</div>
<!--</div>-->
......@@ -702,7 +702,7 @@
<canvas id="gpuMathCanvas"></canvas>
<div id="controls">
<div class="sliderInput floatRight" id="creasePercent">
<span class="label-slider">Fold Angle (-1 to 1) : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<span class="label-slider">Fold Percent : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<input value="" placeholder="" class="float form-control" type="text">
</div><br/><br/>
<div id="simButtons" class="alignRight">
......@@ -895,8 +895,8 @@
</p><br/>
<b>Instructions:</b><br/><br/>
<ul>
<li>Slide the <b>Fold Angle</b> 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).</li>
<li>Slide the <b>Fold Percent</b> 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).</li>
<li>Drag to rotate the model, scroll to zoom.</li>
<li>Import other patterns under the <b>Examples</b> menu.</li>
<li>Upload your own crease patterns in SVG or FOLD formats, following <a href="#" class="goToImportInstructions">these instructions</a>.</li>
......@@ -1010,7 +1010,7 @@
If the simulation looks choppy, consider lowering the <b>Num simulation steps per render</b> setting under <b>Animation Settings</b> in the right hand menu.
<br/><br/>
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.
</p>
</div>
</div><!-- /.modal-content -->
......
......@@ -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);
......
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