@rocketshow/designer 1.35.0 → 1.36.0

package/fesm2022/rocketshow-designer.mjs

@@ -1029,9 +1029,21 @@ class FixtureService {
             }
         }
     }
+    fixtureUuidAndPixelKeyEquals(fixtureUuid1, fixtureUuid2, pixelKey1, pixelKey2) {
+        return fixtureUuid1 === fixtureUuid2 && ((pixelKey1 == null && pixelKey2 == null) || pixelKey1 === pixelKey2);
+    }
     getCachedFixtureByUuid(uuid, pixelKey) {
         for (const fixture of this.cachedFixtures) {
-            if (fixture.fixture.uuid === uuid && ((!fixture.pixelKey && !pixelKey) || fixture.pixelKey === pixelKey)) {
+            if (this.fixtureUuidAndPixelKeyEquals(fixture.fixture.uuid, uuid, fixture.pixelKey, pixelKey)) {
+                return fixture;
+            }
+        }
+        // not yet found -> try searching the fixture without pixelKey for the general channels
+        if (pixelKey) {
+            return undefined;
+        }
+        for (const fixture of this.cachedFixtures) {
+            if (!fixture.pixelKey && fixture.fixture.uuid === uuid) {
                 return fixture;
             }
         }
@@ -1250,9 +1262,12 @@ class FixtureService {
         }
         return undefined;
     }
+    getChannelNameWithPixelKey(templateChannelName, pixelKey) {
+        return templateChannelName.replace('$pixelKey', pixelKey);
+    }
     addCachedChannel(channels, channel, templateChannelName, pixelKey, profile) {
         const cachedFixtureChannel = new CachedFixtureChannel();
-        const channelName = templateChannelName.replace('$pixelKey', pixelKey);
+        const channelName = this.getChannelNameWithPixelKey(templateChannelName, pixelKey);
         cachedFixtureChannel.channel = channel;
         cachedFixtureChannel.name = channelName;
         cachedFixtureChannel.capabilities = this.getCapabilitiesByChannel(cachedFixtureChannel.channel, channelName, profile);
@@ -1267,6 +1282,26 @@ class FixtureService {
     alphanumericSort(a, b) {
         return a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' });
     }
+    getAllPixelKeys(profile) {
+        let result = [];
+        for (let pixelKeyX of profile.matrix.pixelKeys) {
+            for (let pixelKeyY of pixelKeyX) {
+                for (let pixelKeyZ of pixelKeyY) {
+                    if (pixelKeyZ) {
+                        result.push(pixelKeyZ);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    getAllPixelGroups(profile) {
+        let result = [];
+        for (const property of Object.keys(profile.matrix.pixelGroups)) {
+            result.push(property);
+        }
+        return result;
+    }
     getPixelKeysInOrder(profile, repeatFor) {
         let result = [];
         // could contain just a single string (e.g. 'eachPixelABC') or
@@ -1274,6 +1309,9 @@ class FixtureService {
             // an array of pixel (groups)
             result = repeatFor;
         }
+        else if (repeatFor.length === 0) {
+            return result;
+        }
         else if (repeatFor[0] === 'eachPixelABC') {
             // Gets computed into an alphanumerically sorted list of all pixelKeys
             if (profile.matrix.pixelCount.length === 3) {
@@ -1286,23 +1324,13 @@ class FixtureService {
                 }
             }
             else {
-                for (let pixelKeyX of profile.matrix.pixelKeys) {
-                    for (let pixelKeyY of pixelKeyX) {
-                        for (let pixelKeyZ of pixelKeyY) {
-                            if (pixelKeyZ) {
-                                result.push(pixelKeyZ);
-                            }
-                        }
-                    }
-                }
+                result = result.concat(this.getAllPixelKeys(profile));
             }
             result.sort(this.alphanumericSort);
         }
         else if (repeatFor[0] === 'eachPixelGroup') {
             // Gets computed into an array of all pixel group keys, ordered by appearance in the JSON file
-            for (const property of Object.keys(profile.matrix.pixelGroups)) {
-                result.push(property);
-            }
+            result = result.concat(this.getAllPixelGroups(profile));
         }
         else if (repeatFor[0] === 'eachPixelXYZ') {
             for (let x = 0; x < profile.matrix.pixelKeys.length; x++) {
@@ -1426,13 +1454,27 @@ class FixtureService {
         for (const channel of mode.channels) {
             if (channel.name && !pixelKey) {
                 // direct reference to a channel
+                // don't check the fine channels. only add the coarse channel.
+                let channelFound = false;
                 for (const availableChannelName of Object.keys(profile.availableChannels)) {
-                    // don't check the fine channels. only add the coarse channel.
                     if (channel.name === availableChannelName) {
                         const availableChannel = profile.availableChannels[availableChannelName];
                         this.addCachedChannel(channels, availableChannel, availableChannelName, null, profile);
                     }
                 }
+                // check the template channels, if not found in the available channels
+                if (!channelFound) {
+                    for (const templateChannelName of Object.keys(profile.templateChannels)) {
+                        let existingPixelKeys = this.getAllPixelKeys(profile).concat(this.getAllPixelGroups(profile));
+                        for (const existingPixelKey of existingPixelKeys) {
+                            const channelName = this.getChannelNameWithPixelKey(templateChannelName, existingPixelKey);
+                            if (channel.name === channelName) {
+                                const templateChannel = profile.templateChannels[templateChannelName];
+                                this.addCachedChannel(channels, templateChannel, channelName, existingPixelKey, profile);
+                            }
+                        }
+                    }
+                }
             }
             else {
                 // reference a channel through a pixel matrix
@@ -1479,28 +1521,30 @@ class FixtureService {
         let mode = this.getModeByFixture(profile, fixture);
         // add the unique pixel keys
         for (let channel of mode.channels) {
-            this.getPixelKeysInOrder(profile, channel.repeatFor).forEach((str) => pixelKeys.add(str));
+            this.getPixelKeysInOrder(profile, channel.repeatFor).forEach((str) => {
+                pixelKeys.add(str);
+            });
         }
         return Array.from(pixelKeys);
     }
+    // does the fixture have a general channel without reference to specific pixel keys in the current mode?
+    fixtureHasGeneralChannel(fixture) {
+        let profile = this.getProfileByUuid(fixture.profileUuid);
+        let mode = this.getModeByFixture(profile, fixture);
+        // add the unique pixel keys
+        for (let channel of mode.channels) {
+            if (this.getPixelKeysInOrder(profile, channel.repeatFor).length === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
     updateCachedFixtures() {
         // calculate some frequently used values as a cache to save cpu time
         // afterwards
         this.cachedFixtures = [];
         for (const fixture of this.projectService.project.fixtures) {
-            const pixelKeys = this.fixtureGetUniquePixelKeys(fixture);
-            if (pixelKeys.length > 0) {
-                for (let pixelKey of pixelKeys) {
-                    const cachedFixture = new CachedFixture();
-                    cachedFixture.fixture = fixture;
-                    cachedFixture.pixelKey = pixelKey;
-                    cachedFixture.profile = this.getProfileByUuid(fixture.profileUuid);
-                    cachedFixture.mode = this.getModeByFixture(cachedFixture.profile, fixture);
-                    cachedFixture.channels = this.getCachedChannels(cachedFixture.profile, cachedFixture.mode, pixelKey);
-                    this.cachedFixtures.push(cachedFixture);
-                }
-            }
-            else {
+            if (this.fixtureHasGeneralChannel(fixture)) {
                 const cachedFixture = new CachedFixture();
                 cachedFixture.fixture = fixture;
                 cachedFixture.profile = this.getProfileByUuid(fixture.profileUuid);
@@ -1508,6 +1552,16 @@ class FixtureService {
                 cachedFixture.channels = this.getCachedChannels(cachedFixture.profile, cachedFixture.mode, null);
                 this.cachedFixtures.push(cachedFixture);
             }
+            const pixelKeys = this.fixtureGetUniquePixelKeys(fixture);
+            for (let pixelKey of pixelKeys) {
+                const cachedFixture = new CachedFixture();
+                cachedFixture.fixture = fixture;
+                cachedFixture.pixelKey = pixelKey;
+                cachedFixture.profile = this.getProfileByUuid(fixture.profileUuid);
+                cachedFixture.mode = this.getModeByFixture(cachedFixture.profile, fixture);
+                cachedFixture.channels = this.getCachedChannels(cachedFixture.profile, cachedFixture.mode, pixelKey);
+                this.cachedFixtures.push(cachedFixture);
+            }
         }
     }
     capabilitiesMatch(type1, type2, color1, color2, wheel1, wheel2, profileUuid1, profileUuid2) {
@@ -1766,9 +1820,12 @@ class PresetService {
             }
         }
     }
+    fixtureUuidAndPixelKeyEquals(fixtureUuid1, fixtureUuid2, pixelKey1, pixelKey2) {
+        return fixtureUuid1 === fixtureUuid2 && ((!pixelKey1 && !pixelKey2) || pixelKey1 === pixelKey2);
+    }
     getPresetFixture(preset, fixtureUuid, pixelKey) {
         for (const fixture of preset.fixtures) {
-            if (fixture.fixtureUuid === fixtureUuid && ((!fixture.pixelKey && !pixelKey) || fixture.pixelKey === pixelKey)) {
+            if (this.fixtureUuidAndPixelKeyEquals(fixture.fixtureUuid, fixtureUuid, fixture.pixelKey, pixelKey)) {
                 return fixture;
             }
         }
@@ -1824,21 +1881,19 @@ class PresetService {
             return;
         }
         for (const fixture of this.projectService.project.fixtures) {
-            const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
-            if (pixelKeys.length > 0) {
-                for (const pixelKey of pixelKeys) {
-                    if (!this.fixtureIsSelected(fixture, pixelKey)) {
-                        const presetFixture = new PresetFixture();
-                        presetFixture.fixtureUuid = fixture.uuid;
-                        presetFixture.pixelKey = pixelKey;
-                        this.selectedPreset.fixtures.push(presetFixture);
-                    }
+            if (this.fixtureService.fixtureHasGeneralChannel(fixture)) {
+                if (!this.fixtureIsSelected(fixture, null)) {
+                    const presetFixture = new PresetFixture();
+                    presetFixture.fixtureUuid = fixture.uuid;
+                    this.selectedPreset.fixtures.push(presetFixture);
                 }
             }
-            else {
-                if (!this.fixtureIsSelected(fixture, null)) {
+            const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
+            for (const pixelKey of pixelKeys) {
+                if (!this.fixtureIsSelected(fixture, pixelKey)) {
                     const presetFixture = new PresetFixture();
                     presetFixture.fixtureUuid = fixture.uuid;
+                    presetFixture.pixelKey = pixelKey;
                     this.selectedPreset.fixtures.push(presetFixture);
                 }
             }
@@ -3120,29 +3175,34 @@ class PreviewService {
     getFixtureIndex(preset, fixtureUuid, pixelKey) {
         let index = 0;
         const countedFirstDmxChannelPixelKey = [];
+        if (!this.presetService.getPresetFixture(preset, fixtureUuid, pixelKey)) {
+            // fixture is not in preset
+            return undefined;
+        }
         // Loop over the global fixtures to retain the order
         for (const projectFixture of this.projectService.project.presetFixtures) {
-            const presetFixture = this.presetService.getPresetFixture(preset, fixtureUuid, pixelKey);
-            if (!presetFixture) {
-                // Not found in the preset
-                return undefined;
-            }
-            if (projectFixture.fixtureUuid === fixtureUuid && ((!projectFixture.pixelKey && !pixelKey) || projectFixture.pixelKey === pixelKey)) {
-                return index;
-            }
-            const fixture = this.fixtureService.getFixtureByUuid(projectFixture.fixtureUuid);
-            const firstDmxChannelAndFixtureUuid = {
-                firstDmxChannel: fixture.dmxFirstChannel,
-                pixelKey: projectFixture.pixelKey,
-            };
-            const exists = countedFirstDmxChannelPixelKey.some((item) => item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
-                ((!item.pixelKey && !firstDmxChannelAndFixtureUuid.pixelKey) || item.pixelKey === firstDmxChannelAndFixtureUuid.pixelKey));
-            // don't count fixtures on the same channel as already counted ones
-            if (!exists) {
-                index++;
-                countedFirstDmxChannelPixelKey.push(firstDmxChannelAndFixtureUuid);
+            for (const presetFixture of preset.fixtures) {
+                if (this.presetService.fixtureUuidAndPixelKeyEquals(projectFixture.fixtureUuid, presetFixture.fixtureUuid, projectFixture.pixelKey, presetFixture.pixelKey)) {
+                    if (this.presetService.fixtureUuidAndPixelKeyEquals(projectFixture.fixtureUuid, fixtureUuid, projectFixture.pixelKey, pixelKey)) {
+                        return index;
+                    }
+                    const fixture = this.fixtureService.getFixtureByUuid(projectFixture.fixtureUuid);
+                    const firstDmxChannelAndFixtureUuid = {
+                        firstDmxChannel: fixture.dmxFirstChannel,
+                        pixelKey: projectFixture.pixelKey,
+                    };
+                    const exists = countedFirstDmxChannelPixelKey.some((item) => item.firstDmxChannel === firstDmxChannelAndFixtureUuid.firstDmxChannel &&
+                        ((!item.pixelKey && !firstDmxChannelAndFixtureUuid.pixelKey) || item.pixelKey === firstDmxChannelAndFixtureUuid.pixelKey));
+                    // don't count fixtures on the same channel as already counted ones
+                    if (!exists) {
+                        index++;
+                        countedFirstDmxChannelPixelKey.push(firstDmxChannelAndFixtureUuid);
+                    }
+                    break;
+                }
             }
         }
+        return undefined;
     }
     getPresetIntensity(preset, timeMillis) {
         // When fading is in progress (on preset or scene-level), the current preset does not
@@ -3375,43 +3435,6 @@ class PreviewService {
         }
         return calculatedFixtures;
     }
-    setUniverseValues(fixtures, masterDimmerValue) {
-        // TODO only, if monitoring is enabled
-        return;
-        // // Reset all DMX universes
-        // for (const universe of this.universeService.universes) {
-        //   universe.channelValues = [];
-        //   for (let i = 0; i < 512; i++) {
-        //     universe.channelValues.push(0);
-        //   }
-        // }
-        // // loop over each fixture
-        // fixtures.forEach((channelValues: FixtureChannelValue[], cachedFixture: CachedFixture) => {
-        //   // TODO Get the correct universe for this fixture
-        //   const universe: Universe = this.universeService.getUniverseByUuid(cachedFixture.fixture.dmxUniverseUuid);
-        //   // loop over each channel for this fixture
-        //   for (let channelIndex = 0; channelIndex < cachedFixture.mode.channels.length; channelIndex++) {
-        //     const channelObj = cachedFixture.mode.channels[channelIndex];
-        //     if (typeof channelObj === 'string') {
-        //       const channelName = channelObj;
-        //       // match this mode channel with a channel value
-        //       for (const channelValue of channelValues) {
-        //         const channel = this.fixtureService.getChannelByName(cachedFixture, channelName);
-        //         if (channel && channel.channel) {
-        //           const fineIndex = channel.channel.fineChannelAliases.indexOf(channelName);
-        //           if (channel.name === channelValue.channelName || fineIndex > -1) {
-        //             const universeChannel = cachedFixture.fixture.dmxFirstChannel + channelIndex;
-        //             const dmxValue =
-        //               Math.floor(channelValue.value / Math.pow(256, channel.channel.fineChannelAliases.length - (fineIndex + 1))) % 256;
-        //             // TODO
-        //             break;
-        //           }
-        //         }
-        //       }
-        //     }
-        //   }
-        // });
-    }
     fixtureIsSelected(uuid, pixelKey, presets) {
         for (const preset of presets) {
             if (this.presetService.getPresetFixture(preset.preset, uuid, pixelKey)) {
@@ -4047,8 +4070,6 @@ class PreviewComponent {
                 fixture3d.isSelected = this.previewService.fixtureIsSelected(fixture3d.fixture.fixture.uuid, fixture3d.fixture.pixelKey, presets);
             }
         }
-        // TODO enable for monitoring the DMX universes
-        this.previewService.setUniverseValues(calculatedFixtures, this.projectService.project.masterDimmerValue);
         // Render the scene
         this.render();
         requestAnimationFrame(this.animate.bind(this));
@@ -4282,39 +4303,36 @@ class ProjectLoadService {
     }
     migrateToVersion2() {
         for (let fixture of this.projectService.project.fixtures) {
-            const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
-            if (pixelKeys.length > 0) {
-                for (let pixelKey of pixelKeys) {
-                    const projectFixture = new PresetFixture();
-                    projectFixture.fixtureUuid = fixture.uuid;
-                    projectFixture.pixelKey = pixelKey;
-                    this.projectService.project.presetFixtures.push(projectFixture);
-                }
+            if (this.fixtureService.fixtureHasGeneralChannel(fixture)) {
+                const projectFixture = new PresetFixture();
+                projectFixture.fixtureUuid = fixture.uuid;
+                this.projectService.project.presetFixtures.push(projectFixture);
             }
-            else {
+            const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
+            for (let pixelKey of pixelKeys) {
                 const projectFixture = new PresetFixture();
                 projectFixture.fixtureUuid = fixture.uuid;
+                projectFixture.pixelKey = pixelKey;
                 this.projectService.project.presetFixtures.push(projectFixture);
             }
         }
         for (let preset of this.projectService.project.presets) {
             for (let fixtureUuid of preset.fixtureUuids) {
                 const fixture = this.fixtureService.getFixtureByUuid(fixtureUuid);
-                const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
-                if (pixelKeys.length > 0) {
-                    for (let pixelKey of pixelKeys) {
-                        const presetFixture = new PresetFixture();
-                        presetFixture.fixtureUuid = fixtureUuid;
-                        presetFixture.pixelKey = pixelKey;
-                        preset.fixtures.push(presetFixture);
-                    }
+                if (this.fixtureService.fixtureHasGeneralChannel(fixture)) {
+                    const presetFixture = new PresetFixture();
+                    presetFixture.fixtureUuid = fixtureUuid;
+                    preset.fixtures.push(presetFixture);
                 }
-                else {
+                const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
+                for (let pixelKey of pixelKeys) {
                     const presetFixture = new PresetFixture();
                     presetFixture.fixtureUuid = fixtureUuid;
+                    presetFixture.pixelKey = pixelKey;
                     preset.fixtures.push(presetFixture);
                 }
             }
+            preset.fixtureUuids = undefined;
         }
         this.projectService.project.version = 2;
     }
@@ -5578,18 +5596,16 @@ class FixturePoolComponent {
                 }
             }
             if (!found) {
-                const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
-                if (pixelKeys.length > 0) {
-                    for (let pixelKey of pixelKeys) {
-                        const presetFixture = new PresetFixture();
-                        presetFixture.fixtureUuid = fixture.uuid;
-                        presetFixture.pixelKey = pixelKey;
-                        this.projectService.project.presetFixtures.push(presetFixture);
-                    }
+                if (this.fixtureService.fixtureHasGeneralChannel(fixture)) {
+                    const presetFixture = new PresetFixture();
+                    presetFixture.fixtureUuid = fixture.uuid;
+                    this.projectService.project.presetFixtures.push(presetFixture);
                 }
-                else {
+                const pixelKeys = this.fixtureService.fixtureGetUniquePixelKeys(fixture);
+                for (let pixelKey of pixelKeys) {
                     const presetFixture = new PresetFixture();
                     presetFixture.fixtureUuid = fixture.uuid;
+                    presetFixture.pixelKey = pixelKey;
                     this.projectService.project.presetFixtures.push(presetFixture);
                 }
             }