@rocketshow/designer 1.67.0 → 1.68.0

package/fesm2022/rocketshow-designer.mjs

@@ -11,7 +11,7 @@ import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpErrorResponse, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import * as i3$1 from 'ngx-toastr';
 import { ToastrModule } from 'ngx-toastr';
-import { of, forkJoin, Observable, Subject, timer } from 'rxjs';
+import { Subject, of, forkJoin, Observable, timer } from 'rxjs';
 import * as i3 from '@angular/router';
 import { RouterModule } from '@angular/router';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
@@ -814,6 +814,9 @@ class Project {
         this.fixtures = [];
         // the fixtures and pixel keys in order to be selectable
         this.presetFixtures = [];
+        // the universes (name + uuid) the project's fixtures are assigned to
+        // (used when the user manages universes freely, see freeUniverseEdit)
+        this.universes = [];
         this.scenes = [];
         this.presets = [];
         if (!data) {
@@ -855,6 +858,11 @@ class Project {
                 this.presetFixtures.push(new PresetFixture(presetFixture));
             }
         }
+        if (data.universes) {
+            for (const universe of data.universes) {
+                this.universes.push({ uuid: universe.uuid, name: universe.name });
+            }
+        }
         if (data.scenes) {
             for (const scene of data.scenes) {
                 this.scenes.push(new Scene(scene));
@@ -952,14 +960,47 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 }]
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
+class ConfigService {
+    constructor() {
+        this.enableMediaLibrary = false;
+        this.loginAvailable = false;
+        this.shareAvailable = false;
+        this.menuHeightPx = 0;
+        this.languageSwitch = false;
+        this.livePreview = false;
+        this.localProfiles = false;
+        this.intro = false;
+        this.uniqueProjectNames = false;
+        this.dropzoneChunking = true;
+        // List of universes (with name and uuid) the user can choose from
+        // in the fixture pool. Typically supplied by the host application
+        // (e.g. fetched from a backend).
+        this.universes = [];
+        // When true, the user can freely add their own universes (only
+        // names) in the fixture pool, without depending on a list provided
+        // by the host application.
+        this.freeUniverseEdit = false;
+        this.menuHeightChanged = new Subject();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [] });
+
 class ProjectService {
-    constructor(http, userService, router, activatedRoute, translateService, toastrService) {
+    constructor(http, userService, router, activatedRoute, translateService, toastrService, configService) {
         this.http = http;
         this.userService = userService;
         this.router = router;
         this.activatedRoute = activatedRoute;
         this.translateService = translateService;
         this.toastrService = toastrService;
+        this.configService = configService;
         // the project-file versions used in this version of the designer (older ones will be migrated, newer ones are not supported)
         this.currentProjectVersion = 2;
     }
@@ -985,6 +1026,10 @@ class ProjectService {
     }
     save(project) {
         // tries to save the project and returns, whether it has been saved or not
+        if (this.configService.freeUniverseEdit) {
+            // persist the freely edited universes together with the project
+            project.universes = this.configService.universes;
+        }
         this.saveApi(project).subscribe(() => {
             const msg = 'designer.project.save-success';
             const title = 'designer.project.save-success-title';
@@ -1021,7 +1066,7 @@ class ProjectService {
             return project;
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectService, deps: [{ token: i1.HttpClient }, { token: UserService }, { token: i3.Router }, { token: i3.ActivatedRoute }, { token: i2.TranslateService }, { token: i3$1.ToastrService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectService, deps: [{ token: i1.HttpClient }, { token: UserService }, { token: i3.Router }, { token: i3.ActivatedRoute }, { token: i2.TranslateService }, { token: i3$1.ToastrService }, { token: ConfigService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectService, decorators: [{
@@ -1029,7 +1074,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: UserService }, { type: i3.Router }, { type: i3.ActivatedRoute }, { type: i2.TranslateService }, { type: i3$1.ToastrService }] });
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: UserService }, { type: i3.Router }, { type: i3.ActivatedRoute }, { type: i2.TranslateService }, { type: i3$1.ToastrService }, { type: ConfigService }] });
 
 class UuidService {
     constructor() { }
@@ -2039,38 +2084,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 }]
         }], ctorParameters: () => [] });
 
-class ConfigService {
-    constructor() {
-        this.enableMediaLibrary = false;
-        this.loginAvailable = false;
-        this.shareAvailable = false;
-        this.menuHeightPx = 0;
-        this.languageSwitch = false;
-        this.livePreview = false;
-        this.localProfiles = false;
-        this.intro = false;
-        this.uniqueProjectNames = false;
-        this.dropzoneChunking = true;
-        // List of universes (with name and uuid) the user can choose from
-        // in the fixture pool. Typically supplied by the host application
-        // (e.g. fetched from a backend).
-        this.universes = [];
-        // When true, the user can freely add their own universes (only
-        // names) in the fixture pool, without depending on a list provided
-        // by the host application.
-        this.freeUniverseEdit = false;
-        this.menuHeightChanged = new Subject();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ConfigService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [] });
-
 class TimelineStateService {
     constructor() {
         this.playState = 'paused';
@@ -3557,12 +3570,14 @@ class PreviewService {
                     }
                     const fixture = this.fixtureService.getFixtureByUuid(projectFixture.fixtureUuid);
                     const firstDmxChannelAndFixtureUuid = {
+                        dmxUniverseUuid: fixture.dmxUniverseUuid,
                         firstDmxChannel: fixture.dmxFirstChannel,
                         pixelKey: projectFixture.pixelKey,
                     };
-                    const exists = countedFirstDmxChannelPixelKey.some((item) => item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
+                    const exists = countedFirstDmxChannelPixelKey.some((item) => item.dmxUniverseUuid === firstDmxChannelAndFixtureUuid.dmxUniverseUuid &&
+                        item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
                         ((!item.pixelKey && !firstDmxChannelAndFixtureUuid.pixelKey) || item.pixelKey === firstDmxChannelAndFixtureUuid.pixelKey));
-                    // don't count fixtures on the same channel as already counted ones
+                    // don't count fixtures on the same universe and channel as already counted ones
                     if (!exists) {
                         index++;
                         countedFirstDmxChannelPixelKey.push(firstDmxChannelAndFixtureUuid);
@@ -4681,7 +4696,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         }], ctorParameters: () => [{ type: i1$1.BsModalService }, { type: i2.TranslateService }] });
 
 class ProjectLoadService {
-    constructor(projectService, previewService, fixtureService, presetService, sceneService, modalService, uuidService, timelineService, router, activatedRoute, warningDialogService, livePreviewService) {
+    constructor(projectService, previewService, fixtureService, presetService, sceneService, modalService, uuidService, timelineService, router, activatedRoute, warningDialogService, livePreviewService, configService) {
         this.projectService = projectService;
         this.previewService = previewService;
         this.fixtureService = fixtureService;
@@ -4694,6 +4709,7 @@ class ProjectLoadService {
         this.activatedRoute = activatedRoute;
         this.warningDialogService = warningDialogService;
         this.livePreviewService = livePreviewService;
+        this.configService = configService;
     }
     migrateToVersion2() {
         for (let fixture of this.projectService.project.fixtures) {
@@ -4741,8 +4757,32 @@ class ProjectLoadService {
             this.warningDialogService.show('designer.project.migrated').subscribe();
         }
     }
+    setupUniverses() {
+        if (this.configService.freeUniverseEdit) {
+            // when the user manages universes freely, the project itself stores the
+            // universes -> use them as the working list
+            this.configService.universes = this.projectService.project.universes;
+            // ensure a default universe exists
+            if (this.configService.universes.length === 0) {
+                this.configService.universes.push({ uuid: this.uuidService.getUuid(), name: 'Universe 1' });
+            }
+        }
+        if (this.configService.universes.length === 0) {
+            // no universe available to assign the fixtures to (e.g. the host
+            // application did not provide any)
+            return;
+        }
+        // assign all fixtures without a universe to the first (default) universe
+        const defaultUniverseUuid = this.configService.universes[0].uuid;
+        for (const fixture of this.projectService.project.fixtures) {
+            if (!fixture.dmxUniverseUuid) {
+                fixture.dmxUniverseUuid = defaultUniverseUuid;
+            }
+        }
+    }
     afterLoad() {
         this.migrateFromOldProject();
+        this.setupUniverses();
         this.fixtureService.updateCachedFixtures();
         this.presetService.removeDeletedFixtures();
         this.previewService.updateFixtureSetup();
@@ -4850,7 +4890,7 @@ class ProjectLoadService {
         this.selectScenesPresetComposition();
         this.afterLoad();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectLoadService, deps: [{ token: ProjectService }, { token: PreviewService }, { token: FixtureService }, { token: PresetService }, { token: SceneService }, { token: i1$1.BsModalService }, { token: UuidService }, { token: TimelineService }, { token: i3.Router }, { token: i3.ActivatedRoute }, { token: WarningDialogService }, { token: LivePreviewService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectLoadService, deps: [{ token: ProjectService }, { token: PreviewService }, { token: FixtureService }, { token: PresetService }, { token: SceneService }, { token: i1$1.BsModalService }, { token: UuidService }, { token: TimelineService }, { token: i3.Router }, { token: i3.ActivatedRoute }, { token: WarningDialogService }, { token: LivePreviewService }, { token: ConfigService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectLoadService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ProjectLoadService, decorators: [{
@@ -4858,7 +4898,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: ProjectService }, { type: PreviewService }, { type: FixtureService }, { type: PresetService }, { type: SceneService }, { type: i1$1.BsModalService }, { type: UuidService }, { type: TimelineService }, { type: i3.Router }, { type: i3.ActivatedRoute }, { type: WarningDialogService }, { type: LivePreviewService }] });
+        }], ctorParameters: () => [{ type: ProjectService }, { type: PreviewService }, { type: FixtureService }, { type: PresetService }, { type: SceneService }, { type: i1$1.BsModalService }, { type: UuidService }, { type: TimelineService }, { type: i3.Router }, { type: i3.ActivatedRoute }, { type: WarningDialogService }, { type: LivePreviewService }, { type: ConfigService }] });
 
 class ArraySortPipe {
     transform(array, field) {
@@ -7578,12 +7618,14 @@ class EffectCurveComponent {
         for (const presetFixture of this.presetService.selectedPreset.fixtures) {
             const fixture = this.fixtureService.getFixtureByUuid(presetFixture.fixtureUuid);
             const firstDmxChannelAndFixtureUuid = {
+                dmxUniverseUuid: fixture.dmxUniverseUuid,
                 firstDmxChannel: fixture.dmxFirstChannel,
                 pixelKey: presetFixture.pixelKey,
             };
-            const exists = countedFirstDmxChannelPixelKey.some((item) => item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
+            const exists = countedFirstDmxChannelPixelKey.some((item) => item.dmxUniverseUuid === firstDmxChannelAndFixtureUuid.dmxUniverseUuid &&
+                item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
                 ((!item.pixelKey && !firstDmxChannelAndFixtureUuid.pixelKey) || item.pixelKey === firstDmxChannelAndFixtureUuid.pixelKey));
-            // don't count it, if it has the same DMX address and pixel key (if available),
+            // don't count it, if it has the same DMX universe, address and pixel key (if available),
             // as an already counted one
             if (!exists) {
                 count++;