etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-12 20:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix audio on MacOS (#214)

Browse source 
* JoyShockLibrary

Fix PlayerInput.cs errors on MacOS
Fix libraries not being added to the final build

* how did i do this

* both !

* Fix Audio on MacOS (and fix JSL again)

* Extra notes
This commit is contained in:
Saraistupid 2023-01-21 04:35:00 +02:00 committed by GitHub
parent d41463ed82
commit 002fa19971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib Normal file → Executable file
View file

Binary file not shown.

14
Assets/Plugins/VorbisPlugin/Plugins/OSX/libVorbisPlugin.dylib.meta
View file

@ -6,7 +6,7 @@ PluginImporter:
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isPreloaded: 1
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
@ -16,23 +16,23 @@ PluginImporter:
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Android: 0
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 0
Exclude Win: 1
Exclude Win64: 1
Exclude iOS: 1
Exclude iOS: 0
- first:
Android: Android
second:
enabled: 0
enabled: 1
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
enabled: 1
settings: {}
- first:
Editor: Editor
@ -41,7 +41,7 @@ PluginImporter:
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: OSX
OS: AnyOS
- first:
Standalone: Linux64
second:
@ -69,7 +69,7 @@ PluginImporter:
- first:
iPhone: iOS
second:
enabled: 0
enabled: 1
settings:
AddToEmbeddedBinaries: false
CPU: AnyCPU

30
Assets/Scripts/InputSystem/PlayerInput.cs
View file

@ -88,7 +88,7 @@ namespace HeavenStudio
public static InputController GetInputController(int player)
{
// Needed so Keyboard works on MacOS
#if UNITY_EDITOR_OSX
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
inputDevices = new List<InputController>();
if(inputDevices.Count < 1)
{
@ -120,7 +120,7 @@ namespace HeavenStudio
// Needed so Keyboard works on MacOS
#if UNITY_EDITOR_OSX
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
inputDevices = new List<InputController>();
if(inputDevices.Count < 1)
{
@ -143,7 +143,7 @@ namespace HeavenStudio
public static void UpdateInputControllers()
{
// Needed so Keyboard works on MacOS
#if UNITY_EDITOR_OSX
#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
inputDevices = new List<InputController>();
if(inputDevices.Count < 1)
{
@ -235,10 +235,10 @@ namespace HeavenStudio
{
InputController c = GetInputController(1);
return (c.GetHatDirectionDown((InputController.InputDirection) UP)
|| c.GetHatDirectionDown((InputController.InputDirection) DOWN)
|| c.GetHatDirectionDown((InputController.InputDirection) LEFT)
|| c.GetHatDirectionDown((InputController.InputDirection) RIGHT)
) && playerHasControl();
|| c.GetHatDirectionDown((InputController.InputDirection) DOWN)
|| c.GetHatDirectionDown((InputController.InputDirection) LEFT)
|| c.GetHatDirectionDown((InputController.InputDirection) RIGHT)
) && playerHasControl();
}
@ -246,10 +246,10 @@ namespace HeavenStudio
{
InputController c = GetInputController(1);
return (c.GetHatDirectionUp((InputController.InputDirection) UP)
|| c.GetHatDirectionUp((InputController.InputDirection) DOWN)
|| c.GetHatDirectionUp((InputController.InputDirection) LEFT)
|| c.GetHatDirectionUp((InputController.InputDirection) RIGHT)
) && playerHasControl();
|| c.GetHatDirectionUp((InputController.InputDirection) DOWN)
|| c.GetHatDirectionUp((InputController.InputDirection) LEFT)
|| c.GetHatDirectionUp((InputController.InputDirection) RIGHT)
) && playerHasControl();
}
@ -257,10 +257,10 @@ namespace HeavenStudio
{
InputController c = GetInputController(1);
return (c.GetHatDirection((InputController.InputDirection) UP)
|| c.GetHatDirection((InputController.InputDirection) DOWN)
|| c.GetHatDirection((InputController.InputDirection) LEFT)
|| c.GetHatDirection((InputController.InputDirection) RIGHT)
) && playerHasControl();
|| c.GetHatDirection((InputController.InputDirection) DOWN)
|| c.GetHatDirection((InputController.InputDirection) LEFT)
|| c.GetHatDirection((InputController.InputDirection) RIGHT)
) && playerHasControl();
}

3
README.md
View file

@ -29,7 +29,8 @@ This project is still in development, so there are currently no release builds y
- [MacOS](https://nightly.link/megaminerjenny/HeavenStudio/workflows/main/master/StandaloneOSX-build.zip)
## Self-Building
#### Note: Mac-OS and Linux-based builds are not fully tested, you may [experience bugs with audio-related tasks](https://github.com/megaminerjenny/HeavenStudio/issues/72).
#### Note: MacOS and Linux-based builds are not fully tested, you may [experience bugs with audio-related tasks](https://github.com/megaminerjenny/HeavenStudio/issues/72).
#### Note: on MacOS, You need to [set the app as executable by yourself](https://cdn.discordapp.com/attachments/954121092564402207/1060769484278861844/IMG_6336.jpg).
Heaven Studio is made in [Unity 2020.3.25f1](https://unity3d.com/unity/whats-new/2020.3.25),
and programmed with [Visual Studio Code](https://code.visualstudio.com/).