Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
d742fd1
Updating node-sass version (to remove python2 dependency)
Dec 2, 2022
d3fba93
Husky update
Dec 2, 2022
139f797
[KJSL] Swap webvr ro webxr polyfill packages
Dec 5, 2022
a46b98d
Example of having both polyfills - rewritting plugin.js to use the ne…
kevleyski Dec 5, 2022
dc28b05
[KJSL] Swap webvr ro webxr polyfill packages
Dec 6, 2022
f41dc2a
Merge pull request #1 from kevleyski/main
kevleyski Dec 6, 2022
dbc1073
[KJSL] Swap webvr ro webxr polyfill packages
Dec 6, 2022
cd30806
[KJSL] Swap webvr ro webxr polyfill packages
Dec 6, 2022
eecdbba
Merge pull request #2 from kevleyski/main
kevleyski Dec 6, 2022
d6821ab
[KJSL] Swap webvr ro webxr polyfill packages
Dec 7, 2022
842abed
Merge pull request #3 from kevleyski/main
kevleyski Dec 7, 2022
6de443d
[KJSL] Swap webvr ro webxr polyfill packages
Dec 7, 2022
b318d28
[KJSL] Swap webvr ro webxr polyfill packages
Dec 7, 2022
6d4ff0a
[KJSL] Swap webvr ro webxr polyfill packages
Dec 11, 2022
e02ce1d
Merge pull request #4 from kevleyski/main
kevleyski Dec 11, 2022
70a1611
chore: Swap webvr ro webxr polyfill packages
Dec 11, 2022
e0d1c48
Merge pull request #5 from kevleyski/main
kevleyski Dec 11, 2022
36e7cdc
chore: Swap webvr ro webxr polyfill packages (continue to use webvr p…
Dec 12, 2022
c8330f7
Merge pull request #6 from kevleyski/main
kevleyski Dec 12, 2022
56ad5f3
chore: Swap webvr ro webxr polyfill packages (adding basic controller…
Dec 14, 2022
a8d1459
Merge pull request #7 from kevleyski/main
kevleyski Dec 14, 2022
856a183
chore: Swap webvr ro webxr polyfill packages (add iOS permission chec…
Dec 20, 2022
8d88ec5
Merge pull request #8 from kevleyski/main
kevleyski Dec 20, 2022
7c0c62b
chore: Swap webvr ro webxr polyfill packages (add iOS permission chec…
Dec 20, 2022
46c7207
Merge pull request #9 from kevleyski/main
kevleyski Dec 20, 2022
7bf68a5
Update src/big-vr-play-button.js
kevleyski Dec 20, 2022
1cc47ef
Update src/plugin.js
kevleyski Dec 20, 2022
13d2b02
Merge pull request #1 from MetaCDN/main
kevleyski Dec 20, 2022
2603836
chore: Swap webvr for webxr polyfill packages (PR fix ups)
Dec 20, 2022
ff858af
chore: Swap webvr for webxr polyfill packages (PR fix ups)
Dec 20, 2022
de6db15
Merge pull request #10 from kevleyski/main
kevleyski Dec 20, 2022
80f9e0c
chore: Swap webvr for webxr polyfill packages (PR fix ups - part reve…
Dec 20, 2022
448eb88
chore: Swap webvr for webxr polyfill packages (PR fix ups - only show…
Dec 21, 2022
8fb0579
Merge pull request #11 from kevleyski/main
kevleyski Dec 21, 2022
538dca1
(revert accidental file delete)
Dec 21, 2022
cf6277d
chore: Swap webvr for webxr polyfill packages (PR fix ups - clicking …
Dec 21, 2022
07c7f54
chore: Swap webvr for webxr polyfill packages (PR fix ups - clicking …
Dec 21, 2022
c5c6a58
Merge pull request #12 from kevleyski/main
kevleyski Dec 21, 2022
35ed850
chore: Swap webvr for webxr polyfill packages (PR fix ups - testing o…
Dec 23, 2022
8441f77
Merge pull request #13 from kevleyski/main
kevleyski Dec 23, 2022
9ce1f15
chore: Swap webvr for webxr polyfill packages (PR fix ups - testing o…
Jan 24, 2023
a6528ac
chore: Swap webvr for webxr polyfill packages (PR fix ups - adding 18…
Jan 25, 2023
33d206b
Merge pull request #14 from kevleyski/main
kevleyski Jan 25, 2023
91cfea0
chore: Swap webvr for webxr polyfill packages (PR fix ups - adding 18…
Jan 25, 2023
b0ebafd
Merge pull request #15 from kevleyski/main
kevleyski Jan 25, 2023
dc23443
chore: Swap webvr for webxr polyfill packages (PR fix ups - deprecate…
Jan 25, 2023
72ae5d3
Merge pull request #16 from kevleyski/main
kevleyski Jan 25, 2023
62c45b4
three version up
kevleyski Jan 27, 2023
0e1c4a1
three version up
kevleyski Jan 27, 2023
3261832
(three.js version)
kevleyski Jan 27, 2023
9ed1171
Merge pull request #17 from kevleyski/main
kevleyski Jan 27, 2023
b180074
three.js version API differences
kevleyski Jan 27, 2023
55d53dc
Merge pull request #18 from kevleyski/main
kevleyski Jan 27, 2023
8adb558
three.js version API differences (part revert to allow webvr to still…
kevleyski Jan 27, 2023
3264b5e
Merge pull request #19 from kevleyski/main
kevleyski Jan 27, 2023
f8ea3cb
three.js version revert back to v129 as 130 breaks renderer.getSize
kevleyski Jan 27, 2023
c9f5903
Merge pull request #20 from kevleyski/main
kevleyski Jan 27, 2023
466267b
cubemap verticies
kevleyski Jan 27, 2023
da9c89c
fix up 180 mono
kevleyski Jan 27, 2023
c3b9b4f
Merge pull request #21 from kevleyski/main
kevleyski Jan 27, 2023
c4bd610
Move to latest THREE.js (0.149.0)
kevleyski Jan 27, 2023
a4c12ac
Use latest THREE.js
kevleyski Jan 27, 2023
3786a9d
Merge pull request #22 from kevleyski/main
kevleyski Jan 27, 2023
5943617
chore: Swap webvr for webxr polyfill packages (PR fix ups - fix up VR…
Jan 29, 2023
70c5f29
Merge pull request #23 from kevleyski/main
kevleyski Jan 29, 2023
37fe825
chore: Swap webvr for webxr polyfill packages (PR fix ups - fix up 18…
Jan 30, 2023
e444322
Merge pull request #24 from kevleyski/main
kevleyski Jan 30, 2023
d890f20
chore: Swap webvr for webxr polyfill packages (PR fix ups - cubemap)
Jan 31, 2023
89ab083
chore: Swap webvr for webxr polyfill packages (PR fix ups - cubemap)
Jan 31, 2023
dc27ea8
chore: Swap webvr for webxr polyfill packages (PR fix ups - cubemap)
Jan 31, 2023
cd05e47
Merge pull request #25 from kevleyski/main
kevleyski Jan 31, 2023
a2b1aa0
chore: Swap webvr for webxr polyfill packages (PR fix ups - cubemap b…
Jan 31, 2023
ad1b413
Merge pull request #26 from kevleyski/main
kevleyski Jan 31, 2023
c58338c
chore: Swap webvr for webxr polyfill packages (PR fix ups - UI) (#27)
kevleyski Mar 31, 2023
4a58148
(more tests/examples)
kevleyski Jul 6, 2023
48fd17b
(more tests/examples)
kevleyski Jul 6, 2023
46fd3b1
(fix up PR #273 merge)
kevleyski Jul 6, 2023
4d2165d
videojs-vr v2.1.0 (baseline pre merge from videojs github)
Jul 22, 2024
0386ec1
Test husky
Jul 23, 2024
842651e
Updated README
jbroberg Jul 23, 2024
855e04c
Husky test
Jul 23, 2024
01d12fd
Updated README
jbroberg Jul 23, 2024
4e19fa3
Merge branch 'main' of https://github.com/MetaCDN/videojs-vr
jbroberg Jul 23, 2024
1e971cd
Fixup Ellipsoidal Cube Maps
Jul 23, 2024
ad6dd0f
Fixing Equi-Angular Cubemap
Jul 23, 2024
48e84fa
Fixing Equi-Angular Cubemap
Jul 23, 2024
0581199
fix readme typos
jbroberg Jul 24, 2024
3650987
Fixing Equi-Angular Cubemap orientation
Jul 24, 2024
8a41917
Merge remote-tracking branch 'origin/main'
Jul 24, 2024
cc00e6f
THREE.js buffer geometry refactor
Jul 24, 2024
ab66880
Cleanup, bump three and external imports
jbroberg Jul 29, 2024
58ab5ba
Disable Cardboard by default
jbroberg Jul 29, 2024
36345dd
(remove cardboard)
Jul 29, 2024
e00f3a9
KJSL: reviving DeviceOrientationControls for where we've removed Card…
Jul 30, 2024
26c4ef1
KJSL: Reviving DeviceOrientationControls for iPhone
Jul 30, 2024
1293cbd
KJSL: Reviving DeviceOrientationControls for iPhone
Jul 30, 2024
2297edd
KJSL: Reviving DeviceOrientationControls for iPhone
Jul 30, 2024
8685bb5
KJSL: Reviving DeviceOrientationControls for iPhone
Jul 30, 2024
5de1366
KJSL: Reviving DeviceOrientationControls for iPhone
Jul 30, 2024
888a390
KJSL: devices fill the screen more
Jul 30, 2024
ebbf917
KJSL: devices fill the screen more
Jul 30, 2024
8b44f0c
KJSL: moving example UI image to dist, this will later be separated
Aug 9, 2024
f7a1c4e
KJSL: latest rollup image plugin didn't seem to work with other maybe…
Aug 9, 2024
d131def
KJSL: update to latest THREE.js
Aug 9, 2024
92f9182
Allow passing in M3U8 or MPD as the QUERY_STRING
Aug 12, 2024
a3145b5
Fix up exception and green button
Aug 13, 2024
3c9efb8
Resize timing bug around webxr-polyfill (getEyeParameters)
Aug 13, 2024
6f845f5
Resize timing bug around webxr-polyfill (getEyeParameters)
Aug 13, 2024
ec34d00
Resize timing bug around webxr-polyfill (getEyeParameters)
Aug 13, 2024
0c90edc
Rollback THREE.js to earlier version which didnt have brightness/gamm…
Aug 15, 2024
e89683f
KJSL: v2.1.1
Aug 19, 2024
3be5577
KJSL: v2.1.1
Aug 19, 2024
cea8a83
KJSL: v2.1.2 Android can use native cardboaard support instead
Aug 19, 2024
b5ddaa5
Merge remote-tracking branch 'origin/jimdevel'
Aug 19, 2024
5f5ce22
KJSL: v2.1.2 Android can use native cardboard support instead
Aug 19, 2024
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
Prev Previous commit
Next Next commit
Fix up exception and green button
  • Loading branch information
Kevin Staunton-Lambert committed Aug 13, 2024
commit a3145b5130e1fd389de51a0f17c4f9e36b4bbc53
7 changes: 4 additions & 3 deletions src/big-vr-play-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ class BigVrPlayButton extends BigPlayButton {
});
}

if (window.navigator.xr) {
if (window.navigator.xr && window.navigator.xr.requestSession) {
const sessionInit = {optionalFeatures: ['local-floor', 'bounded-floor', 'hand-tracking']};
const self = this;

window.navigator.xr.requestSession('immersive-vr', sessionInit).then(self.onSessionStarted).catch();
window.navigator.xr.requestSession('immersive-vr', sessionInit).then(self.onSessionStarted).catch((error) => {
self.log('immersive-vr not supported ' + error);
});
}

super.handleClick(event);
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/plugin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ body {
background-color: #cdcdcd;
}

button {
#VRButton {
opacity: 0.8 !important;
background-color: green !important;
background-color: #c43238ff !important;
font-style: bold !important;
}

Expand All @@ -31,7 +31,6 @@ button {
height: 100px;
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='360' height='360' viewBox='0 0 360 360'%3E%3Cpath fill='%23FFF' d='M334.883 275.78l-6.374-36.198-6.375-36.2-28.16 23.62-28.164 23.62 25.837 9.41C266.247 296.544 224 320.5 176.25 320.5c-77.47 0-140.5-63.03-140.5-140.5 0-77.472 63.03-140.5 140.5-140.5 53.428 0 99.98 29.978 123.733 73.993l13.304-6.923C287.025 57.76 235.45 24.5 176.25 24.5c-85.743 0-155.5 69.757-155.5 155.5 0 85.742 69.757 155.5 155.5 155.5 54.253 0 102.09-27.94 129.922-70.177l28.71 10.457z'/%3E%3Cpath fill='%23FFF' d='M314.492 175.167c-12.98 0-23.54-10.56-23.54-23.54s10.56-23.54 23.54-23.54c12.98 0 23.54 10.56 23.54 23.54s-10.56 23.54-23.54 23.54zm0-38.08c-8.018 0-14.54 6.522-14.54 14.54s6.522 14.54 14.54 14.54c8.017 0 14.54-6.522 14.54-14.54s-6.523-14.54-14.54-14.54z'/%3E%3Cg fill='%23FFF'%3E%3Cpath d='M88.76 173.102h9.395c4.74-.042 8.495-1.27 11.268-3.682 2.77-2.412 4.157-5.903 4.157-10.474 0-4.4-1.153-7.817-3.46-10.25-2.307-2.434-5.83-3.65-10.568-3.65-4.147 0-7.554 1.195-10.22 3.585-2.666 2.392-4 5.514-4 9.364H69.908c0-4.74 1.26-9.055 3.776-12.95 2.518-3.892 6.03-6.928 10.537-9.108 4.508-2.18 9.554-3.27 15.14-3.27 9.225 0 16.472 2.318 21.74 6.952 5.27 4.634 7.903 11.077 7.903 19.33 0 4.147-1.323 8.05-3.967 11.71-2.646 3.66-6.062 6.422-10.252 8.284 5.078 1.736 8.94 4.465 11.584 8.19s3.968 8.166 3.968 13.33c0 8.294-2.847 14.895-8.538 19.804s-13.17 7.363-22.438 7.363c-8.887 0-16.166-2.37-21.836-7.11-5.67-4.74-8.506-11.045-8.506-18.916h15.425c0 4.062 1.365 7.363 4.094 9.902 2.73 2.54 6.4 3.81 11.014 3.81 4.782 0 8.55-1.27 11.3-3.81s4.126-6.22 4.126-11.045c0-4.865-1.44-8.61-4.316-11.235-2.878-2.623-7.152-3.936-12.822-3.936H88.76V173.1zM187.598 133.493v12.76h-1.904c-8.633.126-15.53 2.497-20.693 7.108-5.162 4.614-8.23 11.152-9.203 19.615 4.95-5.205 11.277-7.808 18.98-7.808 8.166 0 14.608 2.878 19.328 8.633 4.718 5.755 7.077 13.182 7.077 22.28 0 9.395-2.76 17.002-8.284 22.82-5.52 5.818-12.77 8.73-21.74 8.73-9.226 0-16.705-3.407-22.44-10.222-5.733-6.812-8.6-15.742-8.6-26.787v-5.267c0-16.208 3.945-28.903 11.84-38.086 7.89-9.182 19.242-13.774 34.054-13.774h1.586zM171.03 177.61c-3.386 0-6.485.95-9.3 2.855-2.814 1.904-4.877 4.443-6.188 7.617v4.697c0 6.854 1.438 12.304 4.316 16.345 2.877 4.04 6.602 6.062 11.172 6.062s8.188-1.715 10.854-5.143 4-7.934 4-13.52-1.355-10.135-4.063-13.648c-2.708-3.51-6.304-5.267-10.79-5.267zM271.136 187.447c0 13.29-2.486 23.307-7.46 30.057s-12.535 10.125-22.69 10.125c-9.988 0-17.51-3.292-22.566-9.872-5.058-6.58-7.65-16.323-7.776-29.23V172.53c0-13.287 2.485-23.252 7.458-29.896 4.973-6.643 12.558-9.966 22.757-9.966 10.112 0 17.655 3.237 22.63 9.712 4.97 6.475 7.52 16.166 7.647 29.072v15.995zm-15.425-17.265c0-8.674-1.185-15.033-3.554-19.075-2.37-4.04-6.137-6.062-11.3-6.062-5.035 0-8.738 1.915-11.107 5.745-2.37 3.83-3.62 9.807-3.746 17.932v20.948c0 8.633 1.206 15.064 3.618 19.297s6.2 6.348 11.362 6.348c4.95 0 8.61-1.957 10.98-5.87 2.37-3.915 3.62-10.04 3.746-18.378v-20.885z'/%3E%3C/g%3E%3C/svg%3E");
background-size: contain;
background-color: rgba(0,180,0,0.5);
.vjs-icon-placeholder{
display:none;
}
Expand Down