Commit bca57784 authored by amandaghassaei's avatar amandaghassaei

verlet working

parent 434bd603
......@@ -159,7 +159,7 @@
}
vec3 position = texture2D(u_position, scaledFragCoord).xyz;
vec3 lastPosition = texture2D(u_position, scaledFragCoord).xyz;
vec3 lastPosition = texture2D(u_lastPosition, scaledFragCoord).xyz;
gl_FragColor = vec4((position-lastPosition)/u_dt,0.0);
}
</script>
......@@ -1063,14 +1063,14 @@
<a href="#" class="seeMore closed" data-id="simulationSettings"><span class="fui-triangle-down"></span><b>Simulation Settings:</b></a><a class="about" href="#" id="aboutStiffness"><span class="fui-question-circle"></span></a><br/>
<div id="simulationSettings" class="hide">
<div class="indent">Integration:
<div class="indent">
<div class="doubleIndent">
<label class="radio">
<input name="integrationType" value="verlet" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
Verlet (second order)
<input name="integrationType" value="euler" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
Euler (first order error)
</label>
<label class="radio">
<input name="integrationType" value="euler" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
Euler (first order)
<input name="integrationType" value="verlet" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
Verlet (second order error)
</label>
</div></div><br/>
<div class="sliderInput paddingBottom" id="axialStiffness">
......
......@@ -52,7 +52,7 @@ function initGlobals(){
//dynamic sim settings
percentDamping: 0.85,
density: 1,
integrationType: "verlet",
integrationType: "euler",
strainClip: 5.0,//for strain visualization, % strain that is drawn red
......
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