RGBCube/rgbcube.github.io
1
Fork 0
mirror of https://github.com/RGBCube/rgbcube.github.io synced 2025-05-31 05:08:12 +00:00
Code Issues Activity Actions

Rename angMem to velocity

Browse source
This commit is contained in:
RGBCube 2023-12-19 18:01:18 +03:00
parent e2eb858e62
commit 4eed4e5eab
No known key found for this signature in database
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cube.js
View file

@ -82,7 +82,7 @@ class Quat {
let friction = 3; let friction = 3;
let sensitivity = 0.01; let sensitivity = 0.01;
let velocity = 0; let velocity = new Vec3(0, 0, 0);
const orientation = { const orientation = {
__value: new Quat(0, 0, 0, 1), __value: new Quat(0, 0, 0, 1),
@ -136,8 +136,9 @@ const orientation = {
orientation.set(Quat.mul(rotation, orientation.get())); orientation.set(Quat.mul(rotation, orientation.get()));
angularMomentum.x = axis.x / timeDelta; console.log(timeDelta);
angularMomentum.y = axis.y / timeDelta; velocity.x += axis.x / timeDelta;
velocity.y += axis.y / timeDelta;
}; };
document.addEventListener("mousemove", handleMove); document.addEventListener("mousemove", handleMove);
@ -150,15 +151,13 @@ const orientation = {
handleMove(event); handleMove(event);
}); });
let angularMomentum = new Vec3(0, 0, 0);
const handleDown = (event) => { const handleDown = (event) => {
// Disables link dragging that occurs when spinning. // Disables link dragging that occurs when spinning.
event.preventDefault(); event.preventDefault();
mouse.down = true; mouse.down = true;
angularMomentum = new Vec3(0, 0, 0); velocity = new Vec3(0, 0, 0);
}; };
document.addEventListener("mousedown", handleDown); document.addEventListener("mousedown", handleDown);
@ -172,24 +171,24 @@ const orientation = {
const delta = (timestamp - lastUpdate) / 1000; const delta = (timestamp - lastUpdate) / 1000;
lastUpdate = timestamp; lastUpdate = timestamp;
const axis = new Vec3(angularMomentum.x, angularMomentum.y, angularMomentum.z); const axis = new Vec3(velocity.x, velocity.y, velocity.z);
const omega = angularMomentum.length(); const omega = velocity.length();
const decay = Math.exp(-delta * friction); const decay = Math.exp(-delta * friction);
const effectiveDelta = friction > 0 ? (1 - decay) / friction : delta; const effectiveDelta = friction > 0 ? (1 - decay) / friction : delta;
let theta = effectiveDelta * omega; let theta = effectiveDelta * omega;
angularMomentum.x *= decay; velocity.x *= decay;
angularMomentum.y *= decay; velocity.y *= decay;
angularMomentum.z *= decay; velocity.z *= decay;
if (friction > 0 && angularMomentum.length() < 0.00001) { if (friction > 0 && velocity.length() < 0.00001) {
theta += angularMomentum.length() / friction; theta += velocity.length() / friction;
angularMomentum.x = 0; velocity.x = 0;
angularMomentum.y = 0; velocity.y = 0;
angularMomentum.z = 0; velocity.z = 0;
} }
axis.normalize(); axis.normalize();