Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 41 additions & 4 deletions studio-frontend/src/app/app.element.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { on } from "@storyteller/framework";
import * as studio from "@storyteller/studio";
import {
type EntitySelectEvent,
type SceneSavedEvent,
type SceneStateEvent,
SceneState,
StudioMode,
SceneElement,
} from "@storyteller/studio";
import { StudioURLParams } from "@storyteller/studio-web";
import {
SceneHierarchyElement,
type SceneObject,
StudioURLParams,
} from "@storyteller/studio-web";
import { CanvasProvider } from "@storyteller/studio-web/canvas-provider";
import { match } from "@storyteller/utility";
import { LitElement, html, nothing } from "lit";
Expand All @@ -33,6 +39,9 @@ export class AppElement extends LitElement {
@state() showHelp = false;
@state() loading = true;

@state() selection?: SceneObject;

#hierarchy = createRef<SceneHierarchyElement>();
#params = new StudioURLParams();
#canvasProvider: Ref<CanvasProvider> = createRef();

Expand Down Expand Up @@ -72,6 +81,20 @@ export class AppElement extends LitElement {
});
}

@on("entity-select")
onEntitySelected({ detail: id }: EntitySelectEvent): void {
if (!id) {
this.selection = undefined;
} else {
this.selection = this.#hierarchy.value?.entityMap.get(id);
}
}

attachIkRig(): void {
if (this.selection)
studio.attachIkRig(this.selection.id);
}

toggleHelp(): void {
this.showHelp = !this.showHelp;
}
Expand Down Expand Up @@ -102,6 +125,13 @@ export class AppElement extends LitElement {
>
Save
</sts-button>
<sts-button
icon="share-nodes"
?disabled=${this.selection?.type !== SceneElement.Skeleton}
@click=${this.attachIkRig}
>
Attach IK Rig
</sts-button>
` : nothing}
<sts-button
class=${classMap({ active: this.showHelp })}
Expand All @@ -115,9 +145,16 @@ export class AppElement extends LitElement {

<!-- Studio-mode-only elements -->
${this.#params.mode === StudioMode.Editor ? html`
<sts-transform-toolbar class="v-start h-center"></sts-transform-toolbar>
<sts-scene-hierarchy class="hierarchy v-start h-end"></sts-scene-hierarchy>
<sts-anim-editor class="timeline v-end h-start h-before-hierarchy"></sts-anim-editor>
<sts-transform-toolbar
class="v-start h-center"
></sts-transform-toolbar>
<sts-scene-hierarchy
class="hierarchy v-start h-end"
${ref(this.#hierarchy)}
></sts-scene-hierarchy>
<sts-anim-editor
class="timeline v-end h-start h-before-hierarchy"
></sts-anim-editor>
` : nothing}

<!-- Dialogs and modals -->
Expand Down
6 changes: 6 additions & 0 deletions studio-ui/src/lib/button.element.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
color: #FFFF;
}

:host(.disabled),
:host(.disabled:hover) {
background: #0003;
color: #FFF6;
}

.icon {
fill: currentColor;
}
13 changes: 12 additions & 1 deletion studio-ui/src/lib/button.element.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { on } from "@storyteller/framework";
import { LitElement, html, nothing, unsafeCSS } from "lit";
import { LitElement, type PropertyValues, html, nothing, unsafeCSS } from "lit";
import { customElement, property } from "lit/decorators.js";

import styles from "./button.element.scss?inline";
Expand All @@ -11,10 +11,21 @@ export class ButtonElement extends LitElement {
static override styles = unsafeCSS(styles);

@property() icon?: string;
@property({ type: Boolean }) disabled = false;

override role = "button";
override tabIndex = 0;

protected override willUpdate(changes: PropertyValues<this>): void {
if (changes.has("disabled")) {
this.ariaDisabled = this.disabled ? "true" : null;
this.tabIndex = this.disabled ? -1 : 0;
this.classList.toggle("disabled", this.disabled);
}

super.willUpdate(changes);
}

@on("keydown")
onKeyDown(event: KeyboardEvent) {
if (/^( |Enter)$/.test(event.key)) {
Expand Down
2 changes: 2 additions & 0 deletions studio-ui/src/lib/icon.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import fasCheck from "@fortawesome/fontawesome-pro/svgs/solid/check.svg?raw";
import fasXmark from "@fortawesome/fontawesome-pro/svgs/solid/xmark.svg?raw";
import fasCircleCheck from "@fortawesome/fontawesome-pro/svgs/solid/circle-check.svg?raw";
import fasCircleXmark from "@fortawesome/fontawesome-pro/svgs/solid/circle-xmark.svg?raw";
import farShareNodes from "@fortawesome/fontawesome-pro/svgs/regular/share-nodes.svg?raw";

import styles from "./icon.element.scss?inline";

Expand Down Expand Up @@ -74,6 +75,7 @@ function renderSvg(iconId: string) {
"question": () => fasQuestion,
"rotate": () => farRotate,
"scale": () => farScale,
"share-nodes": () => farShareNodes,
"skeleton": () => farSkeleton,
"up-down-left-right": () => farUpDownLeftRight,
"video": () => farVideo,
Expand Down
2 changes: 1 addition & 1 deletion studio-web/src/lib/scene-hierarchy.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import styles from "./scene-hierarchy.element.scss?inline";

import "@storyteller/studio-ui/tree";

interface SceneObject extends Omit<studio.SceneObject, "icon"|"children"> {
export interface SceneObject extends Omit<studio.SceneObject, "children"> {
icon?: string;
children: SceneObject[];
}
Expand Down
Loading