From 821eb8489254b529d40025fcf802bbfe306c5a97 Mon Sep 17 00:00:00 2001 From: amandaghassaei Date: Tue, 29 Aug 2017 11:57:39 -0400 Subject: [PATCH] small fix --- index.html | 5 +++-- js/dynamic/dynamicSolver.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 408bd47..73fe41f 100755 --- a/index.html +++ b/index.html @@ -412,13 +412,14 @@ vec2 fragCoord = gl_FragCoord.xy; vec2 scaledFragCoord = fragCoord/u_textureDim; + vec3 lastPosition = texture2D(u_lastPosition, scaledFragCoord).xyz; + vec2 mass = texture2D(u_mass, scaledFragCoord).xy; if (mass[1] == 1.0){//fixed - gl_FragColor = vec4(0.0); + gl_FragColor = vec4(lastPosition, 0.0); return; } vec3 force = texture2D(u_externalForces, scaledFragCoord).xyz; - vec3 lastPosition = texture2D(u_lastPosition, scaledFragCoord).xyz; vec3 lastLastPosition = texture2D(u_lastLastPosition, scaledFragCoord).xyz; vec3 lastVelocity = texture2D(u_lastVelocity, scaledFragCoord).xyz; vec3 originalPosition = texture2D(u_originalPosition, scaledFragCoord).xyz; diff --git a/js/dynamic/dynamicSolver.js b/js/dynamic/dynamicSolver.js index 7239c89..b97e312 100755 --- a/js/dynamic/dynamicSolver.js +++ b/js/dynamic/dynamicSolver.js @@ -514,7 +514,7 @@ function initDynamicSolver(globals){ } globals.gpuMath.initTextureFromData("u_lastPosition", textureDim, textureDim, "FLOAT", lastPosition, true); globals.gpuMath.initFrameBufferForTexture("u_lastPosition", true); - if (globals.integrationType == "verlet") globals.gpuMath.step("copyTexture", ["u_lastPosition"], "u_lastLastPosition"); + } function setCreasePercent(percent){ -- GitLab