Refactor marker colors, fix startup issue

Author: JannisX11

js/animations/animation_controllers.js

@@ -3,6 +3,7 @@ import { openMolangEditor } from './molang_editor';
 import { clipboard, currentwindow, dialog, fs, ipcRenderer } from '../native_apis';
 import { Filesystem } from '../file_system';
 import { Easings } from '../lib/easing';
+import { markerColors } from '../marker_colors';
 
 export class AnimationControllerState {
 	constructor(controller, data = 0) {

js/animations/keyframe.js

@@ -1,3 +1,4 @@
+import { markerColors } from "../marker_colors";
 import { clipboard } from "../native_apis";
 import { invertMolang } from "../util/molang";
 import { openMolangEditor } from "./molang_editor";

js/animations/timeline.js

@@ -1,3 +1,4 @@
+import { markerColors } from "../marker_colors";
 import { dragHelper } from "../util/drag_helper";
 
 export class TimelineMarker {

js/interface/settings.ts

@@ -3,6 +3,7 @@ import { Blockbench } from "../api";
 import { Dialog } from "./dialog";
 import { FormInputType } from "./form";
 import { ipcRenderer } from "../native_apis";
+import { markerColors } from "../marker_colors";
 
 export const settings: Record<string, Setting> = {};
 export type settings_type = typeof settings;

js/interface/settings_window.ts

@@ -1,4 +1,5 @@
 import { Blockbench } from "../api";
+import { markerColors } from "../marker_colors";
 import { ipcRenderer } from "../native_apis";
 import { Plugins } from "../plugin_loader";
 import { compileJSON } from "../util/json";

js/marker_colors.ts

@@ -0,0 +1,23 @@
+export type MarkerColor = {
+	id: string
+	name?: string
+	pastel: string
+	standard: string
+}
+export const markerColors: MarkerColor[] = [
+	{pastel: "#A2EBFF", standard: "#58C0FF", id: 'light_blue'},
+	{pastel: "#FFF899", standard: "#F4D714", id: 'yellow'},
+	{pastel: "#F1BB75", standard: "#EC9218", id: 'orange'},
+	{pastel: "#FF9B97", standard: "#FA565D", id: 'red'},
+	{pastel: "#C5A6E8", standard: "#B55AF8", id: 'purple'},
+	{pastel: "#A6C8FF", standard: "#4D89FF", id: 'blue'},
+	{pastel: "#7BFFA3", standard: "#00CE71", id: 'green'},
+	{pastel: "#BDFFA6", standard: "#AFFF62", id: 'lime'},
+	{pastel: "#FFA5D5", standard: "#F96BC5", id: 'pink'},
+	{pastel: "#E0E9FB", standard: "#C7D5F6", id: 'silver'}
+]
+const global = {markerColors};
+declare global {
+	//const markerColors: typeof global.markerColors
+}
+Object.assign(window, global);

js/modeling/mesh/add_mesh.ts

@@ -1,3 +1,5 @@
+import { markerColors } from "../../marker_colors";
+
 BARS.defineActions(function() {
 	let add_mesh_dialog = new Dialog({
 		id: 'add_primitive',

js/outliner/outliner.js

@@ -4,6 +4,7 @@ import { OutlinerNode } from "./abstract/outliner_node"
 import { OutlinerElement } from "./abstract/outliner_element"
 import { radToDeg } from "three/src/math/MathUtils"
 import { PointerTarget } from "../interface/pointer_target"
+import { markerColors } from "../marker_colors"
 
 export const Outliner = {
 	ROOT: 'root',
@@ -213,19 +214,6 @@ Object.defineProperty(window, 'selected', {
 		console.warn('You cannot modify this')
 	}
 });
-//Colors
-export const markerColors = [
-	{pastel: "#A2EBFF", standard: "#58C0FF", id: 'light_blue'},
-	{pastel: "#FFF899", standard: "#F4D714", id: 'yellow'},
-	{pastel: "#F1BB75", standard: "#EC9218", id: 'orange'},
-	{pastel: "#FF9B97", standard: "#FA565D", id: 'red'},
-	{pastel: "#C5A6E8", standard: "#B55AF8", id: 'purple'},
-	{pastel: "#A6C8FF", standard: "#4D89FF", id: 'blue'},
-	{pastel: "#7BFFA3", standard: "#00CE71", id: 'green'},
-	{pastel: "#BDFFA6", standard: "#AFFF62", id: 'lime'},
-	{pastel: "#FFA5D5", standard: "#F96BC5", id: 'pink'},
-	{pastel: "#E0E9FB", standard: "#C7D5F6", id: 'silver'}
-]
 
 
 export class NodePreviewController extends EventSystem {
@@ -1675,7 +1663,6 @@ Interface.definePanels(function() {
 
 Object.assign(window, {
 	Outliner,
-	markerColors,
 	OutlinerNode,
 	OutlinerElement,
 	NodePreviewController,

js/outliner/types/armature_bone.ts

@@ -6,6 +6,7 @@ import { Armature } from "./armature";
 import { Vue } from '../../lib/libs'
 import { OutlinerElement } from "../abstract/outliner_element";
 import { OutlinerNode } from "../abstract/outliner_node";
+import { markerColors } from "../../marker_colors";
 
 interface ArmatureBoneOptions {
 	name?: string

js/plugin_loader.ts

@@ -10,6 +10,7 @@ import { Filesystem } from "./file_system";
 import { app, fs, getPluginPermissions, getPluginScopedRequire, https, revokePluginPermissions } from "./native_apis";
 import { Panels } from "./interface/panels";
 import VersionUtil from './util/version_util'
+import { markerColors } from "./marker_colors";
 
 
 export const Plugins = {
@@ -1208,6 +1209,7 @@ BARS.defineActions(function() {
 				settings: settings,
 				isMobile: Blockbench.isMobile,
 				isApp,
+				markerColors,
 				online: navigator.onLine
 			},
 			computed: {