@rocketshow/designer 1.42.0 → 1.46.0

package/index.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { OnDestroy, AfterViewInit, OnInit, ElementRef, ChangeDetectorRef, PipeTransform, EventEmitter } from '@angular/core';
+import { NgZone, OnDestroy, AfterViewInit, OnInit, ElementRef, ChangeDetectorRef, PipeTransform, EventEmitter } from '@angular/core';
 import * as i44 from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
@@ -12,6 +12,8 @@ import * as i39 from '@angular/router';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as THREE from 'three';
 import WaveSurfer from 'wavesurfer.js';
+import * as i51 from '@ali-hm/angular-tree-component';
+import { ITreeOptions } from '@ali-hm/angular-tree-component';
 import * as i49 from 'ngx-dropzone-wrapper';
 import { DropzoneConfigInterface } from 'ngx-dropzone-wrapper';
 import * as i40 from '@angular/platform-browser';
@@ -197,6 +199,16 @@ declare class CachedFixtureChannel {
     colorWheel: FixtureWheel;
 }
 
+declare class CachedFixturePixel {
+    key: string;
+    x: number;
+    y: number;
+    z: number;
+    positionX: number;
+    positionY: number;
+    positionZ: number;
+}
+
 declare enum Positioning {
     topFront = "topFront",
     topBack = "topBack",
@@ -289,7 +301,7 @@ declare class FixtureProfile {
 
 declare class CachedFixture {
     fixture: Fixture;
-    pixelKey: string;
+    pixel: CachedFixturePixel;
     profile: FixtureProfile;
     mode: FixtureMode;
     channels: CachedFixtureChannel[];
@@ -458,16 +470,30 @@ declare class UuidService {
     static ɵprov: i0.ɵɵInjectableDeclaration<UuidService>;
 }
 
+type Axis = 'x' | 'y' | 'z';
+type GroupDef = 'all' | string[] | (Partial<Record<Axis, string[]>> & {
+    name?: string[];
+});
+declare class FixturePixelGroupResolveService {
+    private matchNumberRule;
+    private matchesAllConstraints;
+    resolveGroupPixels(group: string, pixelGroups: Record<string, GroupDef>, allPixels: CachedFixturePixel[]): CachedFixturePixel[];
+    getPixelsForKeyOrGroup(profile: FixtureProfile, allPixelKeys: CachedFixturePixel[], keyOrGroup: string): CachedFixturePixel[];
+    static ɵfac: i0.ɵɵFactoryDeclaration<FixturePixelGroupResolveService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<FixturePixelGroupResolveService>;
+}
+
 declare class FixtureService {
     private http;
     private projectService;
     private translateService;
     private toastrService;
     private uuidService;
+    private fixturePixelGroupResolveService;
     cachedFixtures: CachedFixture[];
     settingsSelection: boolean;
     selectedSettingsFixtures: Fixture[];
-    constructor(http: HttpClient, projectService: ProjectService, translateService: TranslateService, toastrService: ToastrService, uuidService: UuidService);
+    constructor(http: HttpClient, projectService: ProjectService, translateService: TranslateService, toastrService: ToastrService, uuidService: UuidService, fixturePixelGroupResolveService: FixturePixelGroupResolveService);
     getFixtureByUuid(uuid: string): Fixture;
     private fixtureUuidAndPixelKeyEquals;
     getCachedFixtureByUuid(uuid: string, pixelKey: string): CachedFixture;
@@ -494,12 +520,14 @@ declare class FixtureService {
     private getChannelNameWithPixelKey;
     private addCachedChannel;
     private alphanumericSort;
+    private evenlySpacedPosCm;
+    private createPixel;
     private getAllPixelKeys;
-    private getAllPixelGroups;
-    private getPixelKeysInOrder;
+    private getAllPixelsInGroups;
+    private getPixelsInOrder;
     getModeChannelCount(profile: FixtureProfile, mode: FixtureMode): number;
     getCachedChannels(profile: FixtureProfile, mode: FixtureMode, pixelKey: string): CachedFixtureChannel[];
-    fixtureGetUniquePixelKeys(fixture: Fixture): string[];
+    fixtureGetUniquePixels(fixture: Fixture): CachedFixturePixel[];
     fixtureHasGeneralChannel(fixture: Fixture): boolean;
     updateCachedFixtures(): void;
     capabilitiesMatch(type1: FixtureCapabilityType, type2: FixtureCapabilityType, color1: FixtureCapabilityColor, color2: FixtureCapabilityColor, wheel1: string, wheel2: string, profileUuid1: string, profileUuid2: string): boolean;
@@ -560,6 +588,8 @@ declare class ConfigService {
 
 declare class EffectService {
     selectedEffect: Effect;
+    effectsOpen: boolean;
+    effectsOpenChanged: Subject<void>;
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<EffectService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<EffectService>;
@@ -588,6 +618,7 @@ declare class PresetService {
     switchFixtureSelection(fixture: Fixture, pixelKey: string): void;
     selectAllFixtures(): void;
     selectNoFixtures(): void;
+    private presetFixtueEquals;
     removeDeletedFixtures(): void;
     updateFixtureSelection(): void;
     deleteCapabilityValue(preset: Preset, capabilityType: FixtureCapabilityType, color?: FixtureCapabilityColor, wheel?: string, profileUuid?: string): void;
@@ -642,6 +673,7 @@ declare class TimelineService {
     private projectService;
     private http;
     private configService;
+    private ngZone;
     waveSurfer: WaveSurfer;
     playState: string;
     zoom: number;
@@ -659,7 +691,7 @@ declare class TimelineService {
     selectedCompositionIndex: number;
     externalCompositionsAvailable: boolean;
     loadingAudioFile: boolean;
-    constructor(sceneService: SceneService, presetService: PresetService, projectService: ProjectService, http: HttpClient, configService: ConfigService);
+    constructor(sceneService: SceneService, presetService: PresetService, projectService: ProjectService, http: HttpClient, configService: ConfigService, ngZone: NgZone);
     private redrawAllRegions;
     private pad;
     private msToTime;
@@ -703,6 +735,9 @@ declare class PreviewService implements OnDestroy {
     private timelineService;
     private projectService;
     doUpdateFixtureSetup: Subject<void>;
+    doUpdateStageAndPositions: Subject<void>;
+    private updateStageAndPositionsSubscription;
+    stageAndPositionsDirty: boolean;
     scene: THREE.Scene;
     private stageMeshes;
     private stageMaterial;
@@ -734,13 +769,15 @@ declare class PreviewComponent implements AfterViewInit {
     private previewService;
     private timelineService;
     private projectService;
+    private ngZone;
     private renderer;
     private scene;
     private camera;
     controls: OrbitControls;
     private fixtures3d;
+    private fixtureGroups;
     private canvasRef;
-    constructor(fixtureService: FixtureService, previewMeshService: PreviewMeshService, animationService: AnimationService, previewService: PreviewService, timelineService: TimelineService, projectService: ProjectService);
+    constructor(fixtureService: FixtureService, previewMeshService: PreviewMeshService, animationService: AnimationService, previewService: PreviewService, timelineService: TimelineService, projectService: ProjectService, ngZone: NgZone);
     private syncFixtures;
     private get canvas();
     private render;
@@ -899,6 +936,7 @@ declare class DesignerComponent implements OnInit, AfterViewInit {
     private fixtureService;
     private timelineService;
     introService: IntroService;
+    private effectService;
     set menuHeightPx(value: number);
     set externalCompositionsAvailable(value: boolean);
     set restUrl(value: string);
@@ -918,7 +956,7 @@ declare class DesignerComponent implements OnInit, AfterViewInit {
     currentTab: string;
     previewComponent: PreviewComponent;
     timelineComponent: TimelineComponent;
-    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);
+    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, effectService: EffectService);
     private loadError;
     ngOnInit(): void;
     private calcTotalMenuHeight;
@@ -972,11 +1010,13 @@ declare class EffectCurve extends Effect {
     getValueAtMillis(timeMillis: number, fixtureIndex?: number): number;
 }
 
-declare class EffectCurveComponent implements OnInit {
+declare class EffectCurveComponent implements OnInit, OnDestroy {
     presetService: PresetService;
     private animationService;
     private fixtureService;
     private translate;
+    private effectService;
+    private ngZone;
     private gridUpdateSubscription;
     private ctx;
     private maxWidth;
@@ -995,11 +1035,15 @@ declare class EffectCurveComponent implements OnInit {
     availableChannels: Map<FixtureProfile, CachedFixtureChannel[]>;
     availableProfiles: FixtureProfile[];
     selectedProfiles: FixtureProfile[];
+    private effectsOpenChangedSubscription;
     curve: EffectCurve;
     set isSelected(value: boolean);
     curveGrid: ElementRef;
-    constructor(presetService: PresetService, animationService: AnimationService, fixtureService: FixtureService, translate: TranslateService);
+    constructor(presetService: PresetService, animationService: AnimationService, fixtureService: FixtureService, translate: TranslateService, effectService: EffectService, ngZone: NgZone);
     ngOnInit(): void;
+    ngOnDestroy(): void;
+    private startUpdateTimer;
+    private stopUpdateTimer;
     private drawCurrentValue;
     private getPhasingCount;
     redraw(): void;
@@ -1094,6 +1138,7 @@ declare class FixtureComponent implements OnInit {
 declare class FixtureSettingsPositionComponent implements OnInit {
     fixtureService: FixtureService;
     private presetService;
+    private previewService;
     selectUndefinedOptionValue: any;
     selectedPositioning: string;
     positionX: number;
@@ -1110,8 +1155,9 @@ declare class FixtureSettingsPositionComponent implements OnInit {
     rotationZ: number;
     rotationMin: number;
     rotationMax: number;
-    constructor(fixtureService: FixtureService, presetService: PresetService);
+    constructor(fixtureService: FixtureService, presetService: PresetService, previewService: PreviewService);
     ngOnInit(): void;
+    private updated;
     private updateSelection;
     changePosition(positioningStr: string): void;
     changePositionManual(position: string, value: any): void;
@@ -1226,8 +1272,12 @@ declare class PresetComponent implements OnInit {
     projectService: ProjectService;
     introService: IntroService;
     private modalService;
+    treeOptions: ITreeOptions;
+    treeNodes: any;
+    tree: ElementRef;
     constructor(presetService: PresetService, sceneService: SceneService, projectService: ProjectService, introService: IntroService, modalService: BsModalService);
     ngOnInit(): void;
+    onActivate(event: any): void;
     selectPreset(index: number): void;
     enableCheckbox(): boolean;
     activatePreset(active: boolean, index: number): void;
@@ -1651,7 +1701,7 @@ declare class DropzoneComponent {
 
 declare class DesignerModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<DesignerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof DesignerComponent, typeof WarningDialogComponent, typeof PreviewComponent, typeof EffectCurveComponent, typeof EffectPanTiltComponent, typeof SceneComponent, typeof TimelineComponent, typeof FixtureCapabilityColorComponent, typeof FixtureComponent, typeof FixtureSettingsPositionComponent, typeof FixtureCapabilityComponent, typeof FixtureSettingsComponent, typeof EffectComponent, typeof FixturePoolComponent, typeof PresetComponent, typeof MasterDimmerComponent, typeof FixtureCapabilityDimmerComponent, typeof TimelineGridComponent, typeof CompositionSettingsComponent, typeof ArraySortPipe, typeof FixtureCapabilityPanTiltComponent, typeof FixtureCapabilityChannelComponent, typeof FixtureChannelComponent, typeof FixtureCapabilityColorWheelComponent, typeof UserLoginComponent, typeof UserRegisterComponent, typeof ProjectBrowserComponent, typeof WaitDialogComponent, typeof ProjectImportComponent, typeof ProjectShareComponent, typeof ErrorDialogComponent, typeof FixtureSettingsStageComponent, typeof IntroComponent, typeof PresetSettingsComponent, typeof SceneSettingsComponent, typeof ProjectSaveComponent, typeof FixturePoolCreateFromFileComponent, typeof DropzoneComponent], [typeof i39.RouterModule, typeof i40.BrowserModule, typeof i41.BrowserAnimationsModule, 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 DesignerComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof DesignerComponent, typeof WarningDialogComponent, typeof PreviewComponent, typeof EffectCurveComponent, typeof EffectPanTiltComponent, typeof SceneComponent, typeof TimelineComponent, typeof FixtureCapabilityColorComponent, typeof FixtureComponent, typeof FixtureSettingsPositionComponent, typeof FixtureCapabilityComponent, typeof FixtureSettingsComponent, typeof EffectComponent, typeof FixturePoolComponent, typeof PresetComponent, typeof MasterDimmerComponent, typeof FixtureCapabilityDimmerComponent, typeof TimelineGridComponent, typeof CompositionSettingsComponent, typeof ArraySortPipe, typeof FixtureCapabilityPanTiltComponent, typeof FixtureCapabilityChannelComponent, typeof FixtureChannelComponent, typeof FixtureCapabilityColorWheelComponent, typeof UserLoginComponent, typeof UserRegisterComponent, typeof ProjectBrowserComponent, typeof WaitDialogComponent, typeof ProjectImportComponent, typeof ProjectShareComponent, typeof ErrorDialogComponent, typeof FixtureSettingsStageComponent, typeof IntroComponent, typeof PresetSettingsComponent, typeof SceneSettingsComponent, typeof ProjectSaveComponent, typeof FixturePoolCreateFromFileComponent, typeof DropzoneComponent], [typeof i39.RouterModule, typeof i40.BrowserModule, typeof i41.BrowserAnimationsModule, 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 i51.TreeModule], [typeof DesignerComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<DesignerModule>;
 }
 

package/package.json

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