From ecf7e2074b78f1d62cf36e790e18717d8004c51c Mon Sep 17 00:00:00 2001 From: Dennis Allerkamp Date: Fri, 9 May 2025 12:51:53 +0200 Subject: [PATCH] Removed interpolation variables --- src/script.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/script.js b/src/script.js index 03e24a7..9903a55 100644 --- a/src/script.js +++ b/src/script.js @@ -25,9 +25,7 @@ let cameraVertexBuffer; let lastFrame = Date.now(); -let interpolateProjection = 0; -let interpolateLookAt = 0; - +let t = 0.0; let interpolate = [0, 0, 0, 0, 0, 0]; let displayMatricesVirtually = true; @@ -67,20 +65,14 @@ async function init() { // input handling document.getElementById("interpolate").addEventListener("input", (e) => { - let t = 6.0 - e.target.value; + t = 6.0 - e.target.value; if (t <= 2.0) { - interpolateLookAt = t / 2.0; - interpolateProjection = 0.0; invertZAxis = false; } else if (t <= 5.0) { - interpolateLookAt = 1.0; - interpolateProjection = (t - 2.0) / 3.0; invertZAxis = false; } else { - interpolateLookAt = 1.0; - interpolateProjection = 1.0; invertZAxis = true; } for (let i = 0; i < 6; ++i) { @@ -634,7 +626,7 @@ async function draw() { gl.bindBuffer(gl.ARRAY_BUFFER, cameraVertexBuffer); setAttribPointers(); - if (displayMatricesVirtually && interpolateProjection <= 0) { + if (displayMatricesVirtually && t <= 2.0) { gl.drawArrays(gl.TRIANGLES, 0, cameraVertices.length / 6); } @@ -663,7 +655,7 @@ async function draw() { // draw origin cube - if (interpolateProjection < 1 && interpolateLookAt > 0) { + if (t != 0.0 && t < 5.0) { gl.bindBuffer(gl.ARRAY_BUFFER, lineCubeVertexBuffer); setAttribPointers(); gl.uniform3fv(colorOverrideLocation, [1, 0, 0]);