data moved to editor

src/core/editor.ts

@@ -1,17 +1,20 @@
-import { History } from './history';
+import { EditorData } from 'data/editor-data';
 import { Actions } from './actions';
+import { History } from './history';
 import { Preferences } from './preferences';
 
 class EditorClass {
 	public actions: Actions;
 	public history: History;
 	public prefs: Preferences;
+	public data: EditorData
 
 	public init() {
+		this.data = new EditorData();
 		this.actions = new Actions();
-		this.history = new History();
+		this.history = new History(this.data);
 		this.prefs = new Preferences();
 	}
 }
 
-export const Editor = new EditorClass();
+export const Editor = new EditorClass();

src/core/history.ts

@@ -1,4 +1,4 @@
-import { Data, DataOrigin } from '../data/data';
+import { DataOrigin, EditorData } from '../data/editor-data';
 
 export interface HistoryEntry {
 	obj: PIXI.DisplayObject;
@@ -14,6 +14,8 @@ export class History {
 	// TODO change this name please
 	public readonly onHistoryWalk = new Phaser.Signal();
 
+	constructor(private readonly data: EditorData) { }
+
 	public prepare(obj: PIXI.DisplayObject, properties: { [id: string]: any }) {
 		const entry = this.holdingEntry = { obj, properties };
 		Object.keys(entry.properties).forEach(k =>
@@ -38,7 +40,7 @@ export class History {
 	}
 
 	private apply(entry: HistoryEntry) {
-		Data.selectObject(entry.obj, DataOrigin.HISTORY);
+		this.data.selectObject(entry.obj, DataOrigin.HISTORY);
 
 		const obj = entry.obj;
 		// TODO make this recursive (if necessary)
@@ -52,7 +54,7 @@ export class History {
 					});
 				} else
 					obj[pk] = prop;
-				Data.propertyChanged(pk, obj[pk], DataOrigin.HISTORY);
+				this.data.propertyChanged(pk, obj[pk], DataOrigin.HISTORY);
 			});
 
 		obj.updateTransform();

src/data/data.ts → src/data/editor-data.ts

@@ -4,7 +4,7 @@ export enum DataOrigin {
 	INSPECTOR = 2,
 };
 
-class DataClass {
+export class EditorData {
 	private _selectedObject: PIXI.DisplayObject;
 
 	public get selectedObject() { return this._selectedObject; }
@@ -49,5 +49,3 @@ class DataClass {
 		});
 	}
 }
-
-export const Data = new DataClass();

src/editor-view/editor-view.ts

@@ -1,4 +1,5 @@
-import { Data, DataOrigin } from 'data/data';
+import { Editor } from 'core/editor';
+import { DataOrigin } from 'data/editor-data';
 import { ActionsToolbar } from './actions/actions-toolbar';
 import './editor-view.scss';
 import { ObjectTreeInspector } from './object-tree/inspector/object-tree-inspector';
@@ -17,7 +18,7 @@ export class EditorView extends Widget {
 	public connectedCallback() {
 		super.connectedCallback();
 
-		Data.onSelectedObjectChanged.add(this.selectObject, this);
+		Editor.data.onSelectedObjectChanged.add(this.selectObject, this);
 
 		const script = document.createElement('script');
 		script.src = 'https://kit.fontawesome.com/7ba4e59e46.js';

src/editor-view/object-tree/inspector/object-tree-inspector.ts

@@ -1,4 +1,5 @@
-import { Data, DataOrigin } from 'data/data';
+import { Editor } from 'core/editor';
+import { DataOrigin } from 'data/editor-data';
 import { Inspector } from 'editor-view/inspector/inspector';
 import { ObjectMapItemModel, ObjectTreeModel } from '../model/object-tree-model';
 import { TreeNode } from '../tree-node/tree-node';
@@ -11,7 +12,7 @@ export class ObjectTreeInspector extends Inspector {
 	public connectedCallback() {
 		super.connectedCallback();
 		this.title = 'Objects';
-		Data.onPropertyChanged.add(this.onPropertyChanged, this);
+		Editor.data.onPropertyChanged.add(this.onPropertyChanged, this);
 	}
 
 	private onPropertyChanged(_: DataOrigin, property: string, value: any) {
@@ -56,7 +57,7 @@ export class ObjectTreeInspector extends Inspector {
 		if (node?.model === this._lastSelectedModel) return;
 		if (this._lastSelectedModel) this._lastSelectedModel.node.clearSelection();
 		this._lastSelectedModel = node.model;
-		Data.selectObject(node.model.obj, DataOrigin.INSPECTOR);
+		Editor.data.selectObject(node.model.obj, DataOrigin.INSPECTOR);
 	}
 
 	private onNodeCollapseStateChanged(node: TreeNode, collapsed: boolean, all: boolean) {

src/editor-view/properties/editors/property-editor.ts

@@ -1,5 +1,5 @@
-import { Data, DataOrigin } from 'data/data';
 import { Editor } from 'core/editor';
+import { DataOrigin } from 'data/editor-data';
 import { PropertyInspectionData } from 'editor-view/properties-editors';
 import { IdUtil } from 'util/id.util';
 import './property-editor.scss';
@@ -59,15 +59,15 @@ export abstract class PropertyEditor<T> extends HTMLElement {
 		}
 		if (save) this.savePreviousValue();
 		this.updateInternalValue(e);
-		Data.propertyChanged(this.prop.name, this.getInternalValue(), DataOrigin.INSPECTOR);
+		Editor.data.propertyChanged(this.prop.name, this.getInternalValue(), DataOrigin.INSPECTOR);
 	}
 
 	public getInternalValue(): T { return this._internalValue; }
 	public abstract setInternalValue(value: T): void;
 	public abstract updateInternalValue(e: Event): void;
 
 	public savePreviousValue() {
-		Editor.history.prepare(Data.selectedObject, {
+		Editor.history.prepare(Editor.data.selectedObject, {
 			[this.prop.name]: this.getInternalValue()
 		}).commit();
 	}

src/editor-view/properties/inspector/properties-inspector.ts

@@ -1,4 +1,5 @@
-import { Data, DataOrigin } from 'data/data';
+import { Editor } from 'core/editor';
+import { DataOrigin } from 'data/editor-data';
 import { Inspector } from 'editor-view/inspector/inspector';
 import { PropertiesEditors, PropertyInspectionData } from 'editor-view/properties-editors';
 import { PropertyEditor } from '../editors/property-editor';
@@ -11,7 +12,7 @@ export class PropertiesInspector extends Inspector {
 	public connectedCallback() {
 		super.connectedCallback();
 		this.title = 'Properties';
-		Data.onPropertyChanged.add(this.onPropertyChanged, this);
+		Editor.data.onPropertyChanged.add(this.onPropertyChanged, this);
 	}
 
 	private onPropertyChanged(origin: DataOrigin, property: string, value: any) {

src/plugin.ts

@@ -1,4 +1,3 @@
-import { Data } from 'data/data';
 import Phaser from 'phaser-ce';
 import { Editor } from './core/editor';
 import { EditorView } from './editor-view/editor-view';
@@ -98,6 +97,6 @@ export class Plugin extends Phaser.Plugin {
 	}
 
 	public postUpdate() {
-		Data.dispatchScheduledEvents();
+		Editor.data.dispatchScheduledEvents();
 	}
 }

src/scene-view/scene-view.ts

@@ -1,5 +1,5 @@
 import { Editor } from 'core/editor';
-import { Data, DataOrigin } from 'data/data';
+import { DataOrigin } from 'data/editor-data';
 import { DragUtil } from '../util/drag.util';
 import { SceneModel } from './scene-model';
 import { Selection } from './selection/selection';
@@ -39,8 +39,8 @@ export class SceneView extends Phaser.Group {
 		this.selection = new Selection(game);
 		this.addChild(this.selection);
 
-		Data.onPropertyChanged.add(this.onPropertyChanged.bind(this));
-		Data.onSelectedObjectChanged.add(this.onObjectSelected.bind(this));
+		Editor.data.onPropertyChanged.add(this.onPropertyChanged.bind(this));
+		Editor.data.onSelectedObjectChanged.add(this.onObjectSelected.bind(this));
 	}
 
 	private onPropertyChanged(origin: DataOrigin, property: string, value: any, obj: PIXI.DisplayObject) {
@@ -77,10 +77,10 @@ export class SceneView extends Phaser.Group {
 			&& this.trySelectOver(pointer);
 		this._lastPos.set(pointer.x, pointer.y);
 
-		const obj = Data.selectedObject
+		const obj = Editor.data.selectedObject
 		if (!obj) return;
 
-		Editor.history.prepare(Data.selectedObject, { position: obj.position.clone() });
+		Editor.history.prepare(Editor.data.selectedObject, { position: obj.position.clone() });
 	}
 
 	private onInputUp(_: any, pointer: Phaser.Pointer) {
@@ -108,7 +108,7 @@ export class SceneView extends Phaser.Group {
 
 	private selectObject(obj: PIXI.DisplayObject, dispatch: boolean) {
 		this.selection.select(obj);
-		if (dispatch) Data.selectObject(obj, DataOrigin.SCENE);
+		if (dispatch) Editor.data.selectObject(obj, DataOrigin.SCENE);
 	}
 
 	private getObjectsUnderPoint(x: number, y: number, children: PIXI.DisplayObject[], objects: PIXI.DisplayObject[]) {
@@ -122,13 +122,13 @@ export class SceneView extends Phaser.Group {
 	}
 
 	public moveSelectedObject(deltaX: number, deltaY: number) {
-		const obj = Data.selectedObject;
+		const obj = Editor.data.selectedObject;
 		if (!obj) return;
 		Editor.history.prepare(obj, { position: obj.position.clone() }).commit();
 		obj.position.set(obj.position.x + deltaX, obj.position.y + deltaY);
 		obj.updateTransform();
 		this.selection.redraw();
-		Data.propertyChanged('position', obj.position.clone(), DataOrigin.SCENE);
+		Editor.data.propertyChanged('position', obj.position.clone(), DataOrigin.SCENE);
 	}
 
 	public update() {

src/scene-view/selection/scale/scale.handler.ts

@@ -1,5 +1,5 @@
 import { Editor } from 'core/editor';
-import { Data, DataOrigin } from 'data/data';
+import { DataOrigin } from 'data/editor-data';
 import { ScaleGizmo } from './scale.gizmo';
 import { Scaler } from './scaler';
 
@@ -55,7 +55,7 @@ export class ScaleHandler extends Phaser.Group {
 	}
 
 	private startScaling(gizmos: ScaleGizmo) {
-		const obj = Data.selectedObject;
+		const obj = Editor.data.selectedObject;
 		Editor.history.prepare(obj, {
 			scale: obj.scale.clone(),
 			position: obj.position.clone(),
@@ -77,8 +77,8 @@ export class ScaleHandler extends Phaser.Group {
 		this.scaler.scaleToPoint(pointer.x, pointer.y);
 
 		const pos = this.scaler.getObjectStopPosition();
-		Data.propertyChanged('scale', this.selectedObject.scale, DataOrigin.SCENE);
-		Data.propertyChanged('position', pos, DataOrigin.SCENE);
+		Editor.data.propertyChanged('scale', this.selectedObject.scale, DataOrigin.SCENE);
+		Editor.data.propertyChanged('position', pos, DataOrigin.SCENE);
 
 		return true;
 	}

src/scene-view/selection/selection.ts

@@ -1,6 +1,6 @@
-import { Data, DataOrigin } from 'data/data';
-import { PreferenceKey } from 'core/preferences';
 import { Editor } from 'core/editor';
+import { PreferenceKey } from 'core/preferences';
+import { DataOrigin } from 'data/editor-data';
 import { PointUtil } from 'util/math.util';
 import { ANCHOR_COLOR, ANCHOR_STROKE, BORDER_COLOR, BORDER_STROKE, PIVOT_COLOR, PIVOT_STROKE } from '../scene-colors';
 import { ScaleHandler } from './scale/scale.handler';
@@ -102,7 +102,7 @@ export class Selection extends Phaser.Group {
 		const scale = this._selectedObject.parent?.worldScale ?? PointUtil.one;
 		this.moveFn(pos, scale, deltaX, deltaY);
 		this.redraw();
-		Data.propertyChanged('position', pos, DataOrigin.SCENE);
+		Editor.data.propertyChanged('position', pos, DataOrigin.SCENE);
 	}
 
 	private moveFn: (pos: PIXI.Point, scale: PIXI.Point, deltaX: number, deltaY: number) => void;