Skip to content

Visualize Your Ideas With Code

fix: fix audio offset field (#1160)

Jacob16ebb07f949b
diff --git a/packages/core/src/app/ProjectMetadata.ts b/packages/core/src/app/ProjectMetadata.ts
index dabd2917..a76df8ff 100644
--- a/packages/core/src/app/ProjectMetadata.ts
+++ b/packages/core/src/app/ProjectMetadata.ts
@@ -19,7 +19,9 @@ function createProjectMetadata(project: Project) {
background: new ColorMetaField('background', null),
range: new RangeMetaField('range', [0, Infinity]),
size: new Vector2MetaField('resolution', new Vector2(1920, 1080)),
- audioOffset: new NumberMetaField('audio offset', 0),
+ audioOffset: new NumberMetaField('audio offset', 0)
+ .setPrecision(4)
+ .setStep(0.1),
}),
preview: new ObjectMetaField('Preview', {
fps: new NumberMetaField('frame rate', 30)
diff --git a/packages/core/src/meta/NumberMetaField.ts b/packages/core/src/meta/NumberMetaField.ts
index 5f422cd5..dc32c720 100644
--- a/packages/core/src/meta/NumberMetaField.ts
+++ b/packages/core/src/meta/NumberMetaField.ts
@@ -1,3 +1,4 @@
+import {clamp} from '../tweening';
import {MetaField} from './MetaField';
import {MetaOption} from './MetaOption';
@@ -7,19 +8,18 @@ import {MetaOption} from './MetaOption';
export class NumberMetaField extends MetaField<any, number> {
public readonly type = Number;
protected presets: MetaOption<number>[] = [];
- protected min?: number;
- protected max?: number;
+ protected min = -Infinity;
+ protected max = Infinity;
+ protected precision = 0;
+ protected step = 1;
public parse(value: any): number {
let parsed = parseFloat(value);
- if (this.min !== undefined && parsed < this.min) {
- parsed = this.min;
- }
- if (this.max !== undefined && parsed > this.max) {
- parsed = this.max;
+ if (isNaN(parsed)) {
+ parsed = this.initial;
}
- return parsed;
+ return clamp(this.min, this.max, parsed);
}
public getPresets() {
@@ -32,8 +32,8 @@ export class NumberMetaField extends MetaField<any, number> {
}
public setRange(min?: number, max?: number): this {
- this.min = min;
- this.max = max;
+ this.min = min ?? -Infinity;
+ this.max = max ?? Infinity;
return this;
}
@@ -44,4 +44,22 @@ export class NumberMetaField extends MetaField<any, number> {
public getMax(): number {
return this.max ?? Infinity;
}
+
+ public setPrecision(precision: number): this {
+ this.precision = clamp(0, 100, precision);
+ return this;
+ }
+
+ public getPrecision(): number {
+ return this.precision;
+ }
+
+ public setStep(step: number): this {
+ this.step = step;
+ return this;
+ }
+
+ public getStep(): number {
+ return this.step;
+ }
}
diff --git a/packages/ui/src/components/controls/NumberInput.tsx b/packages/ui/src/components/controls/NumberInput.tsx
index e31008b4..e256593b 100644
--- a/packages/ui/src/components/controls/NumberInput.tsx
+++ b/packages/ui/src/components/controls/NumberInput.tsx
@@ -1,6 +1,6 @@
import clsx from 'clsx';
import type {JSX} from 'preact';
-import {useEffect, useRef, useState} from 'preact/hooks';
+import {useRef, useState} from 'preact/hooks';
import {MouseButton, clamp} from '../../utils';
import styles from './Controls.module.scss';
@@ -28,12 +28,9 @@ export function NumberInput({
...props
}: NumberInputProps) {
const inputRef = useRef<HTMLInputElement>();
- const [currentValue, setCurrentValue] = useState(value);
+ const [editedValue, setEditedValue] = useState<null | number>(null);
const [startX, setStartX] = useState(0);
-
- useEffect(() => {
- setCurrentValue(value);
- }, [value]);
+ const currentValue = editedValue ?? value;
return (
<>
@@ -56,6 +53,7 @@ export function NumberInput({
event.currentTarget.setPointerCapture(event.pointerId);
setStartX(event.clientX);
+ setEditedValue(value);
}
}}
onPointerMove={event => {
@@ -69,16 +67,15 @@ export function NumberInput({
if (Math.abs(startX - event.clientX) > 5) {
inputRef.current.requestPointerLock();
}
- } else if (document.pointerLockElement === inputRef.current) {
- setCurrentValue(value => {
- // ignore very large jumps in movement, as they often result
- // from mouse acceleration issues
- if (Math.abs(event.movementX) > 100) {
- return value;
- }
-
- return clamp(min, max, value + event.movementX * step);
- });
+ } else if (
+ document.pointerLockElement === inputRef.current &&
+ // ignore very large jumps in movement, as they often result
+ // from mouse acceleration issues
+ Math.abs(event.movementX) < 100
+ ) {
+ setEditedValue(
+ clamp(min, max, currentValue + event.movementX * step),
+ );
}
}}
onPointerUp={event => {
@@ -88,10 +85,12 @@ export function NumberInput({
if (document.pointerLockElement === inputRef.current) {
document.exitPointerLock();
- onChange?.(currentValue);
+ onChange?.(editedValue);
} else if (document.activeElement !== inputRef.current) {
inputRef.current.select();
}
+
+ setEditedValue(null);
}
}}
onKeyDown={event => {
@@ -99,7 +98,7 @@ export function NumberInput({
inputRef.current.blur();
}
if (event.key === 'Escape') {
- inputRef.current.value = currentValue.toString();
+ inputRef.current.value = value.toFixed(decimalPlaces);
inputRef.current.blur();
}
}}
diff --git a/packages/ui/src/components/meta/NumberMetaFieldView.tsx b/packages/ui/src/components/meta/NumberMetaFieldView.tsx
index 1dc71e3f..8d472147 100644
--- a/packages/ui/src/components/meta/NumberMetaFieldView.tsx
+++ b/packages/ui/src/components/meta/NumberMetaFieldView.tsx
@@ -10,6 +10,8 @@ export interface NumberMetaFieldViewProps {
export function NumberMetaFieldView({field}: NumberMetaFieldViewProps) {
const value = useSubscribableValue(field.onChanged);
const presets = field.getPresets();
+ const precision = field.getPrecision();
+ const step = field.getStep();
return (
<MetaFieldGroup field={field}>
@@ -26,6 +28,8 @@ export function NumberMetaFieldView({field}: NumberMetaFieldViewProps) {
) : (
<NumberInput
value={value}
+ decimalPlaces={precision}
+ step={step}
min={field.getMin()}
max={field.getMax()}
onChange={value => field.set(value)}