Refactoring

Author: Yuri Pourre

editor/src/editor/dialogs/edit-preferences/edit-preferences.tsx

@@ -10,7 +10,7 @@ import { AlertDialog, AlertDialogCancel, AlertDialogContent, AlertDialogFooter,
 
 import { trySetExperimentalFeaturesEnabledInLocalStorage } from "../../../tools/local-storage";
 import {
-	GIZMO_SNAP_MIN_STEP,
+	gizmoSnapMinStep,
 	IGizmoSnapPreferences,
 	loadGizmoSnapPreferences,
 	roundGizmoSnapSteps,
@@ -206,7 +206,7 @@ export class EditorEditPreferencesComponent extends Component<IEditorEditPrefere
 
 	private _getGizmoSnapPreferencesSection(): ReactNode {
 		const snap = this.state.gizmoSnap;
-		const min = GIZMO_SNAP_MIN_STEP;
+		const min = gizmoSnapMinStep;
 
 		return (
 			<div className="flex flex-col gap-[10px] w-full">

editor/src/editor/layout/inspector/fields/number.tsx

@@ -31,9 +31,6 @@ export interface IEditorInspectorNumberFieldProps extends Partial<IEditorInspect
 
 	/** When set, value is driven from React state; object/property and inspector mutation are skipped. */
 	controlledValue?: number;
-	/** Overrides fractional digits for display/scrub (defaults from step). */
-	decimals?: number;
-
 	wrapperClassName?: string;
 	inputClassName?: string;
 	title?: string;
@@ -48,7 +45,7 @@ export function EditorInspectorNumberField(props: IEditorInspectorNumberFieldPro
 	const [warning, setWarning] = useState(false);
 
 	const step = props.step ?? 0.01;
-	const digitCount = props.decimals ?? (props.step?.toString().split(".")[1]?.length ?? 2);
+	const digitCount = props.step?.toString().split(".")[1]?.length ?? 2;
 
 	const [value, setValue] = useState<string>(() => formatInitial());
 	const [oldValue, setOldValue] = useState<string>(() => formatInitial());

editor/src/editor/layout/preview.tsx

@@ -59,7 +59,7 @@ import { ITweenConfiguration, Tween } from "../../tools/animation/tween";
 import { checkProjectCachedCompressedTextures } from "../../tools/assets/ktx";
 import { createSceneLink, getRootSceneLink } from "../../tools/scene/scene-link";
 import {
-	GIZMO_SNAP_MIN_STEP,
+	gizmoSnapMinStep,
 	IGizmoSnapPreferences,
 	loadGizmoSnapPreferences,
 	roundGizmoSnapSteps,
@@ -903,7 +903,7 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 
 	private _getGizmoSnapToolbarControls(): ReactNode {
 		const snap = this.state.gizmoSnap;
-		const min = GIZMO_SNAP_MIN_STEP;
+		const min = gizmoSnapMinStep;
 
 		const bumpTranslation = (v: number) => this._commitGizmoSnap({ ...snap, translationStep: Math.max(min, v) });
 		const bumpRotation = (v: number) => this._commitGizmoSnap({ ...snap, rotationStepDegrees: Math.max(min, v) });

editor/src/editor/layout/preview/gizmo.ts

@@ -16,7 +16,7 @@ import {
 	Sprite,
 } from "babylonjs";
 
-import { DEFAULT_GIZMO_SNAP_PREFERENCES, IGizmoSnapPreferences } from "../../../tools/gizmo-snap-preferences";
+import { defaultGizmoSnapPreferences, IGizmoSnapPreferences } from "../../../tools/gizmo-snap-preferences";
 import { isSprite } from "../../../tools/guards/sprites";
 import { registerUndoRedo } from "../../../tools/undoredo";
 import { isNodeLocked } from "../../../tools/node/metadata";
@@ -46,7 +46,7 @@ export class EditorPreviewGizmo {
 
 	private _spriteTransformNode: TransformNode;
 
-	private _snapPreferences: IGizmoSnapPreferences = { ...DEFAULT_GIZMO_SNAP_PREFERENCES };
+	private _snapPreferences: IGizmoSnapPreferences = { ...defaultGizmoSnapPreferences };
 
 	public constructor(scene: Scene) {
 		this._gizmosLayer = new UtilityLayerRenderer(scene);

editor/src/tools/gizmo-snap-preferences.ts

@@ -1,9 +1,9 @@
-export const EDITOR_GIZMO_SNAP_STORAGE_KEY = "editor-gizmo-snap";
+export const editorGizmoSnapStorageKey = "editor-gizmo-snap";
 
 /** Minimum snap step (two-decimal increments cannot be smaller than 0.01). */
-export const GIZMO_SNAP_MIN_STEP = 0.01;
+export const gizmoSnapMinStep = 0.01;
 
-const SNAP_DECIMAL_ROUND_FACTOR = 100;
+const snapDecimalRoundFactor = 100;
 
 export interface IGizmoSnapPreferences {
 	translationEnabled: boolean;
@@ -19,9 +19,9 @@ export interface IGizmoSnapPreferences {
  */
 export function roundGizmoSnapSteps(prefs: IGizmoSnapPreferences): IGizmoSnapPreferences {
 	const roundStep = (value: number): number => {
-		const clampedLow = Math.max(GIZMO_SNAP_MIN_STEP, value);
-		const rounded = Math.round(clampedLow * SNAP_DECIMAL_ROUND_FACTOR) / SNAP_DECIMAL_ROUND_FACTOR;
-		return Math.max(GIZMO_SNAP_MIN_STEP, rounded);
+		const clampedLow = Math.max(gizmoSnapMinStep, value);
+		const rounded = Math.round(clampedLow * snapDecimalRoundFactor) / snapDecimalRoundFactor;
+		return Math.max(gizmoSnapMinStep, rounded);
 	};
 
 	return {
@@ -32,7 +32,7 @@ export function roundGizmoSnapSteps(prefs: IGizmoSnapPreferences): IGizmoSnapPre
 	};
 }
 
-export const DEFAULT_GIZMO_SNAP_PREFERENCES: IGizmoSnapPreferences = {
+export const defaultGizmoSnapPreferences: IGizmoSnapPreferences = {
 	translationEnabled: false,
 	translationStep: 1,
 	rotationEnabled: false,
@@ -58,12 +58,12 @@ function asNumber(value: unknown, fallback: number): number {
 
 export function loadGizmoSnapPreferences(): IGizmoSnapPreferences {
 	try {
-		const raw = localStorage.getItem(EDITOR_GIZMO_SNAP_STORAGE_KEY);
+		const raw = localStorage.getItem(editorGizmoSnapStorageKey);
 		if (!raw) {
-			return roundGizmoSnapSteps({ ...DEFAULT_GIZMO_SNAP_PREFERENCES });
+			return roundGizmoSnapSteps({ ...defaultGizmoSnapPreferences });
 		}
 		const parsed = JSON.parse(raw) as Partial<IGizmoSnapPreferences>;
-		const base = DEFAULT_GIZMO_SNAP_PREFERENCES;
+		const base = defaultGizmoSnapPreferences;
 		return roundGizmoSnapSteps({
 			translationEnabled: asBoolean(parsed.translationEnabled, base.translationEnabled),
 			translationStep: clampPositive(asNumber(parsed.translationStep, base.translationStep), base.translationStep),
@@ -73,10 +73,10 @@ export function loadGizmoSnapPreferences(): IGizmoSnapPreferences {
 			scaleStep: clampPositive(asNumber(parsed.scaleStep, base.scaleStep), base.scaleStep),
 		});
 	} catch {
-		return roundGizmoSnapSteps({ ...DEFAULT_GIZMO_SNAP_PREFERENCES });
+		return roundGizmoSnapSteps({ ...defaultGizmoSnapPreferences });
 	}
 }
 
 export function saveGizmoSnapPreferences(prefs: IGizmoSnapPreferences): void {
-	localStorage.setItem(EDITOR_GIZMO_SNAP_STORAGE_KEY, JSON.stringify(roundGizmoSnapSteps(prefs)));
+	localStorage.setItem(editorGizmoSnapStorageKey, JSON.stringify(roundGizmoSnapSteps(prefs)));
 }