aboutsummaryrefslogtreecommitdiff
path: root/lib/systems
diff options
context:
space:
mode:
authorRuben Beltran del Rio <git@r.bdr.sh>2024-05-08 14:41:03 +0200
committerRuben Beltran del Rio <git@r.bdr.sh>2024-05-08 14:41:03 +0200
commit6a87c2530865b5e18f70b71b456f43e72702c1c6 (patch)
tree917ba6b27bc7cb7f9eb3ee031ad452d440d2e245 /lib/systems
parent362f91160b243453578633e3f9af67ce40179d8c (diff)
Add keyboard markers, shiftable sliders
Diffstat (limited to 'lib/systems')
-rw-r--r--lib/systems/amplitude_adjuster.js1
-rw-r--r--lib/systems/camera_adjuster.js2
-rw-r--r--lib/systems/camera_rotator.js6
-rw-r--r--lib/systems/frequency_adjuster.js6
-rw-r--r--lib/systems/global_adjuster.js5
-rw-r--r--lib/systems/lissajous_position_updater.js2
6 files changed, 14 insertions, 8 deletions
diff --git a/lib/systems/amplitude_adjuster.js b/lib/systems/amplitude_adjuster.js
index 71f7277..04f271a 100644
--- a/lib/systems/amplitude_adjuster.js
+++ b/lib/systems/amplitude_adjuster.js
@@ -36,6 +36,7 @@ export default class AmplitudeAdjuster extends System {
['a', 'b', 'c'].forEach(key => {
nodeElement.appendChild(slider({
+ id: `amplitude-adjuster-${i}-slider-${key}`,
min: '0',
max: '1',
step: '0.01',
diff --git a/lib/systems/camera_adjuster.js b/lib/systems/camera_adjuster.js
index 3b6ea41..9182343 100644
--- a/lib/systems/camera_adjuster.js
+++ b/lib/systems/camera_adjuster.js
@@ -35,6 +35,7 @@ export default class CameraAdjuster extends System {
});
nodeElement.appendChild(slider({
+ id: `camera-adjuster-${i}-slider-radius`,
min: '2',
max: '10',
step: '0.1',
@@ -46,6 +47,7 @@ export default class CameraAdjuster extends System {
['x', 'y', 'z'].forEach(key => {
nodeElement.appendChild(slider({
+ id: `camera-adjuster-${i}-slider-${key}`,
min: '0',
max: '0.5',
step: '0.001',
diff --git a/lib/systems/camera_rotator.js b/lib/systems/camera_rotator.js
index 3520f71..eccef0d 100644
--- a/lib/systems/camera_rotator.js
+++ b/lib/systems/camera_rotator.js
@@ -41,9 +41,9 @@ export default class CameraRotator extends System {
camera.up.y = up[1];
camera.up.z = up[2];
- camera.angle.pitch = (camera.angle.pitch + camera.velocity.x * dt / 100 + 2 * Math.PI) % (2 * Math.PI);
- camera.angle.yaw = (camera.angle.yaw + camera.velocity.y * dt / 100 + 2 * Math.PI) % (2 * Math.PI);
- camera.angle.roll = (camera.angle.roll + camera.velocity.z * dt / 100 + 2 * Math.PI) % (2 * Math.PI);
+ camera.angle.pitch = (camera.angle.pitch + camera.velocity.x * dt / 500 + 2 * Math.PI) % (2 * Math.PI);
+ camera.angle.yaw = (camera.angle.yaw + camera.velocity.y * dt / 500 + 2 * Math.PI) % (2 * Math.PI);
+ camera.angle.roll = (camera.angle.roll + camera.velocity.z * dt / 500 + 2 * Math.PI) % (2 * Math.PI);
}
}
};
diff --git a/lib/systems/frequency_adjuster.js b/lib/systems/frequency_adjuster.js
index 6aa11d4..a3582bb 100644
--- a/lib/systems/frequency_adjuster.js
+++ b/lib/systems/frequency_adjuster.js
@@ -36,9 +36,11 @@ export default class FrequencyAdjuster extends System {
['a', 'b', 'c'].forEach(key => {
nodeElement.appendChild(slider({
+ id: `frequency-adjuster-${i}-slider-${key}`,
min: '0',
- max: '1',
- step: '0.01',
+ max: (2 * Math.PI).toString(),
+ step: '0.05',
+ shiftStep: (Math.PI / 8).toString(),
label: internals.symbols[key],
className: `frequency`,
get: () => node.frequency[key].toString(),
diff --git a/lib/systems/global_adjuster.js b/lib/systems/global_adjuster.js
index 7f6df91..f7433ca 100644
--- a/lib/systems/global_adjuster.js
+++ b/lib/systems/global_adjuster.js
@@ -28,9 +28,10 @@ export default class GlobalAdjuster extends System {
});
nodeElement.appendChild(slider({
+ id: `global-adjuster-${i}-slider`,
min: '5',
- max: '2000',
- step: '1',
+ max: '1000',
+ step: '5',
label: '𝜆',
className: 'lineLength',
get: () => node.configuration.lineLength.toString(),
diff --git a/lib/systems/lissajous_position_updater.js b/lib/systems/lissajous_position_updater.js
index 202ddc7..39b151a 100644
--- a/lib/systems/lissajous_position_updater.js
+++ b/lib/systems/lissajous_position_updater.js
@@ -27,7 +27,7 @@ export default class WebGLRenderer extends System {
update(dt){
- this.time = (this.time + dt / 100) % internals.kPeriod;
+ this.time = (this.time + dt / 500) % internals.kPeriod;
for (const curve of this.curves) {
curve.position.x = this._getPosition(curve.amplitude.a, curve.frequency.a, this.time, 0);