@rocketshow/designer 1.44.0 → 1.46.0

package/index.d.ts

@@ -199,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",
@@ -291,7 +301,7 @@ declare class FixtureProfile {
 
 declare class CachedFixture {
     fixture: Fixture;
-    pixelKey: string;
+    pixel: CachedFixturePixel;
     profile: FixtureProfile;
     mode: FixtureMode;
     channels: CachedFixtureChannel[];
@@ -460,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;
@@ -496,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;
@@ -709,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;
@@ -746,6 +775,7 @@ declare class PreviewComponent implements AfterViewInit {
     private camera;
     controls: OrbitControls;
     private fixtures3d;
+    private fixtureGroups;
     private canvasRef;
     constructor(fixtureService: FixtureService, previewMeshService: PreviewMeshService, animationService: AnimationService, previewService: PreviewService, timelineService: TimelineService, projectService: ProjectService, ngZone: NgZone);
     private syncFixtures;
@@ -1108,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;
@@ -1124,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;

package/package.json

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