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.

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

Exclusively OpenXR for Android/PCVR #798

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3e51f98
openxr 1.13, composition layers
mikeskydev Nov 4, 2024
a417512
mikeskydev openxr extensions
mikeskydev Nov 4, 2024
9aac22d
update meta platform to remove meta core deps
mikeskydev Nov 5, 2024
b3778ac
goodbye oculus
mikeskydev Nov 5, 2024
5d9b556
first pass remove oculus/pico defines
mikeskydev Nov 5, 2024
2b76a2a
might as well ditch wave too
mikeskydev Nov 5, 2024
a56254d
up to date sdks/platforms
mikeskydev Nov 5, 2024
8caf2b2
wrap more oculus
mikeskydev Nov 5, 2024
26cf52f
remove pimax
mikeskydev Nov 5, 2024
7ce6144
remove oculus controls
mikeskydev Nov 5, 2024
7defcfc
remove redundant input manager
mikeskydev Nov 5, 2024
a1e8311
fix initialization, openxr stage,
mikeskydev Nov 5, 2024
8ecd345
oculus platform tidy up
mikeskydev Nov 5, 2024
b982a9d
prevent platform crash on non-quest
mikeskydev Nov 14, 2024
ee94671
Redefine passthrough
mikeskydev Dec 5, 2024
ab17822
Rework build
mikeskydev Dec 9, 2024
50af591
junk
mikeskydev Dec 10, 2024
6b43fae
remove buildtime configuration of CN variant
mikeskydev Dec 10, 2024
bb9c5ea
format AndroidUtils
mikeskydev Dec 10, 2024
4afafdc
extensions version update
mikeskydev Dec 11, 2024
82b28a0
no splash for now
mikeskydev Dec 11, 2024
a2db9d9
Pico controller, CN support re added
mikeskydev Dec 16, 2024
7950c25
Merge branch 'main' into feature/pure-openxr
mikeskydev Dec 16, 2024
8e6c24a
Merge tag '2.9.14' into feature/pure-openxr
mikeskydev Dec 17, 2024
d621e82
control xr manifest bits via plugin
mikeskydev Dec 17, 2024
f32024e
controller detection
mikeskydev Dec 17, 2024
7d46363
why are feature settings so buggy
mikeskydev Dec 17, 2024
dad9c0f
init android manager on start
mikeskydev Dec 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
193 changes: 26 additions & 167 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@
# This seems to be generated by SteamVR, and it contains absolute paths to things
# eg, "action_manifest_path": "C:\\src\\tbq2\\actions.json",
/unityProject.vrmanifest

# This seems to contain user-specific configuration data like:
# androidSDKPath: C:\Users\pld\AppData\Local\Android\Sdk
# and doesn't contain any general configuration data, so I think it doesn't go in the repo
/Assets/Resources/OVRBuildConfig.asset*
# Oculus Unitypackage 23.1 (or something in between 1.41 and 23.1) added this as a local file
/Assets/Resources/OVRPlatformToolSettings.asset*

# m_DebugWebRequest creates this
/Requests

Expand All @@ -84,24 +76,6 @@
/Assets/StreamingAssets/
/Assets/StreamingAssets.meta

# Google process
.gitbugtraq

# Oculus Integration
/Assets/Oculus/**
/Assets/Oculus.meta
!/Assets/Oculus/OculusProjectConfig.asset*

# In CI, this symlink is created to allow the updater to run. It should never go into source control
/Assets/Editor/OVRPluginUpdater.cs

# Pimax Integration
/Assets/Pimax
/Assets/Pimax.meta

# Pico Integration
Packages/com.unity.xr.picoxr

# Photon Integration
/Assets/Photon/**
/Assets/Photon.meta
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad074644ff568a14187a3690cfbd7534, type: 3}
m_Name: ONSPSettings
m_Script: {fileID: 11500000, guid: c66150246d824833a8257ecb5aaa1d11, type: 3}
m_Name: CompositionLayersPreferences
m_EditorClassIdentifier:
voiceLimit: 64
m_DisplayAnglesAs: 0
m_EmulationInScene: 1
m_EmulationInPlayMode: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/CompositionLayers/UserSettings/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b95e00e48ede4f8c896318a0e47ea88a, type: 3}
m_Name: CompositionLayersRuntimeSettings
m_EditorClassIdentifier:
m_EmulationInStandalone: 0
m_EnableSplashScreen: 0
m_SplashImage: {fileID: 0}
m_BackgroundColor: {r: 0.1372549, g: 0.1215686, b: 0.1254902, a: 1}
m_SplashDuration: 3
m_FadeInDuration: 2
m_FadeOutDuration: 1
m_FollowSpeed: 2
m_FollowDistance: 2
m_LockToHorizon: 1
m_LayerType: 0
m_QuadLayerData:
m_BlendType: 0
m_Size: {x: 1, y: 1}
m_ApplyTransformScale: 1
m_CylinderLayerData:
m_BlendType: 0
m_CentralAngle: 1.5707964
m_Radius: 0.6366198
m_AspectRatio: 1
m_ApplyTransformScale: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading