mirror of
https://github.com/RGBCube/rgbcube.github.io
synced 2025-05-14 05:54:58 +00:00
Fix code!!!!!! IT WORKS AASDJFASDFJHASDFKASDHKASDFHK
This commit is contained in:
parent
a8c87c164a
commit
b58a28342f
1 changed files with 52 additions and 31 deletions
47
cube.js
47
cube.js
|
@ -7,6 +7,10 @@ class Vec3 {
|
|||
this.z = z;
|
||||
}
|
||||
|
||||
static zero() {
|
||||
return new Vec(0, 0, 0);
|
||||
}
|
||||
|
||||
length() {
|
||||
return Math.sqrt(this.x ** 2 + this.y ** 2 + this.z ** 2);
|
||||
}
|
||||
|
@ -38,6 +42,14 @@ class Vec3 {
|
|||
v.z - t.z,
|
||||
)
|
||||
}
|
||||
|
||||
static sum(v, t) {
|
||||
return new Vec3(
|
||||
v.x + t.x,
|
||||
v.y + t.y,
|
||||
v.z + t.z,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
class Quat {
|
||||
|
@ -103,6 +115,8 @@ const orientation = {
|
|||
previous: null,
|
||||
};
|
||||
|
||||
let impulseThisFrame = new Vec3(0, 0, 0);
|
||||
|
||||
const handleUp = () => {
|
||||
mouse.down = false;
|
||||
};
|
||||
|
@ -110,6 +124,18 @@ const orientation = {
|
|||
document.addEventListener("mouseup", handleUp);
|
||||
document.addEventListener("touchend", handleUp);
|
||||
|
||||
const handleDown = (event) => {
|
||||
// Disables link dragging that occurs when spinning.
|
||||
event.preventDefault();
|
||||
|
||||
mouse.down = true;
|
||||
|
||||
velocity = new Vec3(0, 0, 0);
|
||||
};
|
||||
|
||||
document.addEventListener("mousedown", handleDown);
|
||||
document.addEventListener("touchstart", handleDown);
|
||||
|
||||
const handleMove = (event) => {
|
||||
if (!mouse.down) return;
|
||||
|
||||
|
@ -131,6 +157,8 @@ const orientation = {
|
|||
.normalize()
|
||||
.scale(delta.length() * sensitivity);
|
||||
|
||||
impulseThisFrame = Vec3.sum(impulseThisFrame, axis);
|
||||
|
||||
const rotation = Quat.fromAxis(axis);
|
||||
|
||||
orientation.set(Quat.mul(rotation, orientation.get()));
|
||||
|
@ -146,18 +174,6 @@ const orientation = {
|
|||
handleMove(event);
|
||||
});
|
||||
|
||||
const handleDown = (event) => {
|
||||
// Disables link dragging that occurs when spinning.
|
||||
event.preventDefault();
|
||||
|
||||
mouse.down = true;
|
||||
|
||||
velocity = new Vec3(0, 0, 0);
|
||||
};
|
||||
|
||||
document.addEventListener("mousedown", handleDown);
|
||||
document.addEventListener("touchstart", handleDown);
|
||||
|
||||
let lastUpdate = 0;
|
||||
|
||||
const updateFrame = (timestamp) => {
|
||||
|
@ -166,6 +182,10 @@ const orientation = {
|
|||
const delta = (timestamp - lastUpdate) / 1000;
|
||||
lastUpdate = timestamp;
|
||||
|
||||
if (mouse.down) {
|
||||
velocity = impulseThisFrame.scale(1 / delta);
|
||||
impulseThisFrame = new Vec3(0, 0, 0);
|
||||
} else {
|
||||
const decay = Math.exp(-delta * friction);
|
||||
|
||||
const effectiveDelta = friction > 0 ? (1 - decay) / friction : delta;
|
||||
|
@ -190,7 +210,8 @@ const orientation = {
|
|||
|
||||
const rotation = Quat.fromAxis(axis);
|
||||
|
||||
if (!mouse.down) orientation.set(Quat.mul(rotation, orientation.get()));
|
||||
orientation.set(Quat.mul(rotation, orientation.get()));
|
||||
}
|
||||
|
||||
requestAnimationFrame(updateFrame);
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue