diff --git a/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0 b/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0 new file mode 100644 index 0000000..464c0fa Binary files /dev/null and b/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0 differ diff --git a/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0.meta b/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0.meta new file mode 100644 index 0000000..d60d3ac --- /dev/null +++ b/Assets/Oculus/Spatializer/Plugins/x86/AudioPluginOculusSpatializer.dll.old0.meta @@ -0,0 +1,60 @@ +fileFormatVersion: 2 +guid: 8307d3932030aad41a1b448be4984572 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 1 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Editor + second: + enabled: 0 + settings: + CPU: X86 + OS: Windows + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: X86 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0 b/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0 new file mode 100644 index 0000000..ac57d73 Binary files /dev/null and b/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0 differ diff --git a/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0.meta b/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0.meta new file mode 100644 index 0000000..83ddc06 --- /dev/null +++ b/Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.old0.meta @@ -0,0 +1,60 @@ +fileFormatVersion: 2 +guid: 292f6ed49f968bb4892767b5d8c6a0ea +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 1 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Editor + second: + enabled: 0 + settings: + CPU: X86_64 + OS: Windows + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: X86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/JoyCon/JoyConMovement.cs b/Assets/Scripts/JoyCon/JoyConMovement.cs index daa05b0..0296488 100644 --- a/Assets/Scripts/JoyCon/JoyConMovement.cs +++ b/Assets/Scripts/JoyCon/JoyConMovement.cs @@ -61,13 +61,30 @@ namespace JoyCon } #if DEBUG - float moveHorizontal = Input.GetAxis("Horizontal"); - float moveVertical = Input.GetAxis("Vertical"); - transform.Rotate(0.0f, moveHorizontal * constSpeed * 2, 0.0f); - transform.Translate(0, 0, moveVertical * constSpeed / 20); + movement_wasd(); #endif } public bool IsWalking() => Mathf.Abs(_gyroMagnitude.Total) > 1; + + + private void movement_wasd() + { + float moveHorizontal = Input.GetAxis("Horizontal"); + float moveVertical = Input.GetAxis("Vertical"); + transform.Rotate(0.0f, moveHorizontal * constSpeed * 2, 0.0f); + transform.Translate(0, 0, moveVertical * constSpeed / 20); + } + } + + + + public enum ChoiceOfMovement + { + wasd = 1, + teleport = 2, + joystick = 3, + joycon = 4, + omni = 5 } }