Commit 83e5d9a7 authored by amandaghassaei's avatar amandaghassaei
Browse files

small changes

parent 5ddd8534
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<div id="controls"> <div id="controls">
<a href="#" id="about" class="btn btn-lg btn-default">About</a><br/><br/> <a href="#" id="about" class="btn btn-lg btn-default">About</a><br/><br/>
<div class="sliderInput" id="creaseAngle"> <div class="sliderInput" id="creasePercent">
<span class="label-slider">Crease Angle : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div> <span class="label-slider">Crease Angle : </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 int" type="text"> <input value="" placeholder="" class="form-control int" type="text">
</div> </div>
......
...@@ -66,8 +66,8 @@ function initControls(globals){ ...@@ -66,8 +66,8 @@ function initControls(globals){
globals.dynamicModel.reset(); globals.dynamicModel.reset();
}); });
setSliderInput("#creaseAngle", globals.creaseAngle, 0, Math.PI, 0.1, function(val){ setSliderInput("#creasePercent", globals.creasePercent, 0, 1, 0.01, function(val){
globals.creaseAngle = val; globals.creasePercent = val;
}); });
function setDeltaT(val){ function setDeltaT(val){
......
...@@ -215,7 +215,6 @@ function initDynamicModel(globals){ ...@@ -215,7 +215,6 @@ function initDynamicModel(globals){
gpuMath.initTextureFromData("u_lastTheta", textureDimCreases, textureDimCreases, "FLOAT", lastTheta); gpuMath.initTextureFromData("u_lastTheta", textureDimCreases, textureDimCreases, "FLOAT", lastTheta);
gpuMath.initFrameBufferForTexture("u_lastTheta"); gpuMath.initFrameBufferForTexture("u_lastTheta");
gpuMath.initTextureFromData("u_originalPosition", textureDim, textureDim, "FLOAT", originalPosition);
gpuMath.initTextureFromData("u_meta", textureDim, textureDim, "FLOAT", meta); gpuMath.initTextureFromData("u_meta", textureDim, textureDim, "FLOAT", meta);
gpuMath.createProgram("positionCalc", vertexShader, document.getElementById("positionCalcShader").text); gpuMath.createProgram("positionCalc", vertexShader, document.getElementById("positionCalcShader").text);
......
...@@ -19,7 +19,7 @@ function initGlobals(){ ...@@ -19,7 +19,7 @@ function initGlobals(){
schematicVisible: true, schematicVisible: true,
//sim settings //sim settings
creaseAngle: 0, creasePercent: 0,
axialStiffness: 100, axialStiffness: 100,
creaseStiffness: 1, creaseStiffness: 1,
panelStiffness: 1, panelStiffness: 1,
......
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