From 6039dba4243cd9ab96889108c05d6a3a0115fc01 Mon Sep 17 00:00:00 2001 From: amandaghassaei Date: Fri, 24 Feb 2017 20:04:21 -0500 Subject: [PATCH] small changes --- index.html | 2 +- js/GPUMath.js | 5 ++++- js/dynamicModel.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 854d9c4..9c763ee 100644 --- a/index.html +++ b/index.html @@ -142,7 +142,7 @@ vec3 nominalDist = neighborOriginalPosition-originalPosition; vec3 deltaP = neighborLastPosition-lastPosition+nominalDist; - deltaP -= normalize(deltaP)*length(nominalDist); + deltaP -= normalize(deltaP)*beamMeta[2]; vec3 deltaV = neighborLastVelocity-lastVelocity; vec3 _force = deltaP*beamMeta[0] + deltaV*beamMeta[1]; diff --git a/js/GPUMath.js b/js/GPUMath.js index d9d5a2f..a6f5443 100644 --- a/js/GPUMath.js +++ b/js/GPUMath.js @@ -9,7 +9,10 @@ function initGPUMath(){ var canvas = document.getElementById("gpuMathCanvas"); var gl = canvas.getContext("webgl", {antialias:false}) || canvas.getContext("experimental-webgl", {antialias:false}); - gl.getExtension('OES_texture_float'); + var floatTextures = gl.getExtension('OES_texture_float'); + if (!floatTextures) { + console.warn('no floating point texture support'); + } gl.disable(gl.DEPTH_TEST); var maxTexturesInFragmentShader = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); diff --git a/js/dynamicModel.js b/js/dynamicModel.js index 814aa7d..786368d 100644 --- a/js/dynamicModel.js +++ b/js/dynamicModel.js @@ -285,7 +285,7 @@ function initDynamicModel(globals){ lastVelocity = new Float32Array(textureDim*textureDim*4); externalForces = new Float32Array(textureDim*textureDim*4); mass = new Float32Array(textureDim*textureDim*4); - meta = new Float32Array(textureDim*textureDim*4);//todo uint16 + meta = new Float32Array(textureDim*textureDim*4); beamMeta = new Float32Array(textureDimEdges*textureDimEdges*4); for (var i=0;i