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

Jump to bottom

Add basic support for loading media with bitecs behind feature flag. #5677

Merged
merged 85 commits into from
Sep 2, 2022
Merged

Add basic support for loading media with bitecs behind feature flag. #5677

merged 85 commits into from
Sep 2, 2022

Conversation

johnshaughnessy
Copy link
Contributor

@johnshaughnessy johnshaughnessy commented Aug 26, 2022 •
edited
Loading

Models, images, and a subset of videos will load into the scene with bitecs when the newLoader query string parameter is present. Also, there's an ECS info sidebar that can be shown with the ecsDebug query string parameter.

Fixes #3470

johnshaughnessy and others added 30 commits August 5, 2022 12:06
@johnshaughnessy @netpro2k
[Work in progress] Load images without AFRAME
4077884 
Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@johnshaughnessy
Stub out video
7885b32
@johnshaughnessy
Add models to media-loading system
87b0ef6
@johnshaughnessy
Resize and recenter media after it loads
e95c2e7
@johnshaughnessy
Add chain for sequential coroutines.
12e82d8 
Also delay adding the proxy object.
@johnshaughnessy
Animate the proxy object
c07ccf4
@johnshaughnessy
Start loading videos
b7e9a9f
@johnshaughnessy
Simplify coroutines and cancelables
b47b18b
@johnshaughnessy
Use AbortControllers and AbortSignals
3da1980
@johnshaughnessy
Merge remote-tracking branch 'origin/master' into feature/load-media
1e831b2
@johnshaughnessy
Fix error handling in coroutine / cancelable
d5c6e95
@johnshaughnessy
Merge remote-tracking branch 'origin/add-typescript' into feature/loa…
77554f8 
…d-media
@johnshaughnessy
Add networked video playback state
cd6962f
@johnshaughnessy
Separate the menus from the video entity
73af100
@johnshaughnessy
Fix cursor hovering on video menu
9a92bd8
@johnshaughnessy
Formatting
8fc2978
@johnshaughnessy
Remove unused code
0346a37
@netpro2k
Add type stub for troika-three-text
7df8801
@netpro2k
Convert jsx-entities to ts, type JSX better
9d94e7a
@netpro2k
Minor type fixes
db63f2f
@johnshaughnessy
Fix taking ownership of loaded media
1a98179
@johnshaughnessy
Remove NOCOMMIT
a75023e
@johnshaughnessy
Add seek-slider to video
889fefc
@johnshaughnessy
Update play/pause button label
4392a9f
@johnshaughnessy
Fix hovering on playhead
c9e485d
@netpro2k
Minor tweaks to video menu layout
4816d40
@johnshaughnessy
Intersecting In The Plane Of!
99f2a49 
Now you do what they told ya
@netpro2k
Basic audio playback for videos
42d6e14
@johnshaughnessy
Fix minor issue where time label is one frame late
64965b9
@johnshaughnessy
Rename mediaVideoSystem -> videoSystem
91d3181
johnshaughnessy and others added 28 commits August 30, 2022 14:18
@johnshaughnessy
Simplify function parameters
11fcd85
@johnshaughnessy
Consolidate MEDIA_TYPE and MediaType
b5b81a6
@johnshaughnessy
Simplify loader function signatures
5e695e9
@johnshaughnessy
Simplify loadVideoTexture parameters
157b0ea
@johnshaughnessy
Remove unnecessary workaround
b89f1e7
@johnshaughnessy
Remove log
4edc977
@johnshaughnessy
Simplify method signatures
fc4b58c
@johnshaughnessy
Simplify function parameters
f3c31d2
@johnshaughnessy
Simplify function parameters
a35e2d1
@johnshaughnessy
Remove unused code
10680ea
@johnshaughnessy
Use AnimationConfig type for calls to animate
7a73e21
@johnshaughnessy
Remove unused code
e21a247
@johnshaughnessy
Remove unnecessary workaround
9a4252e
@johnshaughnessy
Avoid extra copy
b32448c
@johnshaughnessy @netpro2k
Preload assets. Dry up model loading
8b1f2ce 
Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@johnshaughnessy
Rename MediaParams -> MediaLoaderParams
c89a192
@johnshaughnessy @netpro2k
Rename fetchUrlData -> resolveMediaInfo
359cad5 
Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@johnshaughnessy @netpro2k
Restore dontHoverAndHold.
c526275 
Also make sure to check if the hovered video entity still exists.

Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@johnshaughnessy @netpro2k
rename
d54c184 
Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@johnshaughnessy @netpro2k
Add ECS Debug sidebar on ecsDebug qs param
df37251 
Co-authored-by: Dominick D'Aniello <netpro2k@gmail.com>
@netpro2k
Remove duplicate exclude block
dbeeea6 
Regenerator is already excluded by our supported browser targets
@netpro2k
delint
bea7e3f
@netpro2k @johnshaughnessy
Rename couroutine timer functions
a83deb6 
Co-authored-by: John Shaughnessy <john@johnshaughnessy.com>
@netpro2k @johnshaughnessy
Fix video menu position updating issues
889a9c7 
Co-authored-by: John Shaughnessy <john@johnshaughnessy.com>
@netpro2k
Merge remote-tracking branch 'origin/master' into feature/load-media
8a89e6f
@netpro2k
Fix ECS Debug button label
a45e692
@netpro2k @johnshaughnessy
Clean up loading cube removal
59c7513 
Co-authored-by: John Shaughnessy <john@johnshaughnessy.com>
@netpro2k
Delint
b92010f
@netpro2k netpro2k merged commit 82ccf97 into master Sep 2, 2022
@netpro2k netpro2k deleted the feature/load-media branch September 2, 2022 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@netpro2k netpro2k netpro2k left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Performance problem on Firefox if video is placed in a room
2 participants
@johnshaughnessy @netpro2k