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

Make Images and Videos Linkable #1101

Merged
merged 4 commits into from
Feb 16, 2021
Merged

Make Images and Videos Linkable #1101

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e198b44
Use models, images, and videos as links
robertlong Jan 29, 2021
83b9cd3
Remove support for models as links
robertlong Feb 12, 2021
ae7e808
Merge branch 'master' into feature/link-thumbnails
robertlong Feb 12, 2021
67b191c
Only show link field when flat projection
robertlong Feb 16, 2021
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
16 changes: 16 additions & 0 deletions src/editor/nodes/ImageNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,20 @@ export default class ImageNode extends EditorNodeMixin(Image) {
})()
);

const linkComponent = json.components.find(c => c.name === "link");

if (linkComponent) {
node.href = linkComponent.props.href;
}

return node;
}

constructor(editor) {
super(editor);

this._canonicalUrl = "";
this.href = "";
this.controls = true;
this.billboard = false;
}
Expand Down Expand Up @@ -119,6 +126,7 @@ export default class ImageNode extends EditorNodeMixin(Image) {
this.alphaMode = source.alphaMode;
this.alphaCutoff = source.alphaCutoff;
this._canonicalUrl = source._canonicalUrl;
this.href = source.href;

return this;
}
Expand All @@ -138,6 +146,10 @@ export default class ImageNode extends EditorNodeMixin(Image) {
components.billboard = {};
}

if (this.href) {
components.link = { href: this.href };
}

return super.serialize(components);
}

Expand Down Expand Up @@ -165,6 +177,10 @@ export default class ImageNode extends EditorNodeMixin(Image) {
this.addGLTFComponent("billboard", {});
}

if (this.href && this.projection === "flat") {
this.addGLTFComponent("link", { href: this.href });
}

this.replaceObject();
}

Expand Down
6 changes: 4 additions & 2 deletions src/editor/nodes/ModelNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ export default class ModelNode extends EditorNodeMixin(Model) {
this.initialScale = source.initialScale;
this.load(source.src);
} else {
this.updateStaticModes();
this.stats = JSON.parse(JSON.stringify(source.stats));
this.gltfJson = source.gltfJson;
this._canonicalUrl = source._canonicalUrl;
Expand All @@ -394,13 +393,16 @@ export default class ModelNode extends EditorNodeMixin(Model) {
this.collidable = source.collidable;
this.walkable = source.walkable;
this.combine = source.combine;
this.billboard = source.billboard;
this._billboard = source._billboard;

this.updateStaticModes();

return this;
}

prepareForExport(ctx) {
super.prepareForExport();

this.addGLTFComponent("shadow", {
cast: this.castShadow,
receive: this.receiveShadow
Expand Down
16 changes: 16 additions & 0 deletions src/editor/nodes/VideoNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ export default class VideoNode extends EditorNodeMixin(Video) {
node.billboard = true;
}

const linkComponent = json.components.find(c => c.name === "link");

if (linkComponent) {
node.href = linkComponent.props.href;
}

loadAsync(
(async () => {
await node.load(src, onError);
Expand Down Expand Up @@ -69,6 +75,7 @@ export default class VideoNode extends EditorNodeMixin(Video) {
this.volume = 0.5;
this.controls = true;
this.billboard = false;
this.href = "";
}

get src() {
Expand Down Expand Up @@ -182,6 +189,7 @@ export default class VideoNode extends EditorNodeMixin(Video) {
this.controls = source.controls;
this.billboard = source.billboard;
this._canonicalUrl = source._canonicalUrl;
this.href = source.href;

return this;
}
Expand Down Expand Up @@ -210,6 +218,10 @@ export default class VideoNode extends EditorNodeMixin(Video) {
components.billboard = {};
}

if (this.href) {
components.link = { href: this.href };
}

return super.serialize(components);
}

Expand Down Expand Up @@ -241,6 +253,10 @@ export default class VideoNode extends EditorNodeMixin(Video) {
this.addGLTFComponent("billboard", {});
}

if (this.href && this.projection === "flat") {
this.addGLTFComponent("link", { href: this.href });
}

this.replaceObject();
}

Expand Down
5 changes: 5 additions & 0 deletions src/ui/properties/ImageNodeEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from "react";
import PropTypes from "prop-types";
import NodeEditor from "./NodeEditor";
import InputGroup from "../inputs/InputGroup";
import StringInput from "../inputs/StringInput";
import SelectInput from "../inputs/SelectInput";
import BooleanInput from "../inputs/BooleanInput";
import NumericInputGroup from "../inputs/NumericInputGroup";
Expand All @@ -23,6 +24,7 @@ export default function ImageNodeEditor(props) {
const onChangeProjection = useSetPropertySelected(editor, "projection");
const onChangeTransparencyMode = useSetPropertySelected(editor, "alphaMode");
const onChangeAlphaCutoff = useSetPropertySelected(editor, "alphaCutoff");
const onChangeHref = useSetPropertySelected(editor, "href");

return (
<NodeEditor description={ImageNodeEditor.description} {...props}>
Expand All @@ -38,6 +40,9 @@ export default function ImageNodeEditor(props) {
<InputGroup name="Billboard" info="Image always faces user in Hubs.">
<BooleanInput value={node.billboard} onChange={onChangeBillboard} />
</InputGroup>
<InputGroup name="Link Href" info="Allows the image to function as a link for the given url.">
robertlong marked this conversation as resolved.
Show resolved Hide resolved
<StringInput value={node.href} onChange={onChangeHref} />
</InputGroup>
<InputGroup
name="Transparency Mode"
info={`How to apply transparency:
Expand Down
5 changes: 5 additions & 0 deletions src/ui/properties/VideoNodeEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import NodeEditor from "./NodeEditor";
import InputGroup from "../inputs/InputGroup";
import SelectInput from "../inputs/SelectInput";
import BooleanInput from "../inputs/BooleanInput";
import StringInput from "../inputs/StringInput";
import { VideoProjection } from "../../editor/objects/Video";
import VideoInput from "../inputs/VideoInput";
import { Video } from "styled-icons/fa-solid/Video";
Expand All @@ -18,6 +19,7 @@ export default function VideoNodeEditor(props) {
const onChangeSrc = useSetPropertySelected(editor, "src");
const onChangeProjection = useSetPropertySelected(editor, "projection");
const onChangeBillboard = useSetPropertySelected(editor, "billboard");
const onChangeHref = useSetPropertySelected(editor, "href");

return (
<NodeEditor description={VideoNodeEditor.description} {...props}>
Expand All @@ -27,6 +29,9 @@ export default function VideoNodeEditor(props) {
<InputGroup name="Billboard" info="Video always faces user in Hubs. Does not billboard in Spoke.">
<BooleanInput value={node.billboard} onChange={onChangeBillboard} />
</InputGroup>
<InputGroup name="Link Href" info="Allows the video to function as a link for the given url.">
<StringInput value={node.href} onChange={onChangeHref} />
robertlong marked this conversation as resolved.
Show resolved Hide resolved
</InputGroup>
<InputGroup name="Projection">
<SelectInput options={videoProjectionOptions} value={node.projection} onChange={onChangeProjection} />
</InputGroup>
Expand Down