Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a master dimmer to the compositor #184

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Add a master dimmer to the compositor #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions live/app/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const CONFIG = t.partial({
outputs: t.record(t.string, OUTPUT),
compositor: t.type({
current: t.union([t.null, t.string]),
dimmer: t.number,
cues: optionalRecord(CUE_CONFIG),
}),
sequences: SEQUENCES_CONFIG,
Expand Down
17 changes: 17 additions & 0 deletions live/app/src/desk/desk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ export const createDesk = () => {
new ld.Group({ direction: 'vertical', noBorder: true })
);

const dimmerGroup = deskTab.addChild(
new ld.Group({ noBorder: true, wrap: true })
);

dimmerGroup.addChild(new ld.Label({ text: `Dimmer:` }));

const compositorDimmer = dimmerGroup.addChild(
new ld.SliderButton({
value: 1,
min: 0,
max: 1,
step: 0.01,
mode: 'writeThrough',
})
);

const compositorCueTriggers = deskTab.addChild(
new ld.Group({ direction: 'vertical' })
);
Expand Down Expand Up @@ -92,6 +108,7 @@ export const createDesk = () => {
sequencesGroup,
pluginComponentsGroup,
compositorCuesGroup,
compositorDimmer,
compositorCueTriggers,
sequencesDesk,
init,
Expand Down
42 changes: 33 additions & 9 deletions live/app/src/stage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as ld from '@synesthesia-project/light-desk';
import { throttle } from 'lodash';
import { ModulateModule } from '@synesthesia-project/compositor/lib/modules/modulate';
import { TransitionModule } from '@synesthesia-project/compositor/lib/modules/transition';
import FillModule from '@synesthesia-project/compositor/lib/modules/fill';
import { RGBA_TRANSPARENT } from '@synesthesia-project/compositor/lib/color';
Expand Down Expand Up @@ -60,14 +61,19 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
const inputManager = createInputManager();

const compositor: {
root: TransitionModule;
transition: TransitionModule;
modulate: ModulateModule;
current: null | string;
cues: Map<string, InputSocket>;
} = {
root: new TransitionModule(new FillModule(RGBA_TRANSPARENT)),
current: null,
cues: new Map(),
};
} = (() => {
const transition = new TransitionModule(new FillModule(RGBA_TRANSPARENT));
return {
transition,
modulate: new ModulateModule(transition),
current: null,
cues: new Map(),
};
})();

/**
* Map from output key to active instance of the output
Expand Down Expand Up @@ -117,6 +123,18 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
}
};

// Setup Dimmer
desk.compositorDimmer.addListener('change', (value) =>
updateConfig((config) => ({
...config,
compositor: {
current: config.compositor?.current ?? null,
dimmer: value,
cues: config.compositor?.cues || {},
},
}))
);

// Setup Sequences

const sequences = Sequences({
Expand Down Expand Up @@ -171,7 +189,7 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
}
};
const render: OutputContext<ConfigT>['render'] = (map, pixels) =>
compositor.root.render(map, pixels);
compositor.modulate.render(map, pixels);
const setChannels: OutputContext<ConfigT>['setChannels'] = (channels) => {
activeOutput.channels = channels;
sendChannelsToSequences();
Expand Down Expand Up @@ -310,6 +328,8 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {

const updateInputsFromConfig = (prev: Config) => {
const cues = config.compositor?.cues || {};
compositor.modulate.setAlpha(config.compositor?.dimmer ?? 1);
desk.compositorDimmer.setValue(config.compositor?.dimmer ?? 1);
desk.compositorCueTriggers.removeAllChildren();
for (const [cueId, cueConfig] of Object.entries(cues)) {
if (cueConfig === undefined) continue;
Expand All @@ -322,6 +342,7 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
...current,
compositor: {
current: current.compositor?.current ?? null,
dimmer: current.compositor?.dimmer ?? 1,
cues: {
...current.compositor?.cues,
[cueId]: existing && update(existing),
Expand All @@ -339,6 +360,7 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
...current,
compositor: {
current: current.compositor?.current ?? null,
dimmer: current.compositor?.dimmer ?? 1,
cues: {
...current.compositor?.cues,
[cueId]: undefined,
Expand Down Expand Up @@ -383,6 +405,7 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
...config,
compositor: {
current: cueId,
dimmer: config.compositor?.dimmer ?? 1,
cues: config.compositor?.cues || {},
},
}))
Expand All @@ -404,9 +427,9 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
? compositor.cues.get(compositor.current)?.getModlue()
: null;
if (module) {
compositor.root.transition(module, 1);
compositor.transition.transition(module, 1);
} else {
compositor.root.transition(new FillModule(RGBA_TRANSPARENT), 1);
compositor.transition.transition(new FillModule(RGBA_TRANSPARENT), 1);
}
}
};
Expand All @@ -424,6 +447,7 @@ export const Stage = async (plugins: Plugin[], configPath: string) => {
...config,
compositor: {
current: config.compositor?.current ?? null,
dimmer: config.compositor?.dimmer ?? 1,
cues: { ...config.compositor?.cues, [uuidv4()]: {} },
},
})),
Expand Down
Loading