diff --git a/index.html b/index.html index 8c6fe638f3d5e6b426011720f5b1c7205bada121..f7bb9b7f0565ba6b9301aca02fbc64df36b6b46d 100755 --- a/index.html +++ b/index.html @@ -376,7 +376,7 @@ } vec3 velocity = force*u_dt/mass[0] + lastVelocity; - gl_FragColor = vec4(velocity,nodeError); + gl_FragColor = vec4(velocity,length(velocity)*length(velocity)); } </script> diff --git a/js/controls.js b/js/controls.js index 8fdc5851883118e01aa9faf8afce2b659c49fba0..89ac76d5d289c2613d1979e0c95f7ea72c604b6d 100755 --- a/js/controls.js +++ b/js/controls.js @@ -443,7 +443,7 @@ function initControls(globals){ globals.creaseMaterialHasChanged = true; }); - setSliderInput("#percentDamping", globals.percentDamping, 0.1, 1, 0.01, function(val){ + setSliderInput("#percentDamping", globals.percentDamping, 0, 1, 0.01, function(val){ globals.percentDamping = val; globals.materialHasChanged = true; }); diff --git a/js/dynamic/dynamicSolver.js b/js/dynamic/dynamicSolver.js index 50e890fe7cdf3389facb403d3a53a51d58515c09..0e800f9d3cf71f121b86c77c749e31b42128de09 100755 --- a/js/dynamic/dynamicSolver.js +++ b/js/dynamic/dynamicSolver.js @@ -183,6 +183,8 @@ function initDynamicSolver(globals){ return avgPosition; } + window.ke = []; + function render(){ // var vectorLength = 2; @@ -242,6 +244,7 @@ function initDynamicSolver(globals){ colors[3*i+2] = color.b; } } + window.ke.push(globalError); $errorOutput.html((globalError/nodes.length).toFixed(7) + " %"); } else { console.log("shouldn't be here"); diff --git a/js/globals.js b/js/globals.js index 143228de2fa69ad23f570bca775c2307bcffe0a3..47c455c15268b6de570269c001620a3848d248a0 100755 --- a/js/globals.js +++ b/js/globals.js @@ -81,7 +81,7 @@ function initGlobals(){ userInteractionEnabled: false, vrEnabled: false, - numSteps: 100, + numSteps: 10, rotateModel: null, rotationSpeed: 0.01,