@rocketshow/designer 1.33.0 → 1.36.0

package/lib/designer.component.d.ts

@@ -1,7 +1,6 @@
 import { AfterViewInit, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { BsModalService } from 'ngx-bootstrap/modal';
-import { ToastrService } from 'ngx-toastr';
 import { PreviewComponent } from './preview/preview.component';
 import { ConfigService } from './services/config.service';
 import { ErrorDialogService } from './services/error-dialog.service';
@@ -19,14 +18,13 @@ import { TimelineComponent } from './timeline/timeline.component';
 import * as i0 from "@angular/core";
 export declare class DesignerComponent implements OnInit, AfterViewInit {
     private translateService;
-    private projectService;
+    projectService: ProjectService;
     configService: ConfigService;
     private fixturePoolService;
     private hotkeyTargetExcludeService;
     private modalService;
     userService: UserService;
     private userEnsureLoginService;
-    private toastrService;
     private projectLoadService;
     private warningDialogService;
     private errorDialogService;
@@ -45,13 +43,15 @@ export declare class DesignerComponent implements OnInit, AfterViewInit {
     set localProfiles(value: boolean);
     set intro(value: boolean);
     set uniqueProjectNames(value: boolean);
+    set dropzoneChunking(value: boolean);
     private designerMenuSizePx;
     private splitGutterSizePx;
     totalMenuHeightPx: number;
     currentTab: string;
     previewComponent: PreviewComponent;
     timelineComponent: TimelineComponent;
-    constructor(translateService: TranslateService, projectService: ProjectService, configService: ConfigService, fixturePoolService: FixturePoolService, hotkeyTargetExcludeService: HotkeyTargetExcludeService, modalService: BsModalService, userService: UserService, userEnsureLoginService: UserEnsureLoginService, toastrService: ToastrService, projectLoadService: ProjectLoadService, warningDialogService: WarningDialogService, errorDialogService: ErrorDialogService, fixtureService: FixtureService, timelineService: TimelineService, introService: IntroService);
+    constructor(translateService: TranslateService, projectService: ProjectService, configService: ConfigService, fixturePoolService: FixturePoolService, hotkeyTargetExcludeService: HotkeyTargetExcludeService, modalService: BsModalService, userService: UserService, userEnsureLoginService: UserEnsureLoginService, projectLoadService: ProjectLoadService, warningDialogService: WarningDialogService, errorDialogService: ErrorDialogService, fixtureService: FixtureService, timelineService: TimelineService, introService: IntroService);
+    private loadError;
     ngOnInit(): void;
     private calcTotalMenuHeight;
     private onResize;
@@ -69,5 +69,5 @@ export declare class DesignerComponent implements OnInit, AfterViewInit {
     handleKeyboardEvent(event: any): void;
     switchLanguage(language: string): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<DesignerComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DesignerComponent, "lib-designer", never, { "menuHeightPx": { "alias": "menuHeightPx"; "required": false; }; "externalCompositionsAvailable": { "alias": "externalCompositionsAvailable"; "required": false; }; "restUrl": { "alias": "restUrl"; "required": false; }; "enableMediaLibrary": { "alias": "enableMediaLibrary"; "required": false; }; "loginAvailable": { "alias": "loginAvailable"; "required": false; }; "shareAvailable": { "alias": "shareAvailable"; "required": false; }; "languageSwitch": { "alias": "languageSwitch"; "required": false; }; "newProjectTemplate": { "alias": "newProjectTemplate"; "required": false; }; "livePreview": { "alias": "livePreview"; "required": false; }; "localProfiles": { "alias": "localProfiles"; "required": false; }; "intro": { "alias": "intro"; "required": false; }; "uniqueProjectNames": { "alias": "uniqueProjectNames"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DesignerComponent, "lib-designer", never, { "menuHeightPx": { "alias": "menuHeightPx"; "required": false; }; "externalCompositionsAvailable": { "alias": "externalCompositionsAvailable"; "required": false; }; "restUrl": { "alias": "restUrl"; "required": false; }; "enableMediaLibrary": { "alias": "enableMediaLibrary"; "required": false; }; "loginAvailable": { "alias": "loginAvailable"; "required": false; }; "shareAvailable": { "alias": "shareAvailable"; "required": false; }; "languageSwitch": { "alias": "languageSwitch"; "required": false; }; "newProjectTemplate": { "alias": "newProjectTemplate"; "required": false; }; "livePreview": { "alias": "livePreview"; "required": false; }; "localProfiles": { "alias": "localProfiles"; "required": false; }; "intro": { "alias": "intro"; "required": false; }; "uniqueProjectNames": { "alias": "uniqueProjectNames"; "required": false; }; "dropzoneChunking": { "alias": "dropzoneChunking"; "required": false; }; }, {}, never, never, false, never>;
 }

package/lib/designer.module.d.ts

@@ -36,21 +36,22 @@ import * as i34 from "./preset/preset-settings/preset-settings.component";
 import * as i35 from "./scene/scene-settings/scene-settings.component";
 import * as i36 from "./project/project-save/project-save.component";
 import * as i37 from "./fixture-pool/fixture-pool-create-from-file/fixture-pool-create-from-file.component";
-import * as i38 from "@angular/router";
-import * as i39 from "@angular/platform-browser";
-import * as i40 from "@angular/platform-browser/animations";
-import * as i41 from "@angular/common/http";
-import * as i42 from "@angular/forms";
-import * as i43 from "ngx-bootstrap-slider";
-import * as i44 from "@ngx-translate/core";
-import * as i45 from "ngx-bootstrap/accordion";
-import * as i46 from "ngx-bootstrap/popover";
-import * as i47 from "ngx-bootstrap/typeahead";
-import * as i48 from "ngx-sortablejs-plus";
-import * as i49 from "ngx-dropzone-wrapper";
-import * as i50 from "ngx-toastr";
+import * as i38 from "./dropzone/dropzone.component";
+import * as i39 from "@angular/router";
+import * as i40 from "@angular/platform-browser";
+import * as i41 from "@angular/platform-browser/animations";
+import * as i42 from "@angular/common/http";
+import * as i43 from "@angular/forms";
+import * as i44 from "ngx-bootstrap-slider";
+import * as i45 from "@ngx-translate/core";
+import * as i46 from "ngx-bootstrap/accordion";
+import * as i47 from "ngx-bootstrap/popover";
+import * as i48 from "ngx-bootstrap/typeahead";
+import * as i49 from "ngx-sortablejs-plus";
+import * as i50 from "ngx-dropzone-wrapper";
+import * as i51 from "ngx-toastr";
 export declare class DesignerModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<DesignerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof i1.DesignerComponent, typeof i2.WarningDialogComponent, typeof i3.PreviewComponent, typeof i4.EffectCurveComponent, typeof i5.EffectPanTiltComponent, typeof i6.SceneComponent, typeof i7.TimelineComponent, typeof i8.FixtureCapabilityColorComponent, typeof i9.FixtureComponent, typeof i10.FixtureSettingsPositionComponent, typeof i11.FixtureCapabilityComponent, typeof i12.FixtureSettingsComponent, typeof i13.EffectComponent, typeof i14.FixturePoolComponent, typeof i15.PresetComponent, typeof i16.MasterDimmerComponent, typeof i17.FixtureCapabilityDimmerComponent, typeof i18.TimelineGridComponent, typeof i19.CompositionSettingsComponent, typeof i20.ArraySortPipe, typeof i21.FixtureCapabilityPanTiltComponent, typeof i22.FixtureCapabilityChannelComponent, typeof i23.FixtureChannelComponent, typeof i24.FixtureCapabilityColorWheelComponent, typeof i25.UserLoginComponent, typeof i26.UserRegisterComponent, typeof i27.ProjectBrowserComponent, typeof i28.WaitDialogComponent, typeof i29.ProjectImportComponent, typeof i30.ProjectShareComponent, typeof i31.ErrorDialogComponent, typeof i32.FixtureSettingsStageComponent, typeof i33.IntroComponent, typeof i34.PresetSettingsComponent, typeof i35.SceneSettingsComponent, typeof i36.ProjectSaveComponent, typeof i37.FixturePoolCreateFromFileComponent], [typeof i38.RouterModule, typeof i39.BrowserModule, typeof i40.BrowserAnimationsModule, typeof i41.HttpClientModule, typeof i42.FormsModule, typeof i43.NgxBootstrapSliderModule, typeof i44.TranslateModule, typeof i45.AccordionModule, typeof i46.PopoverModule, typeof i47.TypeaheadModule, typeof i48.SortablejsModule, typeof i49.DropzoneModule, typeof i50.ToastrModule], [typeof i1.DesignerComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof i1.DesignerComponent, typeof i2.WarningDialogComponent, typeof i3.PreviewComponent, typeof i4.EffectCurveComponent, typeof i5.EffectPanTiltComponent, typeof i6.SceneComponent, typeof i7.TimelineComponent, typeof i8.FixtureCapabilityColorComponent, typeof i9.FixtureComponent, typeof i10.FixtureSettingsPositionComponent, typeof i11.FixtureCapabilityComponent, typeof i12.FixtureSettingsComponent, typeof i13.EffectComponent, typeof i14.FixturePoolComponent, typeof i15.PresetComponent, typeof i16.MasterDimmerComponent, typeof i17.FixtureCapabilityDimmerComponent, typeof i18.TimelineGridComponent, typeof i19.CompositionSettingsComponent, typeof i20.ArraySortPipe, typeof i21.FixtureCapabilityPanTiltComponent, typeof i22.FixtureCapabilityChannelComponent, typeof i23.FixtureChannelComponent, typeof i24.FixtureCapabilityColorWheelComponent, typeof i25.UserLoginComponent, typeof i26.UserRegisterComponent, typeof i27.ProjectBrowserComponent, typeof i28.WaitDialogComponent, typeof i29.ProjectImportComponent, typeof i30.ProjectShareComponent, typeof i31.ErrorDialogComponent, typeof i32.FixtureSettingsStageComponent, typeof i33.IntroComponent, typeof i34.PresetSettingsComponent, typeof i35.SceneSettingsComponent, typeof i36.ProjectSaveComponent, typeof i37.FixturePoolCreateFromFileComponent, typeof i38.DropzoneComponent], [typeof i39.RouterModule, typeof i40.BrowserModule, typeof i41.BrowserAnimationsModule, typeof i42.HttpClientModule, typeof i43.FormsModule, typeof i44.NgxBootstrapSliderModule, typeof i45.TranslateModule, typeof i46.AccordionModule, typeof i47.PopoverModule, typeof i48.TypeaheadModule, typeof i49.SortablejsModule, typeof i50.DropzoneModule, typeof i51.ToastrModule], [typeof i1.DesignerComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<DesignerModule>;
 }

package/lib/dropzone/dropzone.component.d.ts

@@ -0,0 +1,24 @@
+import { EventEmitter } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { DropzoneConfigInterface } from 'ngx-dropzone-wrapper';
+import { ConfigService } from '../services/config.service';
+import * as i0 from "@angular/core";
+export declare class DropzoneComponent {
+    private translateService;
+    private configService;
+    error: EventEmitter<any>;
+    success: EventEmitter<any>;
+    addedFile: EventEmitter<any>;
+    private _url;
+    private _acceptedFiles;
+    private _maxFiles;
+    set url(value: string);
+    set acceptedFiles(value: string);
+    set maxFiles(value: number);
+    dropzoneConfig: DropzoneConfigInterface;
+    uploadMessage: string;
+    constructor(translateService: TranslateService, configService: ConfigService);
+    updateConfig(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DropzoneComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DropzoneComponent, "app-dropzone", never, { "url": { "alias": "url"; "required": false; }; "acceptedFiles": { "alias": "acceptedFiles"; "required": false; }; "maxFiles": { "alias": "maxFiles"; "required": false; }; }, { "error": "error"; "success": "success"; "addedFile": "addedFile"; }, never, never, false, never>;
+}

package/lib/fixture/fixture.component.d.ts

@@ -1,10 +1,10 @@
 import { OnInit } from '@angular/core';
-import { Fixture } from '../models/fixture';
 import { FixturePoolService } from '../services/fixture-pool.service';
 import { FixtureService } from '../services/fixture.service';
 import { IntroService } from '../services/intro.service';
 import { PresetService } from '../services/preset.service';
 import { ProjectService } from '../services/project.service';
+import { PresetFixture } from '../models/preset-fixture';
 import * as i0 from "@angular/core";
 export declare class FixtureComponent implements OnInit {
     projectService: ProjectService;
@@ -14,8 +14,9 @@ export declare class FixtureComponent implements OnInit {
     introService: IntroService;
     constructor(projectService: ProjectService, presetService: PresetService, fixturePoolService: FixturePoolService, fixtureService: FixtureService, introService: IntroService);
     ngOnInit(): void;
-    fixtureIsSelected(fixture: Fixture): boolean;
-    selectFixture(event: any, fixture: Fixture): void;
+    fixtureName(presetFixture: PresetFixture): string;
+    fixtureIsSelected(presetFixture: PresetFixture): boolean;
+    selectFixture(event: any, presetFixture: PresetFixture): void;
     selectAll(): void;
     selectNone(): void;
     openFixturePool(): void;

package/lib/models/cached-fixture.d.ts

@@ -4,6 +4,7 @@ import { FixtureMode } from './fixture-mode';
 import { FixtureProfile } from './fixture-profile';
 export declare class CachedFixture {
     fixture: Fixture;
+    pixelKey: string;
     profile: FixtureProfile;
     mode: FixtureMode;
     channels: CachedFixtureChannel[];

package/lib/models/fixture-matrix-pixel-group-constraints.d.ts

@@ -0,0 +1,8 @@
+export declare class FixtureMatrixPixelGroupConstraints {
+    keys: string[];
+    x: string[];
+    y: string[];
+    z: string[];
+    name: string[];
+    constructor(data?: any);
+}

package/lib/models/fixture-matrix-pixel-group.d.ts

@@ -0,0 +1,6 @@
+import { FixtureMatrixPixelGroupConstraints } from './fixture-matrix-pixel-group-constraints';
+export declare class FixtureMatrixPixelGroup {
+    isAll: boolean;
+    constraints: FixtureMatrixPixelGroupConstraints;
+    constructor(isAll?: boolean, constraints?: any);
+}

package/lib/models/fixture-matrix.d.ts

@@ -0,0 +1,6 @@
+export declare class FixtureMatrix {
+    pixelKeys: string[][];
+    pixelCount: number[];
+    pixelGroups: any;
+    constructor(data?: any);
+}

package/lib/models/fixture-mode-channel.d.ts

@@ -0,0 +1,8 @@
+export declare class FixtureModeChannel {
+    name: string;
+    insert: string;
+    repeatFor: string[];
+    channelOrder: string;
+    templateChannels: string[];
+    constructor(data?: any);
+}

package/lib/models/fixture-mode.d.ts

@@ -1,6 +1,8 @@
+import { FixtureModeChannel } from './fixture-mode-channel';
 export declare class FixtureMode {
     name: string;
     shortName: string;
-    channels: any[];
+    channels: FixtureModeChannel[];
+    channelCount: number;
     constructor(data?: any);
 }

package/lib/models/fixture-physical.d.ts

@@ -0,0 +1,4 @@
+export declare class FixturePhysical {
+    dimensions: number[];
+    constructor(data?: any);
+}

package/lib/models/fixture-profile.d.ts

@@ -1,4 +1,6 @@
+import { FixtureMatrix } from './fixture-matrix';
 import { FixtureMode } from './fixture-mode';
+import { FixturePhysical } from './fixture-physical';
 export declare enum FixtureCategory {
     Blinder = "Blinder",
     'Color Changer' = "Color Changer",
@@ -26,7 +28,10 @@ export declare class FixtureProfile {
     manufacturerShortName: string;
     manufacturerName: string;
     categories: FixtureCategory[];
+    physical: FixturePhysical;
+    matrix: FixtureMatrix;
     availableChannels: any;
+    templateChannels: any;
     shortName: string;
     wheels: any;
     modes: FixtureMode[];

package/lib/models/preset-fixture.d.ts

@@ -0,0 +1,5 @@
+export declare class PresetFixture {
+    fixtureUuid: string;
+    pixelKey: string;
+    constructor(data?: any);
+}

package/lib/models/preset.d.ts

@@ -1,10 +1,12 @@
 import { Effect } from './effect';
 import { FixtureCapabilityValue } from './fixture-capability-value';
 import { FixtureChannelValue } from './fixture-channel-value';
+import { PresetFixture } from './preset-fixture';
 export declare class Preset {
     uuid: string;
     name: string;
     fixtureUuids: string[];
+    fixtures: PresetFixture[];
     fixtureChannelValues: FixtureChannelValue[];
     fixtureCapabilityValues: FixtureCapabilityValue[];
     effects: Effect[];

package/lib/models/project.d.ts

@@ -2,9 +2,11 @@ import { Composition } from './composition';
 import { Fixture } from './fixture';
 import { FixtureProfile } from './fixture-profile';
 import { Preset } from './preset';
+import { PresetFixture } from './preset-fixture';
 import { Scene } from './scene';
 export declare class Project {
     id: number;
+    version: number;
     uuid: string;
     name: string;
     shareToken: string;
@@ -22,6 +24,7 @@ export declare class Project {
     compositions: Composition[];
     fixtureProfiles: FixtureProfile[];
     fixtures: Fixture[];
+    presetFixtures: PresetFixture[];
     scenes: Scene[];
     presets: Preset[];
     constructor(data?: any);

package/lib/preview/models/color-changer-3d.d.ts

@@ -5,21 +5,11 @@ import { FixtureService } from '../../services/fixture.service';
 import { PreviewMeshService } from '../../services/preview-mesh.service';
 import { Fixture3d } from './fixture-3d';
 export declare class ColorChanger3d extends Fixture3d {
-    private readonly pointLightMaxIntensity;
-    private readonly spotLightMaxIntensity;
     private mesh;
     private objectGroup;
-    private spotlightGroup;
-    private spotLight;
-    private spotLightHelper;
-    private spotLightBeam;
-    private pointLight;
     private lastSelected;
     private material;
-    private atmosphereMaterial;
-    private atmosphereMat;
-    private createSpotLightBeam;
-    private createObjects;
+    protected createObjects(): void;
     constructor(fixtureService: FixtureService, previewMeshService: PreviewMeshService, fixture: CachedFixture, scene: any);
     getObject(): THREE.Object3D;
     updatePreview(channelValues: FixtureChannelValue[], masterDimmerValue: number): void;

package/lib/preview/models/fixture-3d.d.ts

@@ -6,6 +6,8 @@ import { FixtureChannelValue } from '../../models/fixture-channel-value';
 import { FixtureService } from '../../services/fixture.service';
 export declare abstract class Fixture3d {
     fixtureService: FixtureService;
+    private readonly pointLightMaxIntensity;
+    private readonly spotLightLightMaxIntensity;
     fixture: CachedFixture;
     fixtureHasDimmer: boolean;
     fixtureHasColorWheel: boolean;
@@ -18,9 +20,18 @@ export declare abstract class Fixture3d {
     isSelected: boolean;
     isLoaded: boolean;
     protected selectedMaterial: THREE.MeshLambertMaterial;
+    protected pointLight: THREE.PointLight;
+    protected atmosphereMaterial: THREE.ShaderMaterial;
+    protected spotLight: THREE.SpotLight;
+    protected spotLightHelper: THREE.SpotLightHelper;
+    protected spotLightBeam: THREE.Mesh;
+    protected spotlightGroup: THREE.Object3D;
     constructor(fixtureService: FixtureService, fixture: CachedFixture, scene: any);
+    protected createObjects(): void;
     protected getCapabilityInValue(channel: CachedFixtureChannel, value: number): CachedFixtureCapability;
     updatePreview(channelValues: FixtureChannelValue[], masterDimmerValue: number): void;
     updatePosition(object: THREE.Object3D): void;
+    protected atmosphereMat(): any;
+    protected createSpotLightBeam(): void;
     destroy(): void;
 }

package/lib/preview/models/moving-head-3d.d.ts

@@ -5,28 +5,18 @@ import { FixtureService } from '../../services/fixture.service';
 import { PreviewMeshService } from '../../services/preview-mesh.service';
 import { Fixture3d } from './fixture-3d';
 export declare class MovingHead3d extends Fixture3d {
-    private readonly pointLightMaxIntensity;
-    private readonly spotLightLightMaxIntensity;
     private pan;
     private tilt;
     private socket;
     private arm;
     private head;
     private headGroup;
-    private spotlightGroup;
     private armGroup;
     private objectGroup;
-    private spotLight;
-    private spotLightHelper;
-    private spotLightBeam;
-    private pointLight;
     private lastBeamAngleDegrees;
     private lastSelected;
     private material;
-    private atmosphereMaterial;
-    private atmosphereMat;
-    private createSpotLightBeam;
-    private createObjects;
+    protected createObjects(): void;
     constructor(fixtureService: FixtureService, previewMeshService: PreviewMeshService, fixture: CachedFixture, scene: any);
     getObject(): THREE.Object3D;
     updatePreview(channelValues: FixtureChannelValue[], masterDimmerValue: number): void;

package/lib/services/config.service.d.ts

@@ -12,6 +12,7 @@ export declare class ConfigService {
     localProfiles: boolean;
     intro: boolean;
     uniqueProjectNames: boolean;
+    dropzoneChunking: boolean;
     menuHeightChanged: Subject<void>;
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<ConfigService, never>;

package/lib/services/fixture.service.d.ts

@@ -25,7 +25,8 @@ export declare class FixtureService {
     selectedSettingsFixtures: Fixture[];
     constructor(http: HttpClient, projectService: ProjectService, translateService: TranslateService, toastrService: ToastrService, uuidService: UuidService);
     getFixtureByUuid(uuid: string): Fixture;
-    getCachedFixtureByUuid(uuid: string): CachedFixture;
+    private fixtureUuidAndPixelKeyEquals;
+    getCachedFixtureByUuid(uuid: string, pixelKey: string): CachedFixture;
     getSearchProfiles(): Observable<FixtureProfile[]>;
     getProfileByUuid(uuid: string): FixtureProfile;
     loadProfileByUuid(uuid: string): Observable<void>;
@@ -46,7 +47,16 @@ export declare class FixtureService {
     private getDefaultValueByChannel;
     private getColorWheelByChannel;
     getChannelByName(fixture: CachedFixture, channelName: string): CachedFixtureChannel;
-    getCachedChannels(profile: FixtureProfile, mode: FixtureMode): CachedFixtureChannel[];
+    private getChannelNameWithPixelKey;
+    private addCachedChannel;
+    private alphanumericSort;
+    private getAllPixelKeys;
+    private getAllPixelGroups;
+    private getPixelKeysInOrder;
+    getModeChannelCount(profile: FixtureProfile, mode: FixtureMode): number;
+    getCachedChannels(profile: FixtureProfile, mode: FixtureMode, pixelKey: string): CachedFixtureChannel[];
+    fixtureGetUniquePixelKeys(fixture: Fixture): string[];
+    fixtureHasGeneralChannel(fixture: Fixture): boolean;
     updateCachedFixtures(): void;
     capabilitiesMatch(type1: FixtureCapabilityType, type2: FixtureCapabilityType, color1: FixtureCapabilityColor, color2: FixtureCapabilityColor, wheel1: string, wheel2: string, profileUuid1: string, profileUuid2: string): boolean;
     settingsFixtureIsSelected(fixture: Fixture): boolean;

package/lib/services/preset.service.d.ts

@@ -13,6 +13,7 @@ import { EffectService } from './effect.service';
 import { FixtureService } from './fixture.service';
 import { ProjectService } from './project.service';
 import { UuidService } from './uuid.service';
+import { PresetFixture } from '../models/preset-fixture';
 import * as i0 from "@angular/core";
 export declare class PresetService {
     private effectService;
@@ -31,8 +32,10 @@ export declare class PresetService {
     liveChangePending: boolean;
     constructor(effectService: EffectService, uuidService: UuidService, projectService: ProjectService, fixtureService: FixtureService, configService: ConfigService, http: HttpClient, animationService: AnimationService);
     getPresetByUuid(uuid: string): Preset;
-    fixtureIsSelected(fixture: Fixture, preset?: Preset): boolean;
-    switchFixtureSelection(fixture: Fixture): void;
+    fixtureUuidAndPixelKeyEquals(fixtureUuid1: string, fixtureUuid2: string, pixelKey1: string, pixelKey2: string): boolean;
+    getPresetFixture(preset: Preset, fixtureUuid: string, pixelKey?: string): PresetFixture;
+    fixtureIsSelected(fixture: Fixture, pixelKey: string, preset?: Preset): boolean;
+    switchFixtureSelection(fixture: Fixture, pixelKey: string): void;
     selectAllFixtures(): void;
     selectNoFixtures(): void;
     removeDeletedFixtures(): void;

package/lib/services/preview.service.d.ts

@@ -8,20 +8,18 @@ import { PresetService } from './preset.service';
 import { ProjectService } from './project.service';
 import { SceneService } from './scene.service';
 import { TimelineService } from './timeline.service';
-import { UniverseService } from './universe.service';
 import * as i0 from "@angular/core";
 export declare class PreviewService {
     private presetService;
     private fixtureService;
     private sceneService;
     private timelineService;
-    private universeService;
     private projectService;
     doUpdateFixtureSetup: Subject<void>;
     scene: THREE.Scene;
     private stageMeshes;
     private stageMaterial;
-    constructor(presetService: PresetService, fixtureService: FixtureService, sceneService: SceneService, timelineService: TimelineService, universeService: UniverseService, projectService: ProjectService);
+    constructor(presetService: PresetService, fixtureService: FixtureService, sceneService: SceneService, timelineService: TimelineService, projectService: ProjectService);
     private getAlreadyCalculatedFixture;
     getPresets(timeMillis: number): PresetRegionScene[];
     private mixChannelValue;
@@ -31,8 +29,7 @@ export declare class PreviewService {
     private mixChannelValues;
     private mixEffects;
     getChannelValues(timeMillis: number, presets: PresetRegionScene[]): Map<CachedFixture, FixtureChannelValue[]>;
-    setUniverseValues(fixtures: Map<CachedFixture, FixtureChannelValue[]>, masterDimmerValue: number): void;
-    fixtureIsSelected(uuid: string, presets: PresetRegionScene[]): boolean;
+    fixtureIsSelected(uuid: string, pixelKey: string, presets: PresetRegionScene[]): boolean;
     updateFixtureSetup(): void;
     private prepareStageMesh;
     updateStage(): void;

package/lib/services/project-load.service.d.ts

@@ -8,6 +8,7 @@ import { ProjectService } from './project.service';
 import { SceneService } from './scene.service';
 import { TimelineService } from './timeline.service';
 import { UuidService } from './uuid.service';
+import { WarningDialogService } from './warning-dialog.service';
 import * as i0 from "@angular/core";
 export declare class ProjectLoadService {
     private projectService;
@@ -20,7 +21,10 @@ export declare class ProjectLoadService {
     private timelineService;
     private router;
     private activatedRoute;
-    constructor(projectService: ProjectService, previewService: PreviewService, fixtureService: FixtureService, presetService: PresetService, sceneService: SceneService, modalService: BsModalService, uuidService: UuidService, timelineService: TimelineService, router: Router, activatedRoute: ActivatedRoute);
+    private warningDialogService;
+    constructor(projectService: ProjectService, previewService: PreviewService, fixtureService: FixtureService, presetService: PresetService, sceneService: SceneService, modalService: BsModalService, uuidService: UuidService, timelineService: TimelineService, router: Router, activatedRoute: ActivatedRoute, warningDialogService: WarningDialogService);
+    private migrateToVersion2;
+    private migrateFromOldProject;
     private afterLoad;
     private selectScenesPresetComposition;
     load(id: number, name: string, shareToken?: string): Observable<void>;

package/lib/services/project.service.d.ts

@@ -5,10 +5,8 @@ import { ToastrService } from 'ngx-toastr';
 import { Observable } from 'rxjs';
 import { Project } from '../models/project';
 import { UserService } from './user.service';
-import { UuidService } from './uuid.service';
 import * as i0 from "@angular/core";
 export declare class ProjectService {
-    private uuidService;
     private http;
     private userService;
     private router;
@@ -16,7 +14,8 @@ export declare class ProjectService {
     private translateService;
     private toastrService;
     project: Project;
-    constructor(uuidService: UuidService, http: HttpClient, userService: UserService, router: Router, activatedRoute: ActivatedRoute, translateService: TranslateService, toastrService: ToastrService);
+    currentProjectVersion: number;
+    constructor(http: HttpClient, userService: UserService, router: Router, activatedRoute: ActivatedRoute, translateService: TranslateService, toastrService: ToastrService);
     private saveApi;
     save(project: Project): void;
     getAllProjects(): Observable<Project[]>;

package/lib/services/timeline.service.d.ts

@@ -42,7 +42,7 @@ export declare class TimelineService {
     formatTimeCallback(seconds: number, pxPerSec: number): string | number;
     timeInterval(pxPerSec: number): number;
     primaryLabelInterval(pxPerSec: number): number;
-    secondaryLabelInterval(pxPerSec: number): 5 | 0 | 2;
+    secondaryLabelInterval(pxPerSec: number): 0 | 2 | 5;
     private seeekWithTimeline;
     applyZoom(zoom: any): void;
     private isWaveSurferReady;

package/lib/timeline/composition-settings/composition-settings.component.d.ts

@@ -19,7 +19,7 @@ export declare class CompositionSettingsComponent implements OnInit {
     private http;
     private warningDialogService;
     private toastrService;
-    private projectService;
+    projectService: ProjectService;
     composition: Composition;
     existingCompositionNames: string[];
     onClose: Subject<number>;
@@ -30,6 +30,7 @@ export declare class CompositionSettingsComponent implements OnInit {
     uploading: boolean;
     constructor(bsModalRef: BsModalRef, timelineService: TimelineService, configService: ConfigService, translateService: TranslateService, http: HttpClient, warningDialogService: WarningDialogService, toastrService: ToastrService, projectService: ProjectService);
     ngOnInit(): void;
+    getDropzoneUrl(): string;
     ok(): void;
     cancel(): void;
     handleKeyboardEvent(event: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketshow/designer",
-  "version": "1.33.0",
+  "version": "1.36.0",
   "dependencies": {
     "tslib": "^2.0.0"
   },

package/esm2022/lib/models/universe.mjs

@@ -1,11 +0,0 @@
-export class Universe {
-    // TODO Add output configuration
-    constructor(uuidService) {
-        this.uuidService = uuidService;
-        this.channelValues = [];
-        if (this.uuidService) {
-            this.uuid = this.uuidService.getUuid();
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pdmVyc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9kZXNpZ25lci9zcmMvbGliL21vZGVscy91bml2ZXJzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8sUUFBUTtJQUtuQixnQ0FBZ0M7SUFFaEMsWUFBb0IsV0FBd0I7UUFBeEIsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFKNUMsa0JBQWEsR0FBYSxFQUFFLENBQUM7UUFLM0IsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDckIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3pDLENBQUM7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBVdWlkU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL3V1aWQuc2VydmljZSc7XG5cbmV4cG9ydCBjbGFzcyBVbml2ZXJzZSB7XG4gIHV1aWQ6IHN0cmluZztcbiAgbmFtZTogc3RyaW5nO1xuICBjaGFubmVsVmFsdWVzOiBudW1iZXJbXSA9IFtdO1xuXG4gIC8vIFRPRE8gQWRkIG91dHB1dCBjb25maWd1cmF0aW9uXG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSB1dWlkU2VydmljZTogVXVpZFNlcnZpY2UpIHtcbiAgICBpZiAodGhpcy51dWlkU2VydmljZSkge1xuICAgICAgdGhpcy51dWlkID0gdGhpcy51dWlkU2VydmljZS5nZXRVdWlkKCk7XG4gICAgfVxuICB9XG59XG4iXX0=

package/esm2022/lib/services/universe.service.mjs

@@ -1,23 +0,0 @@
-import { Injectable } from '@angular/core';
-import * as i0 from "@angular/core";
-export class UniverseService {
-    constructor() {
-        this.universes = [];
-    }
-    getUniverseByUuid(uuid) {
-        for (const universe of this.universes) {
-            if (universe.uuid === uuid) {
-                return universe;
-            }
-        }
-    }
-    static { this.ɵfac = function UniverseService_Factory(t) { return new (t || UniverseService)(); }; }
-    static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: UniverseService, factory: UniverseService.ɵfac, providedIn: 'root' }); }
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(UniverseService, [{
-        type: Injectable,
-        args: [{
-                providedIn: 'root',
-            }]
-    }], () => [], null); })();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pdmVyc2Uuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Rlc2lnbmVyL3NyYy9saWIvc2VydmljZXMvdW5pdmVyc2Uuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOztBQU0zQyxNQUFNLE9BQU8sZUFBZTtJQUcxQjtRQUZBLGNBQVMsR0FBZSxFQUFFLENBQUM7SUFFWixDQUFDO0lBRWhCLGlCQUFpQixDQUFDLElBQVk7UUFDNUIsS0FBSyxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDdEMsSUFBSSxRQUFRLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO2dCQUMzQixPQUFPLFFBQVEsQ0FBQztZQUNsQixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7Z0ZBWFUsZUFBZTt1RUFBZixlQUFlLFdBQWYsZUFBZSxtQkFGZCxNQUFNOztpRkFFUCxlQUFlO2NBSDNCLFVBQVU7ZUFBQztnQkFDVixVQUFVLEVBQUUsTUFBTTthQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFVuaXZlcnNlIH0gZnJvbSAnLi4vbW9kZWxzL3VuaXZlcnNlJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCcsXG59KVxuZXhwb3J0IGNsYXNzIFVuaXZlcnNlU2VydmljZSB7XG4gIHVuaXZlcnNlczogVW5pdmVyc2VbXSA9IFtdO1xuXG4gIGNvbnN0cnVjdG9yKCkge31cblxuICBnZXRVbml2ZXJzZUJ5VXVpZCh1dWlkOiBzdHJpbmcpOiBVbml2ZXJzZSB7XG4gICAgZm9yIChjb25zdCB1bml2ZXJzZSBvZiB0aGlzLnVuaXZlcnNlcykge1xuICAgICAgaWYgKHVuaXZlcnNlLnV1aWQgPT09IHV1aWQpIHtcbiAgICAgICAgcmV0dXJuIHVuaXZlcnNlO1xuICAgICAgfVxuICAgIH1cbiAgfVxufVxuIl19

package/lib/models/universe.d.ts

@@ -1,8 +0,0 @@
-import { UuidService } from '../services/uuid.service';
-export declare class Universe {
-    private uuidService;
-    uuid: string;
-    name: string;
-    channelValues: number[];
-    constructor(uuidService: UuidService);
-}

package/lib/services/universe.service.d.ts

@@ -1,9 +0,0 @@
-import { Universe } from '../models/universe';
-import * as i0 from "@angular/core";
-export declare class UniverseService {
-    universes: Universe[];
-    constructor();
-    getUniverseByUuid(uuid: string): Universe;
-    static ɵfac: i0.ɵɵFactoryDeclaration<UniverseService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<UniverseService>;
-}