Commit 1d8e8d37 authored by amandaghassaei's avatar amandaghassaei
Browse files

small changes

parent 7d8e5a8f
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
</div><br/> </div><br/>
<b>Fold Settings:</b><br/><br/> <b>Fold Settings:</b><br/><br/>
<div class="sliderInput" id="creasePercent"> <div class="sliderInput" id="creasePercent">
<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> <span class="label-slider">Angle (-1 to 1) : </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"> <input value="" placeholder="" class="form-control" type="text">
</div> </div>
<br/><br/><br/> <br/><br/><br/>
...@@ -434,6 +434,11 @@ ...@@ -434,6 +434,11 @@
<span class="label-slider">Panel Stiffness : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div> <span class="label-slider">Panel Stiffness : </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"> <input value="" placeholder="" class="form-control" type="text">
</div> </div>
<div class="sliderInput" id="percentDamping">
<span class="label-slider">Damping (0-1): </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 class="extraSpace"></div> <div class="extraSpace"></div>
</div> </div>
<div id="svgViewer"></div> <div id="svgViewer"></div>
......
...@@ -71,11 +71,9 @@ function initControls(globals){ ...@@ -71,11 +71,9 @@ function initControls(globals){
globals.creaseMaterialHasChanged = true; globals.creaseMaterialHasChanged = true;
}); });
setSlider("#damping", globals.percentDamping, 0.05, 1, 0.01, function(val){ setSliderInput("#percentDamping", globals.percentDamping, 0.1, 1, 0.01, function(val){
globals.percentDamping = val; globals.percentDamping = val;
}, function(){
globals.materialHasChanged = true; globals.materialHasChanged = true;
globals.shouldResetDynamicSim = true;
}); });
setSliderInput("#creasePercent", globals.creasePercent, -1, 1, 0.01, function(val){ setSliderInput("#creasePercent", globals.creasePercent, -1, 1, 0.01, function(val){
......
...@@ -286,7 +286,7 @@ function initDynamicModel(globals){ ...@@ -286,7 +286,7 @@ function initDynamicModel(globals){
} }
function updateMaterials(initing){ function updateMaterials(initing){
console.log("here");
var index = 0; var index = 0;
for (var i=0;i<nodes.length;i++){ for (var i=0;i<nodes.length;i++){
if (initing) { if (initing) {
......
Supports Markdown
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