From ab7cd608cb1cdb26069d889253b884b64bc3f8a0 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Wed, 27 Jan 2021 11:27:56 +0000 Subject: [PATCH] basic player controller and input handling --- game/Assets/InputSystem.inputsettings.asset | 7 +- game/Assets/Materials/Debug.meta | 8 + game/Assets/Materials/Debug/DebugFloor.mat | 124 ++ .../Materials/Debug/DebugFloor.mat.meta | 8 + game/Assets/Materials/Debug/DebugPlayer.mat | 124 ++ .../Materials/Debug/DebugPlayer.mat.meta | 8 + game/Assets/PostFX.meta | 8 + game/Assets/PostFX/BaseVolume.asset | 15 + game/Assets/PostFX/BaseVolume.asset.meta | 8 + game/Assets/Scenes/Main.unity | 1128 +++++++++++++++++ game/Assets/Scenes/Main.unity.meta | 7 + game/Assets/Scripts/Demo.meta | 8 + .../{ => Demo}/SimpleCameraController.cs | 586 ++++----- .../{ => Demo}/SimpleCameraController.cs.meta | 22 +- game/Assets/Scripts/Input.meta | 8 + game/Assets/Scripts/Input/BufferedInput.cs | 56 + .../Scripts/Input/BufferedInput.cs.meta | 11 + game/Assets/Scripts/Player.meta | 8 + .../Assets/Scripts/Player/PlayerController.cs | 28 + .../Scripts/Player/PlayerController.cs.meta | 11 + .../Scripts/Player/PlayerInputHandler.cs | 53 + .../Scripts/Player/PlayerInputHandler.cs.meta | 11 + .../Scripts/Player/PlayerInputSettings.cs | 10 + .../Player/PlayerInputSettings.cs.meta | 11 + .../Scripts/Player/PlayerMovementSettings.cs | 9 + .../Player/PlayerMovementSettings.cs.meta | 11 + game/Assets/Settings/Input.meta | 8 + .../Input/PlayerControls.inputactions | 206 +++ .../Input/PlayerControls.inputactions.meta | 14 + game/Assets/Settings/Player.meta | 8 + .../Settings/Player/PlayerInputSettings.asset | 16 + .../Player/PlayerInputSettings.asset.meta | 8 + .../Player/PlayerMovementSettings.asset | 15 + .../Player/PlayerMovementSettings.asset.meta | 8 + game/Assets/Settings/Rendering.meta | 8 + .../{ => Rendering}/ForwardRenderer.asset | 0 .../ForwardRenderer.asset.meta | 16 +- .../{ => Rendering}/SampleSceneProfile.asset | 236 ++-- .../SampleSceneProfile.asset.meta | 16 +- .../UniversalRP-HighQuality.asset | 106 +- .../UniversalRP-HighQuality.asset.meta | 16 +- .../UniversalRP-LowQuality.asset | 106 +- .../UniversalRP-LowQuality.asset.meta | 16 +- .../UniversalRP-MediumQuality.asset | 106 +- .../UniversalRP-MediumQuality.asset.meta | 16 +- .../TextMesh Pro/Resources/TMP Settings.asset | 10 +- .../ProjectSettings/EditorBuildSettings.asset | 23 +- .../com.unity.probuilder/Settings.json | 125 ++ game/ProjectSettings/ProjectSettings.asset | 11 +- game/ProjectSettings/TimeManager.asset | 18 +- game/UserSettings/EditorUserSettings.asset | 3 + 51 files changed, 2749 insertions(+), 654 deletions(-) create mode 100644 game/Assets/Materials/Debug.meta create mode 100644 game/Assets/Materials/Debug/DebugFloor.mat create mode 100644 game/Assets/Materials/Debug/DebugFloor.mat.meta create mode 100644 game/Assets/Materials/Debug/DebugPlayer.mat create mode 100644 game/Assets/Materials/Debug/DebugPlayer.mat.meta create mode 100644 game/Assets/PostFX.meta create mode 100644 game/Assets/PostFX/BaseVolume.asset create mode 100644 game/Assets/PostFX/BaseVolume.asset.meta create mode 100644 game/Assets/Scenes/Main.unity create mode 100644 game/Assets/Scenes/Main.unity.meta create mode 100644 game/Assets/Scripts/Demo.meta rename game/Assets/Scripts/{ => Demo}/SimpleCameraController.cs (97%) rename game/Assets/Scripts/{ => Demo}/SimpleCameraController.cs.meta (95%) create mode 100644 game/Assets/Scripts/Input.meta create mode 100644 game/Assets/Scripts/Input/BufferedInput.cs create mode 100644 game/Assets/Scripts/Input/BufferedInput.cs.meta create mode 100644 game/Assets/Scripts/Player.meta create mode 100644 game/Assets/Scripts/Player/PlayerController.cs create mode 100644 game/Assets/Scripts/Player/PlayerController.cs.meta create mode 100644 game/Assets/Scripts/Player/PlayerInputHandler.cs create mode 100644 game/Assets/Scripts/Player/PlayerInputHandler.cs.meta create mode 100644 game/Assets/Scripts/Player/PlayerInputSettings.cs create mode 100644 game/Assets/Scripts/Player/PlayerInputSettings.cs.meta create mode 100644 game/Assets/Scripts/Player/PlayerMovementSettings.cs create mode 100644 game/Assets/Scripts/Player/PlayerMovementSettings.cs.meta create mode 100644 game/Assets/Settings/Input.meta create mode 100644 game/Assets/Settings/Input/PlayerControls.inputactions create mode 100644 game/Assets/Settings/Input/PlayerControls.inputactions.meta create mode 100644 game/Assets/Settings/Player.meta create mode 100644 game/Assets/Settings/Player/PlayerInputSettings.asset create mode 100644 game/Assets/Settings/Player/PlayerInputSettings.asset.meta create mode 100644 game/Assets/Settings/Player/PlayerMovementSettings.asset create mode 100644 game/Assets/Settings/Player/PlayerMovementSettings.asset.meta create mode 100644 game/Assets/Settings/Rendering.meta rename game/Assets/Settings/{ => Rendering}/ForwardRenderer.asset (100%) rename game/Assets/Settings/{ => Rendering}/ForwardRenderer.asset.meta (95%) rename game/Assets/Settings/{ => Rendering}/SampleSceneProfile.asset (95%) rename game/Assets/Settings/{ => Rendering}/SampleSceneProfile.asset.meta (95%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-HighQuality.asset (96%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-HighQuality.asset.meta (95%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-LowQuality.asset (96%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-LowQuality.asset.meta (95%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-MediumQuality.asset (96%) rename game/Assets/Settings/{ => Rendering}/UniversalRP-MediumQuality.asset.meta (95%) diff --git a/game/Assets/InputSystem.inputsettings.asset b/game/Assets/InputSystem.inputsettings.asset index 1b236ef..e28f30f 100644 --- a/game/Assets/InputSystem.inputsettings.asset +++ b/game/Assets/InputSystem.inputsettings.asset @@ -12,8 +12,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3} m_Name: InputSystem.inputsettings m_EditorClassIdentifier: - m_SupportedDevices: [] - m_UpdateMode: 1 + m_SupportedDevices: + - Gamepad + - Keyboard + - Mouse + m_UpdateMode: 2 m_CompensateForScreenOrientation: 1 m_FilterNoiseOnCurrent: 0 m_DefaultDeadzoneMin: 0.125 diff --git a/game/Assets/Materials/Debug.meta b/game/Assets/Materials/Debug.meta new file mode 100644 index 0000000..be6e4e6 --- /dev/null +++ b/game/Assets/Materials/Debug.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f8ecaeb253d4d34395fd060eb25d6d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Materials/Debug/DebugFloor.mat b/game/Assets/Materials/Debug/DebugFloor.mat new file mode 100644 index 0000000..63039d4 --- /dev/null +++ b/game/Assets/Materials/Debug/DebugFloor.mat @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8537145971381943967 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DebugFloor + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0.7347231, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/game/Assets/Materials/Debug/DebugFloor.mat.meta b/game/Assets/Materials/Debug/DebugFloor.mat.meta new file mode 100644 index 0000000..96fffcb --- /dev/null +++ b/game/Assets/Materials/Debug/DebugFloor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 300ad1d63016b1e45b6300783dbf71f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Materials/Debug/DebugPlayer.mat b/game/Assets/Materials/Debug/DebugPlayer.mat new file mode 100644 index 0000000..138c1cc --- /dev/null +++ b/game/Assets/Materials/Debug/DebugPlayer.mat @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DebugPlayer + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &3096248022401129892 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/game/Assets/Materials/Debug/DebugPlayer.mat.meta b/game/Assets/Materials/Debug/DebugPlayer.mat.meta new file mode 100644 index 0000000..134a304 --- /dev/null +++ b/game/Assets/Materials/Debug/DebugPlayer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b0f58118cf7a5a4e85fda00fe3de44b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/PostFX.meta b/game/Assets/PostFX.meta new file mode 100644 index 0000000..1298838 --- /dev/null +++ b/game/Assets/PostFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 79c89d0ce21572744b7cd609656beb5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/PostFX/BaseVolume.asset b/game/Assets/PostFX/BaseVolume.asset new file mode 100644 index 0000000..7e68d38 --- /dev/null +++ b/game/Assets/PostFX/BaseVolume.asset @@ -0,0 +1,15 @@ +%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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: BaseVolume + m_EditorClassIdentifier: + components: [] diff --git a/game/Assets/PostFX/BaseVolume.asset.meta b/game/Assets/PostFX/BaseVolume.asset.meta new file mode 100644 index 0000000..d6e3d68 --- /dev/null +++ b/game/Assets/PostFX/BaseVolume.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f938231f926b7534399f18a1322653f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity new file mode 100644 index 0000000..f3cb315 --- /dev/null +++ b/game/Assets/Scenes/Main.unity @@ -0,0 +1,1128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &349701919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 349701923} + - component: {fileID: 349701922} + - component: {fileID: 349701921} + - component: {fileID: 349701920} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &349701920 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349701919} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &349701921 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349701919} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 300ad1d63016b1e45b6300783dbf71f1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &349701922 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349701919} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &349701923 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349701919} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1000, y: 100, z: 1000} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &470223356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 470223360} + - component: {fileID: 470223359} + - component: {fileID: 470223358} + - component: {fileID: 470223357} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &470223357 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470223356} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &470223358 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470223356} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &470223359 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470223356} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &470223360 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470223356} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 13.2, y: 1, z: 30.28} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &472872962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 472872964} + - component: {fileID: 472872963} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &472872963 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472872962} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &472872964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472872962} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1148358018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1148358022} + - component: {fileID: 1148358021} + - component: {fileID: 1148358020} + - component: {fileID: 1148358019} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1148358019 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148358018} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1148358020 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148358018} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1148358021 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148358018} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1148358022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148358018} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.85, y: 1, z: -6.81} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1191416068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1191416070} + - component: {fileID: 1191416069} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1191416069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191416068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 1 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f938231f926b7534399f18a1322653f6, type: 2} +--- !u!4 &1191416070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191416068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.5060086, y: 0.33582032, z: 0.57440275} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1292675908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1292675909} + - component: {fileID: 1292675910} + - component: {fileID: 1292675911} + - component: {fileID: 1292675912} + - component: {fileID: 1292675913} + - component: {fileID: 1292675914} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1292675909 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1468685579} + - {fileID: 1444606339} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1292675910 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 1, z: 0} +--- !u!114 &1292675911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a734b8e2d64ba604795fd5cef5d741f4, type: 3} + m_Name: + m_EditorClassIdentifier: + _movementSettings: {fileID: 11400000, guid: 0c168708f93291545b51df2eec8f4ac3, type: 2} + _inputHandler: {fileID: 1292675913} + _rigidbody: {fileID: 1292675914} +--- !u!114 &1292675912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1292675913} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Move + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5c440996-60ec-4084-9223-75d39638108a + m_ActionName: CoreMap/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1292675913} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Look + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: d271942b-8516-4550-88ae-552350feb4b1 + m_ActionName: CoreMap/Look[/Mouse/delta,/XInputControllerWindows/rightStick] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1292675913} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Jump + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: da936947-fcfa-4872-a4e3-15763afe56b6 + m_ActionName: CoreMap/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1292675913} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Use + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 2bbc2e93-6016-4544-8399-0c4ee222850c + m_ActionName: CoreMap/Use[/Keyboard/e,/XInputControllerWindows/buttonWest] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: PCMR + m_DefaultActionMap: CoreMap + m_SplitScreenIndex: -1 + m_Camera: {fileID: 1444606338} +--- !u!114 &1292675913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e12816fc78a8ca3429be019aa4e51fdd, type: 3} + m_Name: + m_EditorClassIdentifier: + _inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2} +--- !u!54 &1292675914 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1292675908} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!1 &1444606336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1444606339} + - component: {fileID: 1444606338} + - component: {fileID: 1444606337} + - component: {fileID: 1444606340} + m_Layer: 0 + m_Name: PlayerCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1444606337 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444606336} + m_Enabled: 1 +--- !u!20 &1444606338 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444606336} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 65 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1444606339 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444606336} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1292675909} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1444606340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444606336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 0 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!1 &1468685575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468685579} + - component: {fileID: 1468685578} + - component: {fileID: 1468685577} + m_Layer: 0 + m_Name: Graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1468685577 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468685575} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1b0f58118cf7a5a4e85fda00fe3de44b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1468685578 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468685575} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1468685579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468685575} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1292675909} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1551303224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551303228} + - component: {fileID: 1551303227} + - component: {fileID: 1551303226} + - component: {fileID: 1551303225} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1551303225 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551303224} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1551303226 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551303224} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1551303227 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551303224} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1551303228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551303224} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.51, y: 1, z: 13.7} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1908415559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1908415563} + - component: {fileID: 1908415562} + - component: {fileID: 1908415561} + - component: {fileID: 1908415560} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1908415560 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908415559} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1908415561 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908415559} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1908415562 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908415559} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1908415563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908415559} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 11.2, y: 1, z: 40.56} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scenes/Main.unity.meta b/game/Assets/Scenes/Main.unity.meta new file mode 100644 index 0000000..2c88323 --- /dev/null +++ b/game/Assets/Scenes/Main.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a196cd761cad044bbc47d356c58de5b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Demo.meta b/game/Assets/Scripts/Demo.meta new file mode 100644 index 0000000..7e828a4 --- /dev/null +++ b/game/Assets/Scripts/Demo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67b4f7424e080364c9ae7222f19afcbf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/SimpleCameraController.cs b/game/Assets/Scripts/Demo/SimpleCameraController.cs similarity index 97% rename from game/Assets/Scripts/SimpleCameraController.cs rename to game/Assets/Scripts/Demo/SimpleCameraController.cs index 50cd05d..f9e8f85 100644 --- a/game/Assets/Scripts/SimpleCameraController.cs +++ b/game/Assets/Scripts/Demo/SimpleCameraController.cs @@ -1,294 +1,294 @@ -#if ENABLE_INPUT_SYSTEM -using UnityEngine.InputSystem; -#endif - -using UnityEngine; - -namespace UnityTemplateProjects -{ - public class SimpleCameraController : MonoBehaviour - { - class CameraState - { - public float yaw; - public float pitch; - public float roll; - public float x; - public float y; - public float z; - - public void SetFromTransform(Transform t) - { - pitch = t.eulerAngles.x; - yaw = t.eulerAngles.y; - roll = t.eulerAngles.z; - x = t.position.x; - y = t.position.y; - z = t.position.z; - } - - public void Translate(Vector3 translation) - { - Vector3 rotatedTranslation = Quaternion.Euler(pitch, yaw, roll) * translation; - - x += rotatedTranslation.x; - y += rotatedTranslation.y; - z += rotatedTranslation.z; - } - - public void LerpTowards(CameraState target, float positionLerpPct, float rotationLerpPct) - { - yaw = Mathf.Lerp(yaw, target.yaw, rotationLerpPct); - pitch = Mathf.Lerp(pitch, target.pitch, rotationLerpPct); - roll = Mathf.Lerp(roll, target.roll, rotationLerpPct); - - x = Mathf.Lerp(x, target.x, positionLerpPct); - y = Mathf.Lerp(y, target.y, positionLerpPct); - z = Mathf.Lerp(z, target.z, positionLerpPct); - } - - public void UpdateTransform(Transform t) - { - t.eulerAngles = new Vector3(pitch, yaw, roll); - t.position = new Vector3(x, y, z); - } - } - - CameraState m_TargetCameraState = new CameraState(); - CameraState m_InterpolatingCameraState = new CameraState(); - - [Header("Movement Settings")] - [Tooltip("Exponential boost factor on translation, controllable by mouse wheel.")] - public float boost = 3.5f; - - [Tooltip("Time it takes to interpolate camera position 99% of the way to the target."), Range(0.001f, 1f)] - public float positionLerpTime = 0.2f; - - [Header("Rotation Settings")] - [Tooltip("X = Change in mouse position.\nY = Multiplicative factor for camera rotation.")] - public AnimationCurve mouseSensitivityCurve = new AnimationCurve(new Keyframe(0f, 0.5f, 0f, 5f), new Keyframe(1f, 2.5f, 0f, 0f)); - - [Tooltip("Time it takes to interpolate camera rotation 99% of the way to the target."), Range(0.001f, 1f)] - public float rotationLerpTime = 0.01f; - - [Tooltip("Whether or not to invert our Y axis for mouse input to rotation.")] - public bool invertY = false; - -#if ENABLE_INPUT_SYSTEM - InputAction movementAction; - InputAction verticalMovementAction; - InputAction lookAction; - InputAction boostFactorAction; - bool mouseRightButtonPressed; - - void Start() - { - var map = new InputActionMap("Simple Camera Controller"); - - lookAction = map.AddAction("look", binding: "/delta"); - movementAction = map.AddAction("move", binding: "/leftStick"); - verticalMovementAction = map.AddAction("Vertical Movement"); - boostFactorAction = map.AddAction("Boost Factor", binding: "/scroll"); - - lookAction.AddBinding("/rightStick").WithProcessor("scaleVector2(x=15, y=15)"); - movementAction.AddCompositeBinding("Dpad") - .With("Up", "/w") - .With("Up", "/upArrow") - .With("Down", "/s") - .With("Down", "/downArrow") - .With("Left", "/a") - .With("Left", "/leftArrow") - .With("Right", "/d") - .With("Right", "/rightArrow"); - verticalMovementAction.AddCompositeBinding("Dpad") - .With("Up", "/pageUp") - .With("Down", "/pageDown") - .With("Up", "/e") - .With("Down", "/q") - .With("Up", "/rightshoulder") - .With("Down", "/leftshoulder"); - boostFactorAction.AddBinding("/Dpad").WithProcessor("scaleVector2(x=1, y=4)"); - - movementAction.Enable(); - lookAction.Enable(); - verticalMovementAction.Enable(); - boostFactorAction.Enable(); - } -#endif - - void OnEnable() - { - m_TargetCameraState.SetFromTransform(transform); - m_InterpolatingCameraState.SetFromTransform(transform); - } - - Vector3 GetInputTranslationDirection() - { - Vector3 direction = Vector3.zero; -#if ENABLE_INPUT_SYSTEM - var moveDelta = movementAction.ReadValue(); - direction.x = moveDelta.x; - direction.z = moveDelta.y; - direction.y = verticalMovementAction.ReadValue().y; -#else - if (Input.GetKey(KeyCode.W)) - { - direction += Vector3.forward; - } - if (Input.GetKey(KeyCode.S)) - { - direction += Vector3.back; - } - if (Input.GetKey(KeyCode.A)) - { - direction += Vector3.left; - } - if (Input.GetKey(KeyCode.D)) - { - direction += Vector3.right; - } - if (Input.GetKey(KeyCode.Q)) - { - direction += Vector3.down; - } - if (Input.GetKey(KeyCode.E)) - { - direction += Vector3.up; - } -#endif - return direction; - } - - void Update() - { - // Exit Sample - - if (IsEscapePressed()) - { - Application.Quit(); - #if UNITY_EDITOR - UnityEditor.EditorApplication.isPlaying = false; - #endif - } - - // Hide and lock cursor when right mouse button pressed - if (IsRightMouseButtonDown()) - { - Cursor.lockState = CursorLockMode.Locked; - } - - // Unlock and show cursor when right mouse button released - if (IsRightMouseButtonUp()) - { - Cursor.visible = true; - Cursor.lockState = CursorLockMode.None; - } - - // Rotation - if (IsCameraRotationAllowed()) - { - var mouseMovement = GetInputLookRotation() * Time.deltaTime * 5; - if (invertY) - mouseMovement.y = -mouseMovement.y; - - var mouseSensitivityFactor = mouseSensitivityCurve.Evaluate(mouseMovement.magnitude); - - m_TargetCameraState.yaw += mouseMovement.x * mouseSensitivityFactor; - m_TargetCameraState.pitch += mouseMovement.y * mouseSensitivityFactor; - } - - // Translation - var translation = GetInputTranslationDirection() * Time.deltaTime; - - // Speed up movement when shift key held - if (IsBoostPressed()) - { - translation *= 10.0f; - } - - // Modify movement by a boost factor (defined in Inspector and modified in play mode through the mouse scroll wheel) - boost += GetBoostFactor(); - translation *= Mathf.Pow(2.0f, boost); - - m_TargetCameraState.Translate(translation); - - // Framerate-independent interpolation - // Calculate the lerp amount, such that we get 99% of the way to our target in the specified time - var positionLerpPct = 1f - Mathf.Exp((Mathf.Log(1f - 0.99f) / positionLerpTime) * Time.deltaTime); - var rotationLerpPct = 1f - Mathf.Exp((Mathf.Log(1f - 0.99f) / rotationLerpTime) * Time.deltaTime); - m_InterpolatingCameraState.LerpTowards(m_TargetCameraState, positionLerpPct, rotationLerpPct); - - m_InterpolatingCameraState.UpdateTransform(transform); - } - - float GetBoostFactor() - { -#if ENABLE_INPUT_SYSTEM - return boostFactorAction.ReadValue().y * 0.01f; -#else - return Input.mouseScrollDelta.y * 0.2f; -#endif - } - - Vector2 GetInputLookRotation() - { -#if ENABLE_INPUT_SYSTEM - return lookAction.ReadValue(); -#else - return new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y")) * 10; -#endif - } - - bool IsBoostPressed() - { -#if ENABLE_INPUT_SYSTEM - bool boost = Keyboard.current != null ? Keyboard.current.leftShiftKey.isPressed : false; - boost |= Gamepad.current != null ? Gamepad.current.xButton.isPressed : false; - return boost; -#else - return Input.GetKey(KeyCode.LeftShift); -#endif - - } - - bool IsEscapePressed() - { -#if ENABLE_INPUT_SYSTEM - return Keyboard.current != null ? Keyboard.current.escapeKey.isPressed : false; -#else - return Input.GetKey(KeyCode.Escape); -#endif - } - - bool IsCameraRotationAllowed() - { -#if ENABLE_INPUT_SYSTEM - bool canRotate = Mouse.current != null ? Mouse.current.rightButton.isPressed : false; - canRotate |= Gamepad.current != null ? Gamepad.current.rightStick.ReadValue().magnitude > 0 : false; - return canRotate; -#else - return Input.GetMouseButton(1); -#endif - } - - bool IsRightMouseButtonDown() - { -#if ENABLE_INPUT_SYSTEM - return Mouse.current != null ? Mouse.current.rightButton.isPressed : false; -#else - return Input.GetMouseButtonDown(1); -#endif - } - - bool IsRightMouseButtonUp() - { -#if ENABLE_INPUT_SYSTEM - return Mouse.current != null ? !Mouse.current.rightButton.isPressed : false; -#else - return Input.GetMouseButtonUp(1); -#endif - } - - } - +#if ENABLE_INPUT_SYSTEM +using UnityEngine.InputSystem; +#endif + +using UnityEngine; + +namespace UnityTemplateProjects +{ + public class SimpleCameraController : MonoBehaviour + { + class CameraState + { + public float yaw; + public float pitch; + public float roll; + public float x; + public float y; + public float z; + + public void SetFromTransform(Transform t) + { + pitch = t.eulerAngles.x; + yaw = t.eulerAngles.y; + roll = t.eulerAngles.z; + x = t.position.x; + y = t.position.y; + z = t.position.z; + } + + public void Translate(Vector3 translation) + { + Vector3 rotatedTranslation = Quaternion.Euler(pitch, yaw, roll) * translation; + + x += rotatedTranslation.x; + y += rotatedTranslation.y; + z += rotatedTranslation.z; + } + + public void LerpTowards(CameraState target, float positionLerpPct, float rotationLerpPct) + { + yaw = Mathf.Lerp(yaw, target.yaw, rotationLerpPct); + pitch = Mathf.Lerp(pitch, target.pitch, rotationLerpPct); + roll = Mathf.Lerp(roll, target.roll, rotationLerpPct); + + x = Mathf.Lerp(x, target.x, positionLerpPct); + y = Mathf.Lerp(y, target.y, positionLerpPct); + z = Mathf.Lerp(z, target.z, positionLerpPct); + } + + public void UpdateTransform(Transform t) + { + t.eulerAngles = new Vector3(pitch, yaw, roll); + t.position = new Vector3(x, y, z); + } + } + + CameraState m_TargetCameraState = new CameraState(); + CameraState m_InterpolatingCameraState = new CameraState(); + + [Header("Movement Settings")] + [Tooltip("Exponential boost factor on translation, controllable by mouse wheel.")] + public float boost = 3.5f; + + [Tooltip("Time it takes to interpolate camera position 99% of the way to the target."), Range(0.001f, 1f)] + public float positionLerpTime = 0.2f; + + [Header("Rotation Settings")] + [Tooltip("X = Change in mouse position.\nY = Multiplicative factor for camera rotation.")] + public AnimationCurve mouseSensitivityCurve = new AnimationCurve(new Keyframe(0f, 0.5f, 0f, 5f), new Keyframe(1f, 2.5f, 0f, 0f)); + + [Tooltip("Time it takes to interpolate camera rotation 99% of the way to the target."), Range(0.001f, 1f)] + public float rotationLerpTime = 0.01f; + + [Tooltip("Whether or not to invert our Y axis for mouse input to rotation.")] + public bool invertY = false; + +#if ENABLE_INPUT_SYSTEM + InputAction movementAction; + InputAction verticalMovementAction; + InputAction lookAction; + InputAction boostFactorAction; + bool mouseRightButtonPressed; + + void Start() + { + var map = new InputActionMap("Simple Camera Controller"); + + lookAction = map.AddAction("look", binding: "/delta"); + movementAction = map.AddAction("move", binding: "/leftStick"); + verticalMovementAction = map.AddAction("Vertical Movement"); + boostFactorAction = map.AddAction("Boost Factor", binding: "/scroll"); + + lookAction.AddBinding("/rightStick").WithProcessor("scaleVector2(x=15, y=15)"); + movementAction.AddCompositeBinding("Dpad") + .With("Up", "/w") + .With("Up", "/upArrow") + .With("Down", "/s") + .With("Down", "/downArrow") + .With("Left", "/a") + .With("Left", "/leftArrow") + .With("Right", "/d") + .With("Right", "/rightArrow"); + verticalMovementAction.AddCompositeBinding("Dpad") + .With("Up", "/pageUp") + .With("Down", "/pageDown") + .With("Up", "/e") + .With("Down", "/q") + .With("Up", "/rightshoulder") + .With("Down", "/leftshoulder"); + boostFactorAction.AddBinding("/Dpad").WithProcessor("scaleVector2(x=1, y=4)"); + + movementAction.Enable(); + lookAction.Enable(); + verticalMovementAction.Enable(); + boostFactorAction.Enable(); + } +#endif + + void OnEnable() + { + m_TargetCameraState.SetFromTransform(transform); + m_InterpolatingCameraState.SetFromTransform(transform); + } + + Vector3 GetInputTranslationDirection() + { + Vector3 direction = Vector3.zero; +#if ENABLE_INPUT_SYSTEM + var moveDelta = movementAction.ReadValue(); + direction.x = moveDelta.x; + direction.z = moveDelta.y; + direction.y = verticalMovementAction.ReadValue().y; +#else + if (Input.GetKey(KeyCode.W)) + { + direction += Vector3.forward; + } + if (Input.GetKey(KeyCode.S)) + { + direction += Vector3.back; + } + if (Input.GetKey(KeyCode.A)) + { + direction += Vector3.left; + } + if (Input.GetKey(KeyCode.D)) + { + direction += Vector3.right; + } + if (Input.GetKey(KeyCode.Q)) + { + direction += Vector3.down; + } + if (Input.GetKey(KeyCode.E)) + { + direction += Vector3.up; + } +#endif + return direction; + } + + void Update() + { + // Exit Sample + + if (IsEscapePressed()) + { + Application.Quit(); + #if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; + #endif + } + + // Hide and lock cursor when right mouse button pressed + if (IsRightMouseButtonDown()) + { + Cursor.lockState = CursorLockMode.Locked; + } + + // Unlock and show cursor when right mouse button released + if (IsRightMouseButtonUp()) + { + Cursor.visible = true; + Cursor.lockState = CursorLockMode.None; + } + + // Rotation + if (IsCameraRotationAllowed()) + { + var mouseMovement = GetInputLookRotation() * Time.deltaTime * 5; + if (invertY) + mouseMovement.y = -mouseMovement.y; + + var mouseSensitivityFactor = mouseSensitivityCurve.Evaluate(mouseMovement.magnitude); + + m_TargetCameraState.yaw += mouseMovement.x * mouseSensitivityFactor; + m_TargetCameraState.pitch += mouseMovement.y * mouseSensitivityFactor; + } + + // Translation + var translation = GetInputTranslationDirection() * Time.deltaTime; + + // Speed up movement when shift key held + if (IsBoostPressed()) + { + translation *= 10.0f; + } + + // Modify movement by a boost factor (defined in Inspector and modified in play mode through the mouse scroll wheel) + boost += GetBoostFactor(); + translation *= Mathf.Pow(2.0f, boost); + + m_TargetCameraState.Translate(translation); + + // Framerate-independent interpolation + // Calculate the lerp amount, such that we get 99% of the way to our target in the specified time + var positionLerpPct = 1f - Mathf.Exp((Mathf.Log(1f - 0.99f) / positionLerpTime) * Time.deltaTime); + var rotationLerpPct = 1f - Mathf.Exp((Mathf.Log(1f - 0.99f) / rotationLerpTime) * Time.deltaTime); + m_InterpolatingCameraState.LerpTowards(m_TargetCameraState, positionLerpPct, rotationLerpPct); + + m_InterpolatingCameraState.UpdateTransform(transform); + } + + float GetBoostFactor() + { +#if ENABLE_INPUT_SYSTEM + return boostFactorAction.ReadValue().y * 0.01f; +#else + return Input.mouseScrollDelta.y * 0.2f; +#endif + } + + Vector2 GetInputLookRotation() + { +#if ENABLE_INPUT_SYSTEM + return lookAction.ReadValue(); +#else + return new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y")) * 10; +#endif + } + + bool IsBoostPressed() + { +#if ENABLE_INPUT_SYSTEM + bool boost = Keyboard.current != null ? Keyboard.current.leftShiftKey.isPressed : false; + boost |= Gamepad.current != null ? Gamepad.current.xButton.isPressed : false; + return boost; +#else + return Input.GetKey(KeyCode.LeftShift); +#endif + + } + + bool IsEscapePressed() + { +#if ENABLE_INPUT_SYSTEM + return Keyboard.current != null ? Keyboard.current.escapeKey.isPressed : false; +#else + return Input.GetKey(KeyCode.Escape); +#endif + } + + bool IsCameraRotationAllowed() + { +#if ENABLE_INPUT_SYSTEM + bool canRotate = Mouse.current != null ? Mouse.current.rightButton.isPressed : false; + canRotate |= Gamepad.current != null ? Gamepad.current.rightStick.ReadValue().magnitude > 0 : false; + return canRotate; +#else + return Input.GetMouseButton(1); +#endif + } + + bool IsRightMouseButtonDown() + { +#if ENABLE_INPUT_SYSTEM + return Mouse.current != null ? Mouse.current.rightButton.isPressed : false; +#else + return Input.GetMouseButtonDown(1); +#endif + } + + bool IsRightMouseButtonUp() + { +#if ENABLE_INPUT_SYSTEM + return Mouse.current != null ? !Mouse.current.rightButton.isPressed : false; +#else + return Input.GetMouseButtonUp(1); +#endif + } + + } + } \ No newline at end of file diff --git a/game/Assets/Scripts/SimpleCameraController.cs.meta b/game/Assets/Scripts/Demo/SimpleCameraController.cs.meta similarity index 95% rename from game/Assets/Scripts/SimpleCameraController.cs.meta rename to game/Assets/Scripts/Demo/SimpleCameraController.cs.meta index ead50d2..5bb6da8 100644 --- a/game/Assets/Scripts/SimpleCameraController.cs.meta +++ b/game/Assets/Scripts/Demo/SimpleCameraController.cs.meta @@ -1,11 +1,11 @@ -fileFormatVersion: 2 -guid: be76e5f14cfee674cb30b491fb72b09b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: be76e5f14cfee674cb30b491fb72b09b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Input.meta b/game/Assets/Scripts/Input.meta new file mode 100644 index 0000000..a5470f7 --- /dev/null +++ b/game/Assets/Scripts/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05e78a0fdff542f4db47377d1e84654d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Input/BufferedInput.cs b/game/Assets/Scripts/Input/BufferedInput.cs new file mode 100644 index 0000000..14b4d76 --- /dev/null +++ b/game/Assets/Scripts/Input/BufferedInput.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public struct BufferedInput +{ + public BufferedInput( float bufferTime ) + { + _bufferTime = bufferTime; + _value = false; + _timeSincePress = 0f; + _timeSinceRelease = 0f; + } + + private float _bufferTime; + private bool _value; + private float _timeSinceRelease; + private float _timeSincePress; + + public void Set( bool newValue ) + { + if ( newValue && !_value ) + { + _timeSincePress = 0f; + _timeSinceRelease = 0f; + } + + _value = newValue; + } + + public void Update( float deltaTime ) + { + if ( !_value ) + { + _timeSinceRelease += deltaTime; + } + + _timeSincePress += deltaTime; + } + + public bool GetValue() + { + return _value || _timeSinceRelease <= _bufferTime; + } + + public bool GetDown() + { + return _value && _timeSincePress <= _bufferTime; + } + + public bool GetRelease() + { + return !_value && _timeSinceRelease < _bufferTime; + } +} diff --git a/game/Assets/Scripts/Input/BufferedInput.cs.meta b/game/Assets/Scripts/Input/BufferedInput.cs.meta new file mode 100644 index 0000000..1775ba2 --- /dev/null +++ b/game/Assets/Scripts/Input/BufferedInput.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 150cbba5fa3fdad4881b0b0e6b4cb1a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player.meta b/game/Assets/Scripts/Player.meta new file mode 100644 index 0000000..72428fd --- /dev/null +++ b/game/Assets/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61768ae5c659c7d47a9acdea3204233e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerController.cs b/game/Assets/Scripts/Player/PlayerController.cs new file mode 100644 index 0000000..0a36bac --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerController.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + [SerializeField] + private PlayerMovementSettings _movementSettings; + + [SerializeField] + private PlayerInputHandler _inputHandler; + + [SerializeField] + private Rigidbody _rigidbody; + + private void Start() + { + } + + private void FixedUpdate() + { + Vector2 moveVector2 = _inputHandler.InputState.Move; + Vector3 moveVector = new Vector3( moveVector2.x, 0f, moveVector2.y ); + + _rigidbody.velocity = moveVector * _movementSettings.BaseMovementSpeed; + } +} \ No newline at end of file diff --git a/game/Assets/Scripts/Player/PlayerController.cs.meta b/game/Assets/Scripts/Player/PlayerController.cs.meta new file mode 100644 index 0000000..15015cc --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a734b8e2d64ba604795fd5cef5d741f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerInputHandler.cs b/game/Assets/Scripts/Player/PlayerInputHandler.cs new file mode 100644 index 0000000..7f53f03 --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerInputHandler.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerInputHandler : MonoBehaviour +{ + [SerializeField] + private PlayerInputSettings _inputSettings; + + public struct PlayerInputState + { + public BufferedInput Jump; + public BufferedInput Use; + public Vector2 Move; + public Vector2 Look; + } + + public PlayerInputState InputState => _state; + + private PlayerInputState _state; + + private void Awake() + { + _state = new PlayerInputState(); + + _state.Jump = new BufferedInput( _inputSettings.JumpBufferTime ); + _state.Use = new BufferedInput( _inputSettings.UseBufferTime ); + _state.Look = Vector2.zero; + _state.Move = Vector2.zero; + } + + private void FixedUpdate() + { + float deltaTime = Time.fixedDeltaTime; + + _state.Jump.Update( deltaTime ); + _state.Use.Update( deltaTime ); + } + + public void Look( InputAction.CallbackContext context ) + => _state.Look = context.ReadValue(); + + public void Move( InputAction.CallbackContext context ) + => _state.Move = context.ReadValue(); + + public void Jump( InputAction.CallbackContext context ) + => _state.Jump.Set( context.ReadValue() > 0.5f ); + + public void Use( InputAction.CallbackContext context ) + => _state.Use.Set( context.ReadValue() > 0.5f ); +} \ No newline at end of file diff --git a/game/Assets/Scripts/Player/PlayerInputHandler.cs.meta b/game/Assets/Scripts/Player/PlayerInputHandler.cs.meta new file mode 100644 index 0000000..85f2b33 --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerInputHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e12816fc78a8ca3429be019aa4e51fdd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerInputSettings.cs b/game/Assets/Scripts/Player/PlayerInputSettings.cs new file mode 100644 index 0000000..6fc9b0c --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerInputSettings.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "PlayerInputSettings.asset", menuName = "KernelPanic/Player/InputSettings")] +public class PlayerInputSettings : ScriptableObject +{ + public float JumpBufferTime; + public float UseBufferTime; +} diff --git a/game/Assets/Scripts/Player/PlayerInputSettings.cs.meta b/game/Assets/Scripts/Player/PlayerInputSettings.cs.meta new file mode 100644 index 0000000..9c08710 --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerInputSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5757917e8ea41b845b309988926a0617 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerMovementSettings.cs b/game/Assets/Scripts/Player/PlayerMovementSettings.cs new file mode 100644 index 0000000..9b82316 --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerMovementSettings.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "PlayerMovementSettings.asset", menuName = "KernelPanic/Player/MovementSettings")] +public class PlayerMovementSettings : ScriptableObject +{ + public float BaseMovementSpeed; +} diff --git a/game/Assets/Scripts/Player/PlayerMovementSettings.cs.meta b/game/Assets/Scripts/Player/PlayerMovementSettings.cs.meta new file mode 100644 index 0000000..a10a531 --- /dev/null +++ b/game/Assets/Scripts/Player/PlayerMovementSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1cbb1d5d2a7715478647c26d4e71482 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/Input.meta b/game/Assets/Settings/Input.meta new file mode 100644 index 0000000..1c8f030 --- /dev/null +++ b/game/Assets/Settings/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2fa6897badb643046892a535b221dead +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/Input/PlayerControls.inputactions b/game/Assets/Settings/Input/PlayerControls.inputactions new file mode 100644 index 0000000..97a35ab --- /dev/null +++ b/game/Assets/Settings/Input/PlayerControls.inputactions @@ -0,0 +1,206 @@ +{ + "name": "PlayerControls", + "maps": [ + { + "name": "CoreMap", + "id": "42a3f7fb-1c95-4d1b-a244-297b0a9195ef", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "5c440996-60ec-4084-9223-75d39638108a", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Look", + "type": "Value", + "id": "d271942b-8516-4550-88ae-552350feb4b1", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "" + }, + { + "name": "Jump", + "type": "Value", + "id": "da936947-fcfa-4872-a4e3-15763afe56b6", + "expectedControlType": "DiscreteButton", + "processors": "", + "interactions": "" + }, + { + "name": "Use", + "type": "Value", + "id": "2bbc2e93-6016-4544-8399-0c4ee222850c", + "expectedControlType": "DiscreteButton", + "processors": "", + "interactions": "" + } + ], + "bindings": [ + { + "name": "KeyboardMove", + "id": "be9a8486-2392-4955-bdbb-8d9392d52eda", + "path": "2DVector(mode=2)", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "9ab4e365-53d5-488b-a762-997f31476ee8", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "fc473886-b8de-48da-b5fe-c189ac4063b7", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "867af1d3-576e-4103-9ec8-b676f4970b2b", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "500e2146-e309-49eb-a17a-7759b6af5c88", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "d8aa3495-2566-46dc-89ac-906e77c69ad4", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f11a0fcc-85b6-41ab-adbb-e9630b5bfdaa", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b1c6671d-cac0-4eb4-9874-f2fcc380b5ee", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a458ce5f-be36-4ca6-b6d3-d61fae0707c0", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "81b1acaa-c43e-4c1e-ab4a-55f9ad0abf8f", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1763237d-c8ae-435b-a495-5fc64619949c", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "PCMR", + "action": "Use", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "df62c15c-393b-40c5-ae41-2ad642173d2e", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Use", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "PCMR", + "bindingGroup": "PCMR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/game/Assets/Settings/Input/PlayerControls.inputactions.meta b/game/Assets/Settings/Input/PlayerControls.inputactions.meta new file mode 100644 index 0000000..cdbc40e --- /dev/null +++ b/game/Assets/Settings/Input/PlayerControls.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: d4d9eb5db7beac84ca3cb36cfc09cd0a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/game/Assets/Settings/Player.meta b/game/Assets/Settings/Player.meta new file mode 100644 index 0000000..bd159f1 --- /dev/null +++ b/game/Assets/Settings/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c14f0e2df54bd5469ef560e61303427 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/Player/PlayerInputSettings.asset b/game/Assets/Settings/Player/PlayerInputSettings.asset new file mode 100644 index 0000000..471f168 --- /dev/null +++ b/game/Assets/Settings/Player/PlayerInputSettings.asset @@ -0,0 +1,16 @@ +%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: 5757917e8ea41b845b309988926a0617, type: 3} + m_Name: PlayerInputSettings + m_EditorClassIdentifier: + JumpBufferTime: 0 + UseBufferTime: 0 diff --git a/game/Assets/Settings/Player/PlayerInputSettings.asset.meta b/game/Assets/Settings/Player/PlayerInputSettings.asset.meta new file mode 100644 index 0000000..141db9e --- /dev/null +++ b/game/Assets/Settings/Player/PlayerInputSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09b165d6ce14f86459be7213da9688a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/Player/PlayerMovementSettings.asset b/game/Assets/Settings/Player/PlayerMovementSettings.asset new file mode 100644 index 0000000..420b743 --- /dev/null +++ b/game/Assets/Settings/Player/PlayerMovementSettings.asset @@ -0,0 +1,15 @@ +%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: f1cbb1d5d2a7715478647c26d4e71482, type: 3} + m_Name: PlayerMovementSettings + m_EditorClassIdentifier: + BaseMovementSpeed: 10 diff --git a/game/Assets/Settings/Player/PlayerMovementSettings.asset.meta b/game/Assets/Settings/Player/PlayerMovementSettings.asset.meta new file mode 100644 index 0000000..4e98806 --- /dev/null +++ b/game/Assets/Settings/Player/PlayerMovementSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c168708f93291545b51df2eec8f4ac3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/Rendering.meta b/game/Assets/Settings/Rendering.meta new file mode 100644 index 0000000..6868c17 --- /dev/null +++ b/game/Assets/Settings/Rendering.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7062e07ae0d3c7540bf69ed474b8c2df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/ForwardRenderer.asset b/game/Assets/Settings/Rendering/ForwardRenderer.asset similarity index 100% rename from game/Assets/Settings/ForwardRenderer.asset rename to game/Assets/Settings/Rendering/ForwardRenderer.asset diff --git a/game/Assets/Settings/ForwardRenderer.asset.meta b/game/Assets/Settings/Rendering/ForwardRenderer.asset.meta similarity index 95% rename from game/Assets/Settings/ForwardRenderer.asset.meta rename to game/Assets/Settings/Rendering/ForwardRenderer.asset.meta index 84b996d..06d9cab 100644 --- a/game/Assets/Settings/ForwardRenderer.asset.meta +++ b/game/Assets/Settings/Rendering/ForwardRenderer.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 4a8e21d5c33334b11b34a596161b9360 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 4a8e21d5c33334b11b34a596161b9360 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/SampleSceneProfile.asset b/game/Assets/Settings/Rendering/SampleSceneProfile.asset similarity index 95% rename from game/Assets/Settings/SampleSceneProfile.asset rename to game/Assets/Settings/Rendering/SampleSceneProfile.asset index f30ee1c..cbc629b 100644 --- a/game/Assets/Settings/SampleSceneProfile.asset +++ b/game/Assets/Settings/Rendering/SampleSceneProfile.asset @@ -1,118 +1,118 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7893295128165547882 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} - m_Name: Bloom - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - threshold: - m_OverrideState: 1 - m_Value: 1 - min: 0 - intensity: - m_OverrideState: 1 - m_Value: 1 - min: 0 - scatter: - m_OverrideState: 0 - m_Value: 0.7 - min: 0 - max: 1 - clamp: - m_OverrideState: 0 - m_Value: 65472 - min: 0 - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - highQualityFiltering: - m_OverrideState: 0 - m_Value: 0 - dirtTexture: - m_OverrideState: 0 - m_Value: {fileID: 0} - dirtIntensity: - m_OverrideState: 0 - m_Value: 0 - min: 0 ---- !u!114 &-7011558710299706105 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 899c54efeace73346a0a16faa3afe726, type: 3} - m_Name: Vignette - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - color: - m_OverrideState: 0 - m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - center: - m_OverrideState: 0 - m_Value: {x: 0.5, y: 0.5} - intensity: - m_OverrideState: 1 - m_Value: 0.25 - min: 0 - max: 1 - smoothness: - m_OverrideState: 1 - m_Value: 0.4 - min: 0.01 - max: 1 - rounded: - m_OverrideState: 0 - m_Value: 0 ---- !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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: SampleSceneProfile - m_EditorClassIdentifier: - components: - - {fileID: 849379129802519247} - - {fileID: -7893295128165547882} - - {fileID: -7011558710299706105} ---- !u!114 &849379129802519247 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} - m_Name: Tonemapping - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - mode: - m_OverrideState: 1 - m_Value: 2 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7893295128165547882 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + threshold: + m_OverrideState: 1 + m_Value: 1 + min: 0 + intensity: + m_OverrideState: 1 + m_Value: 1 + min: 0 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + min: 0 + max: 1 + clamp: + m_OverrideState: 0 + m_Value: 65472 + min: 0 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 + min: 0 +--- !u!114 &-7011558710299706105 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + color: + m_OverrideState: 0 + m_Value: {r: 0, g: 0, b: 0, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + center: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.25 + min: 0 + max: 1 + smoothness: + m_OverrideState: 1 + m_Value: 0.4 + min: 0.01 + max: 1 + rounded: + m_OverrideState: 0 + m_Value: 0 +--- !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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: SampleSceneProfile + m_EditorClassIdentifier: + components: + - {fileID: 849379129802519247} + - {fileID: -7893295128165547882} + - {fileID: -7011558710299706105} +--- !u!114 &849379129802519247 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 2 diff --git a/game/Assets/Settings/SampleSceneProfile.asset.meta b/game/Assets/Settings/Rendering/SampleSceneProfile.asset.meta similarity index 95% rename from game/Assets/Settings/SampleSceneProfile.asset.meta rename to game/Assets/Settings/Rendering/SampleSceneProfile.asset.meta index 4c024c4..b82270c 100644 --- a/game/Assets/Settings/SampleSceneProfile.asset.meta +++ b/game/Assets/Settings/Rendering/SampleSceneProfile.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 10fc4df2da32a41aaa32d77bc913491c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 10fc4df2da32a41aaa32d77bc913491c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/UniversalRP-HighQuality.asset b/game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset similarity index 96% rename from game/Assets/Settings/UniversalRP-HighQuality.asset rename to game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset index ab8107a..2ac23c8 100644 --- a/game/Assets/Settings/UniversalRP-HighQuality.asset +++ b/game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset @@ -1,53 +1,53 @@ -%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: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: UniversalRP-HighQuality - m_EditorClassIdentifier: - k_AssetVersion: 5 - k_AssetPreviousVersion: 5 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsHDR: 1 - m_MSAA: 2 - m_RenderScale: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 4 - m_AdditionalLightShadowsSupported: 1 - m_AdditionalLightsShadowmapResolution: 512 - m_ShadowDistance: 50 - m_ShadowCascades: 1 - m_Cascade2Split: 0.25 - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_SoftShadowsSupported: 1 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_DebugLevel: 0 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 +%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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: UniversalRP-HighQuality + m_EditorClassIdentifier: + k_AssetVersion: 5 + k_AssetPreviousVersion: 5 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsHDR: 1 + m_MSAA: 2 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 1 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascades: 1 + m_Cascade2Split: 0.25 + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 1 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_DebugLevel: 0 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 diff --git a/game/Assets/Settings/UniversalRP-HighQuality.asset.meta b/game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset.meta similarity index 95% rename from game/Assets/Settings/UniversalRP-HighQuality.asset.meta rename to game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset.meta index 00e9380..c8fa317 100644 --- a/game/Assets/Settings/UniversalRP-HighQuality.asset.meta +++ b/game/Assets/Settings/Rendering/UniversalRP-HighQuality.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 19ba41d7c0026c3459d37c2fe90c55a0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 19ba41d7c0026c3459d37c2fe90c55a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/UniversalRP-LowQuality.asset b/game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset similarity index 96% rename from game/Assets/Settings/UniversalRP-LowQuality.asset rename to game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset index 5548f7e..ab81d03 100644 --- a/game/Assets/Settings/UniversalRP-LowQuality.asset +++ b/game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset @@ -1,53 +1,53 @@ -%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: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: UniversalRP-LowQuality - m_EditorClassIdentifier: - k_AssetVersion: 5 - k_AssetPreviousVersion: 5 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsHDR: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 0 - m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 0 - m_AdditionalLightsPerObjectLimit: 4 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_ShadowDistance: 50 - m_ShadowCascades: 0 - m_Cascade2Split: 0.25 - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_SoftShadowsSupported: 0 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_DebugLevel: 0 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 16 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 +%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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: UniversalRP-LowQuality + m_EditorClassIdentifier: + k_AssetVersion: 5 + k_AssetPreviousVersion: 5 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsHDR: 0 + m_MSAA: 1 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 0 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 0 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascades: 0 + m_Cascade2Split: 0.25 + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_DebugLevel: 0 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 16 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 diff --git a/game/Assets/Settings/UniversalRP-LowQuality.asset.meta b/game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset.meta similarity index 95% rename from game/Assets/Settings/UniversalRP-LowQuality.asset.meta rename to game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset.meta index b5f7a7d..040da39 100644 --- a/game/Assets/Settings/UniversalRP-LowQuality.asset.meta +++ b/game/Assets/Settings/Rendering/UniversalRP-LowQuality.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: a31e9f9f9c9d4b9429ed0d1234e22103 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a31e9f9f9c9d4b9429ed0d1234e22103 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Settings/UniversalRP-MediumQuality.asset b/game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset similarity index 96% rename from game/Assets/Settings/UniversalRP-MediumQuality.asset rename to game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset index 684e17c..23de11b 100644 --- a/game/Assets/Settings/UniversalRP-MediumQuality.asset +++ b/game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset @@ -1,53 +1,53 @@ -%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: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: UniversalRP-MediumQuality - m_EditorClassIdentifier: - k_AssetVersion: 5 - k_AssetPreviousVersion: 5 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsHDR: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 4 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_ShadowDistance: 50 - m_ShadowCascades: 0 - m_Cascade2Split: 0.25 - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_SoftShadowsSupported: 0 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_DebugLevel: 0 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 +%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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: UniversalRP-MediumQuality + m_EditorClassIdentifier: + k_AssetVersion: 5 + k_AssetPreviousVersion: 5 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsHDR: 0 + m_MSAA: 1 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascades: 0 + m_Cascade2Split: 0.25 + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_DebugLevel: 0 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 diff --git a/game/Assets/Settings/UniversalRP-MediumQuality.asset.meta b/game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset.meta similarity index 95% rename from game/Assets/Settings/UniversalRP-MediumQuality.asset.meta rename to game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset.meta index f0bd10e..d8477b7 100644 --- a/game/Assets/Settings/UniversalRP-MediumQuality.asset.meta +++ b/game/Assets/Settings/Rendering/UniversalRP-MediumQuality.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: d847b876476d3d6468f5dfcd34266f96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: d847b876476d3d6468f5dfcd34266f96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/TextMesh Pro/Resources/TMP Settings.asset b/game/Assets/TextMesh Pro/Resources/TMP Settings.asset index 1c26063..3894617 100644 --- a/game/Assets/TextMesh Pro/Resources/TMP Settings.asset +++ b/game/Assets/TextMesh Pro/Resources/TMP Settings.asset @@ -29,18 +29,16 @@ MonoBehaviour: m_defaultTextMeshProTextContainerSize: {x: 20, y: 5} m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50} m_autoSizeTextContainer: 0 + m_IsTextObjectScaleStatic: 0 m_fallbackFontAssets: [] m_matchMaterialPreset: 1 - m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, - type: 2} + m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2} m_defaultSpriteAssetPath: Sprite Assets/ m_enableEmojiSupport: 1 m_MissingCharacterSpriteUnicode: 0 m_defaultColorGradientPresetsPath: Color Gradient Presets/ - m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, - type: 2} + m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2} m_StyleSheetsResourcePath: m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3} - m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, - type: 3} + m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3} m_UseModernHangulLineBreakingRules: 0 diff --git a/game/ProjectSettings/EditorBuildSettings.asset b/game/ProjectSettings/EditorBuildSettings.asset index 1b0bb70..b139f27 100644 --- a/game/ProjectSettings/EditorBuildSettings.asset +++ b/game/ProjectSettings/EditorBuildSettings.asset @@ -1,11 +1,12 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1045 &1 -EditorBuildSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Scenes: - - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: d1c3109bdb54ad54c8a2b2838528e640 - m_configObjects: {} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1045 &1 +EditorBuildSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Scenes: + - enabled: 1 + path: Assets/Scenes/SampleScene.unity + guid: d1c3109bdb54ad54c8a2b2838528e640 + m_configObjects: + com.unity.input.settings: {fileID: 11400000, guid: 87faf39b6f22e524984c1680a88045ac, type: 2} diff --git a/game/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/game/ProjectSettings/Packages/com.unity.probuilder/Settings.json index c731349..08dda9c 100644 --- a/game/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/game/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -27,6 +27,131 @@ "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "preferences.version", "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":4,\"m_Patch\":0,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "lightmapping.autoUnwrapLightmapUV", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.showEditorNotifications", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.showSceneInfo", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.stripProBuilderScriptsOnBuild", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.autoRecalculateCollisions", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mesh.meshColliderIsConvex", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mesh.newShapesSnapToGrid", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.toolbarIconGUI", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.closeWindowAfterShapeCreation", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "UnityEngine.ProBuilder.ProBuilderEditor-isUtilityWindow", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.backFaceSelectEnabled", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "smoothing.showPreview", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "smoothing.showNormals", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "smoothing.showSettings", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "smoothing.showHelp", + "value": "{\"m_Value\":false}" + }, + { + "type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "lightmapping.defaultLightmapUnwrapParameters", + "value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "uv.uvEditorGridSnapIncrement", + "value": "{\"m_Value\":0.125}" + }, + { + "type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.userMaterial", + "value": "{\"m_Value\":{\"instanceID\":0}}" + }, + { + "type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.defaultStaticEditorFlags", + "value": "{\"m_Value\":0}" + }, + { + "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.newShapePivotLocation", + "value": "{\"m_Value\":1}" + }, + { + "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.shadowCastingMode", + "value": "{\"m_Value\":1}" + }, + { + "type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "mesh.newShapeColliderType", + "value": "{\"m_Value\":2}" + }, + { + "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.rectSelectModifier", + "value": "{\"m_Value\":2}" + }, + { + "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.dragSelectRectMode", + "value": "{\"m_Value\":0}" + }, + { + "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.selectMode", + "value": "{\"m_Value\":8}" } ] } diff --git a/game/ProjectSettings/ProjectSettings.asset b/game/ProjectSettings/ProjectSettings.asset index 6ada3d0..433e7b9 100644 --- a/game/ProjectSettings/ProjectSettings.asset +++ b/game/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: kernel panic! productName: game defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -145,7 +145,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.kernelpanic.game buildNumber: Standalone: 0 iPhone: 0 @@ -602,8 +603,8 @@ PlayerSettings: Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_Lightweight - metroPackageVersion: + metroPackageName: TemplateLightweight + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -611,7 +612,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Template_Lightweight wsaImages: {} - metroTileShortName: + metroTileShortName: game metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 diff --git a/game/ProjectSettings/TimeManager.asset b/game/ProjectSettings/TimeManager.asset index b816de4..9f73899 100644 --- a/game/ProjectSettings/TimeManager.asset +++ b/game/ProjectSettings/TimeManager.asset @@ -1,9 +1,9 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!5 &1 -TimeManager: - m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 - Maximum Allowed Timestep: 0.1 - m_TimeScale: 1 - Maximum Particle Timestep: 0.03 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!5 &1 +TimeManager: + m_ObjectHideFlags: 0 + Fixed Timestep: 0.005 + Maximum Allowed Timestep: 0.1 + m_TimeScale: 1 + Maximum Particle Timestep: 0.03 diff --git a/game/UserSettings/EditorUserSettings.asset b/game/UserSettings/EditorUserSettings.asset index b543455..9287014 100644 --- a/game/UserSettings/EditorUserSettings.asset +++ b/game/UserSettings/EditorUserSettings.asset @@ -8,6 +8,9 @@ EditorUserSettings: RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 + RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c72111f19563f22213229 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0