-
Notifications
You must be signed in to change notification settings - Fork 260
Replacing google poly integration with Icosa integration #1301
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.
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e80dc4c
Revert "Remove Google Poly integration"
andybak fd86858
Poly to Icosa
andybak 45a84b5
disable thumbnail proxy for now
andybak af9d256
Revert "disable thumbnail proxy for now"
Craigmoore 020843d
Merge branch 'Hubs-Foundation:master' into master
Craigmoore 17f90a2
update privacy url
andybak 4060ed8
Change text reference from Poly to Icosa
andybak 22a94f2
Merge branch 'Hubs-Foundation:master' into master
andybak 5b08d4b
Update categories to match all valid choices in the Icosa API
andybak c3030e1
Small fixes requested by @Exairnous
andybak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import ModelMediaSource from "../ModelMediaSource"; | ||
| import { TransformPivot } from "../../../editor/controls/SpokeControls"; | ||
|
|
||
| export default class IcosaSource extends ModelMediaSource { | ||
| constructor(api) { | ||
| super(api); | ||
| this.id = "icosa"; | ||
| this.name = "Icosa Gallery"; | ||
| this.tags = [ | ||
| { label: "Animals & Pets", value: "animals" }, | ||
| { label: "Architecture", value: "architecture" }, | ||
| { label: "Art", value: "art" }, | ||
| { label: "Culture", value: "culture" }, | ||
| { label: "Events", value: "events" }, | ||
| { label: "Food", value: "food" }, | ||
| { label: "History", value: "history" }, | ||
| { label: "Home", value: "home" }, | ||
| { label: "Miscellaneous", value: "miscellaneous" }, | ||
| { label: "Nature", value: "nature" }, | ||
| { label: "Objects", value: "objects" }, | ||
| { label: "People", value: "people" }, | ||
| { label: "Places", value: "places" }, | ||
| { label: "Science", value: "science" }, | ||
| { label: "Sports", value: "sports" }, | ||
| { label: "Tech", value: "tech" }, | ||
| { label: "Transport", value: "transport" }, | ||
| { label: "Travel", value: "travel" } | ||
| ]; | ||
|
|
||
| this.searchLegalCopy = "Search by Icosa"; | ||
| this.privacyPolicyUrl = "https://icosa.gallery/privacy-policy"; | ||
| this.transformPivot = TransformPivot.Bottom; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ import { Link } from "react-router-dom"; | |
| class CreateModelPopover extends Component { | ||
| componentDidMount() { | ||
| // TODO: Check if object was added | ||
| this.props.editor.setSource("sketchfab"); | ||
| this.props.editor.setSource("poly"); | ||
|
||
| this.props.editor.addListener("sceneGraphChanged", this.onObjectAdded); | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed