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

Mac fixes #458

Closed
wants to merge 17 commits into from
Closed

Mac fixes #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c0b2b4c
CSCore source replacement
andybak May 14, 2023
40e246b
Add metal to shader exclusion
andybak May 14, 2023
66b574e
Quick fix for bug with images on layers sometimes breaking script loa…
andybak May 14, 2023
22b5720
Merge branch 'main' into feature/mac-editor-fixes
andybak Jun 15, 2023
4dddf54
Switch from the baked-in CSCore to the UPM version
andybak Jun 18, 2023
b3b9d8c
Allow building Mac and OSX via the build window
andybak Jun 18, 2023
106bb2c
Merge branch 'main' into feature/mac-editor-fixes
andybak Jul 18, 2023
8dc2339
Merge branch 'main' into feature/mac-editor-fixes
andybak Aug 21, 2023
9a3a2f4
Sync to main, fix package issues. Add TILT_BRUSH symbol to iOS platform
andybak Aug 21, 2023
4368e38
Switch back to desktop as current platform. iOS symbol wasn't saved a…
andybak Aug 21, 2023
1e83944
Merge branch 'main' into feature/mac-editor-fixes
andybak Aug 23, 2023
54907cb
Switch to the CSCore on icosa-mirror. Remove empty folder .meta
andybak Aug 23, 2023
93c02ac
Merge branch 'main' into feature/mac-editor-fixes
andybak Aug 24, 2023
3fc8fb8
Merge branch 'main' into feature/mac-editor-fixes
andybak Sep 9, 2023
9e84a8d
Merge remote-tracking branch 'upstream/main' into feature/mac-editor-…
andybak Sep 12, 2023
384b440
Merge branch 'main' into feature/mac-editor-fixes
andybak Sep 14, 2023
d4a7fd0
Merge remote-tracking branch 'upstream/main' into feature/mac-editor-…
andybak Sep 30, 2023
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
17 changes: 16 additions & 1 deletion Assets/Editor/BuildTiltBrush.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,12 @@ private static readonly List<KeyValuePair<XrSdkMode, BuildTarget>> kValidSdkTarg
{
// Mono
new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.Monoscopic, BuildTarget.StandaloneWindows64),
new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.Monoscopic, BuildTarget.StandaloneOSX),
new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.Monoscopic, BuildTarget.Android),

// OpenXR
new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.OpenXR, BuildTarget.StandaloneWindows64),
new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.OpenXR, BuildTarget.StandaloneOSX),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is a valid combination, can you add it to the CI please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will do once it's working. Still very much WIP

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. I see what I've done. I made the PR and then continued working on stuff, forgetting about the PR. I should create a new branch to separate out PR-ready from WIP. My mistake.

new KeyValuePair<XrSdkMode, BuildTarget>(XrSdkMode.OpenXR, BuildTarget.Android),

#if OCULUS_SUPPORTED
Expand Down Expand Up @@ -1105,7 +1108,19 @@ public TempSetXrPlugin(TiltBuildOptions tiltOptions)
targetXrPluginsRequired = new string[] { "Unity.XR.Oculus.OculusLoader" };
break;
case XrSdkMode.OpenXR:
targetXrPluginsRequired = new string[] { "UnityEngine.XR.OpenXR.OpenXRLoader" };
switch (tiltOptions.Target)
{
// A bit weird but we're using XrSdkMode.OpenXR to also handle "no headset but not monoscopic"
case BuildTarget.StandaloneOSX:
case BuildTarget.iOS:
break;
case BuildTarget.StandaloneLinux64:
case BuildTarget.StandaloneWindows:
case BuildTarget.StandaloneWindows64:
case BuildTarget.Android:
targetXrPluginsRequired = new string[] { "UnityEngine.XR.OpenXR.OpenXRLoader" };
break;
}
break;
case XrSdkMode.Pico:
targetXrPluginsRequired = new string[] { "Unity.XR.PXR.PXR_Loader" };
Expand Down
8 changes: 0 additions & 8 deletions Assets/ThirdParty/CSCore.meta
View file
Open in desktop

This file was deleted.

Binary file removed Assets/ThirdParty/CSCore/CSCore.dll
View file
Open in desktop
Binary file not shown.
94 changes: 0 additions & 94 deletions Assets/ThirdParty/CSCore/CSCore.dll.meta
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions Assets/ThirdParty/CSCore/CSCoreLicense.txt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/ThirdParty/CSCore/CSCoreLicense.txt.meta
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Assets/ThirdParty/CSCore/README.tiltbrush
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/ThirdParty/CSCore/README.tiltbrush.meta
View file
Open in desktop

This file was deleted.

18 changes: 17 additions & 1 deletion Assets/XR/Settings/Open XR Package Settings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
m_Name: Open XR Package Settings
m_EditorClassIdentifier:
Keys: 01000000070000000d0000000e000000
Keys: 01000000070000000d0000000e00000004000000
Values:
- {fileID: 7381656899648225167}
- {fileID: -1294329756112899549}
- {fileID: 9061466112958658113}
- {fileID: 5710753191044472963}
- {fileID: 4086831495593876759}
--- !u!114 &1263590293311991825
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -702,6 +703,21 @@ MonoBehaviour:
required: 0
cacheSize: 1048576
perThreadCacheSize: 51200
--- !u!114 &4086831495593876759
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: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
m_Name: iPhone
m_EditorClassIdentifier:
features: []
m_renderMode: 1
m_depthSubmissionMode: 0
--- !u!114 &5082403655935391592
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
1 change: 1 addition & 0 deletions Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"dependencies": {
"com.ixxy.unitysymmetry": "https://github.com/IxxyXR/unity-symmetry.git?nocache=7#upm",
"com.atteneder.gltfast": "5.0.4",
"com.filoe.cscore": "https://github.com/icosa-mirror/com.filoe.cscore.git#upm",
"com.meta.xr.sdk.utilities": "https://github.com/icosa-mirror/com.meta.xr.sdk.utilities.git#open-brush",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
Expand Down
7 changes: 7 additions & 0 deletions Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
"source": "embedded",
"dependencies": {}
},
"com.filoe.cscore": {
"version": "https://github.com/icosa-mirror/com.filoe.cscore.git#upm",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "85891599eb66651704ae81d09d72a68745a71ce9"
},
"com.ixxy.unitysymmetry": {
"version": "https://github.com/IxxyXR/unity-symmetry.git?nocache=7#upm",
"depth": 0,
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/PackageManagerSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ MonoBehaviour:
m_RegistryInfoDraft:
m_Modified: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -830
m_UserModificationsInstanceId: -828
m_OriginalInstanceId: -832
m_LoadAssets: 0
Loading