From 751e4abf3bfec0098a9d6f119c0f86e6461943bf Mon Sep 17 00:00:00 2001 From: Davcris911 Date: Sun, 17 Oct 2021 18:36:29 -0400 Subject: [PATCH] New Assets for Teleportation --- .../Core/Locomotion/Materials/lambert1.mat | 10 +- .../Scripts/LocomotionController.cs | 8 +- .../Locomotion/Scripts/LocomotionTeleport.cs | 6 +- Assets/Oculus/VR/Prefabs/OVRHandPrefab.prefab | 121 ++++++++++-------- Assets/Resources/OVRBuildConfig.asset | 17 +++ Assets/Resources/OVRBuildConfig.asset.meta | 8 ++ ProjectSettings/ProjectSettings.asset | 98 +++++++++++++- ProjectSettings/TimeManager.asset | 6 +- 8 files changed, 204 insertions(+), 70 deletions(-) create mode 100644 Assets/Resources/OVRBuildConfig.asset create mode 100644 Assets/Resources/OVRBuildConfig.asset.meta diff --git a/Assets/Oculus/SampleFramework/Core/Locomotion/Materials/lambert1.mat b/Assets/Oculus/SampleFramework/Core/Locomotion/Materials/lambert1.mat index fb07ab0..579c63d 100644 --- a/Assets/Oculus/SampleFramework/Core/Locomotion/Materials/lambert1.mat +++ b/Assets/Oculus/SampleFramework/Core/Locomotion/Materials/lambert1.mat @@ -4,8 +4,9 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: lambert1 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: _EMISSION @@ -72,5 +73,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.25938943, g: 0.8207547, b: 0.8037422, a: 1} + - _EmissionColor: {r: 0.11120505, g: 0.18109156, b: 0.46226418, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionController.cs b/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionController.cs index 1f2b5f7..192304a 100644 --- a/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionController.cs +++ b/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionController.cs @@ -22,10 +22,10 @@ using UnityEngine.SceneManagement; public class LocomotionController : MonoBehaviour { public OVRCameraRig CameraRig; - //public CharacterController CharacterController; - public CapsuleCollider CharacterController; - //public OVRPlayerController PlayerController; - public SimpleCapsuleWithStickMovement PlayerController; + public CharacterController CharacterController; + //public CapsuleCollider CharacterController; + public OVRPlayerController PlayerController; + //public SimpleCapsuleWithStickMovement PlayerController; void Start() { diff --git a/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionTeleport.cs b/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionTeleport.cs index bbb80f5..deb5924 100644 --- a/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionTeleport.cs +++ b/Assets/Oculus/SampleFramework/Core/Locomotion/Scripts/LocomotionTeleport.cs @@ -769,7 +769,8 @@ public class LocomotionTeleport : MonoBehaviour public void DoTeleport() { var character = LocomotionController.CharacterController; - var characterTransform = character.transform; + character.enabled = false; + var characterTransform = character.transform; var destTransform = _teleportDestination.OrientationIndicator; Vector3 destPosition = destTransform.position; @@ -789,7 +790,8 @@ public class LocomotionTeleport : MonoBehaviour characterTransform.position = destPosition; characterTransform.rotation = destRotation; - } + character.enabled = true; + } /// /// Convenience method for finding the character's position. diff --git a/Assets/Oculus/VR/Prefabs/OVRHandPrefab.prefab b/Assets/Oculus/VR/Prefabs/OVRHandPrefab.prefab index 75b5806..895e8e3 100644 --- a/Assets/Oculus/VR/Prefabs/OVRHandPrefab.prefab +++ b/Assets/Oculus/VR/Prefabs/OVRHandPrefab.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1870938896605422} - m_IsPrefabParent: 1 --- !u!1 &1870938896605422 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4453513310108136} - component: {fileID: 114428879332287356} @@ -34,9 +24,10 @@ GameObject: m_IsActive: 1 --- !u!4 &4453513310108136 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870938896605422} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -45,36 +36,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114252240061623322 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1870938896605422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73eac66b128fc8749a21623225c34541, type: 3} - m_Name: - m_EditorClassIdentifier: - _ovrMesh: {fileID: 0} - _ovrSkeleton: {fileID: 0} ---- !u!114 &114392993255165844 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1870938896605422} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 54c16b381e28e8d479237771d234dbae, type: 3} - m_Name: - m_EditorClassIdentifier: - _skeletonMaterial: {fileID: 0} --- !u!114 &114428879332287356 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870938896605422} m_Enabled: 1 m_EditorHideFlags: 0 @@ -82,11 +49,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: HandType: 0 + _pointerPoseRoot: {fileID: 0} --- !u!114 &114567484643301796 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870938896605422} m_Enabled: 1 m_EditorHideFlags: 0 @@ -97,11 +66,30 @@ MonoBehaviour: _updateRootPose: 0 _updateRootScale: 1 _enablePhysicsCapsules: 0 +--- !u!114 &114392993255165844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870938896605422} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54c16b381e28e8d479237771d234dbae, type: 3} + m_Name: + m_EditorClassIdentifier: + _confidenceBehavior: 1 + _systemGestureBehavior: 1 + _renderPhysicsCapsules: 0 + _skeletonMaterial: {fileID: 0} + _capsuleMaterial: {fileID: 0} + _systemGestureMaterial: {fileID: 0} --- !u!114 &114925265787909616 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870938896605422} m_Enabled: 1 m_EditorHideFlags: 0 @@ -109,11 +97,29 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _meshType: 0 +--- !u!114 &114252240061623322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870938896605422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73eac66b128fc8749a21623225c34541, type: 3} + m_Name: + m_EditorClassIdentifier: + _ovrMesh: {fileID: 0} + _ovrSkeleton: {fileID: 0} + _confidenceBehavior: 1 + _systemGestureBehavior: 1 + _systemGestureMaterial: {fileID: 0} --- !u!137 &137619227449585070 SkinnedMeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870938896605422} m_Enabled: 1 m_CastShadows: 1 @@ -122,6 +128,10 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 5ba7d209f622bb44e87b47ce27ee27b7, type: 2} m_StaticBatchInfo: @@ -131,6 +141,7 @@ SkinnedMeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -154,4 +165,4 @@ SkinnedMeshRenderer: m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 1 + m_DirtyAABB: 0 diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset new file mode 100644 index 0000000..bd43be8 --- /dev/null +++ b/Assets/Resources/OVRBuildConfig.asset @@ -0,0 +1,17 @@ +%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: 20553fac56ec59645857c0732b787431, type: 3} + m_Name: OVRBuildConfig + m_EditorClassIdentifier: + androidSDKPath: E:\Unity\2020.2.2f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK + gradlePath: + jdkPath: diff --git a/Assets/Resources/OVRBuildConfig.asset.meta b/Assets/Resources/OVRBuildConfig.asset.meta new file mode 100644 index 0000000..09305a1 --- /dev/null +++ b/Assets/Resources/OVRBuildConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ccd2a7cf5a3a0046bae8db84a825382 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 887a0dd..c5d0489 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -128,7 +128,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: a50d20b1626d3d240a662a5ce6b2cc65, type: 2} + - {fileID: -8206605843043474360, guid: ee43f997c03df204896142e4045b3dda, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -258,7 +260,99 @@ PlayerSettings: AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 558a017..1915451 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -3,7 +3,7 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 - Maximum Allowed Timestep: 0.33333334 + Fixed Timestep: 0.011111111 + Maximum Allowed Timestep: 1 m_TimeScale: 1 - Maximum Particle Timestep: 0.03 + Maximum Particle Timestep: 1