From 5d7bce3ee4a4132ec873e9d5b79917974a039cd4 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:32:10 -0800 Subject: [PATCH 01/16] Installed new Input system --- Packages/manifest.json | 16 +- Packages/packages-lock.json | 74 +- ProjectSettings/MemorySettings.asset | 35 + ProjectSettings/PackageManagerSettings.asset | 23 +- ProjectSettings/ProjectSettings.asset | 254 +++- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/TimelineSettings.asset | 16 + ProjectSettings/VersionControlSettings.asset | 8 + ProjectSettings/boot.config | 0 UserSettings/EditorUserSettings.asset | 25 + UserSettings/Layouts/default-2021.dwlt | 1180 ++++++++++++++++++ UserSettings/Search.settings | 1 + 12 files changed, 1562 insertions(+), 74 deletions(-) create mode 100644 ProjectSettings/MemorySettings.asset create mode 100644 ProjectSettings/TimelineSettings.asset create mode 100644 ProjectSettings/VersionControlSettings.asset create mode 100644 ProjectSettings/boot.config create mode 100644 UserSettings/EditorUserSettings.asset create mode 100644 UserSettings/Layouts/default-2021.dwlt create mode 100644 UserSettings/Search.settings diff --git a/Packages/manifest.json b/Packages/manifest.json index 1907c4c..d5e7a1c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,14 @@ { "dependencies": { - "com.unity.cinemachine": "2.5.0", - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.3", - "com.unity.test-framework": "1.1.20", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.14", + "com.unity.cinemachine": "2.8.0", + "com.unity.collab-proxy": "1.13.5", + "com.unity.ide.rider": "3.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.4", + "com.unity.inputsystem": "1.1.1", + "com.unity.test-framework": "1.1.29", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.2", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7549b5f..c0f5566 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,17 +1,20 @@ { "dependencies": { "com.unity.cinemachine": { - "version": "2.5.0", + "version": "2.8.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.2.16", + "version": "1.13.5", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0", + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -22,23 +25,57 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" }, "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.1.20", + "version": "1.1.29", "depth": 0, "source": "registry", "dependencies": { @@ -49,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.0.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -58,10 +95,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.14", + "version": "1.6.2", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -206,6 +248,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index ca9e773..b2a928b 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -9,10 +9,14 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -20,19 +24,12 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 + m_Capabilities: 7 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -848 + m_OriginalInstanceId: -850 + m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de58e85..bbe26bb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 23 productGUID: 663f495c0fa08094481ee3c64a25b48e AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -111,8 +119,15 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -127,31 +142,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -162,10 +152,15 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Standalone: com.DefaultCompany.AircraftPhysics + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -180,10 +175,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -217,15 +212,17 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -235,10 +232,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -255,10 +261,148 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: tvOS + m_Icons: + - m_Textures: [] + m_Width: 1280 + m_Height: 768 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 800 + m_Height: 480 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 400 + m_Height: 240 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 4640 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 2320 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 3840 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 1920 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -310,13 +454,13 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 @@ -336,6 +480,8 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -345,12 +491,16 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -368,6 +518,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -383,6 +534,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -398,6 +550,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -413,6 +566,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -475,6 +629,11 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -501,6 +660,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -543,6 +703,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -562,19 +724,25 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -624,6 +792,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -632,10 +801,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -650,11 +816,15 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 1 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 + virtualTexturingSupportEnabled: 0 + uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d8ee6b5..94c4a99 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.18f1 -m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880) +m_EditorVersion: 2021.2.1f1 +m_EditorVersionWithRevision: 2021.2.1f1 (c20c6d589440) diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..cfaebd7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 0000000..65778f8 --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 2 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1 + m_ArtifactGarbageCollection: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt new file mode 100644 index 0000000..ac2bafd --- /dev/null +++ b/UserSettings/Layouts/default-2021.dwlt @@ -0,0 +1,1180 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 838 + y: 382 + width: 800 + height: 573 + m_ShowMode: 0 + m_Title: Package Manager + m_RootView: {fileID: 5} + m_MinSize: {x: 800, y: 271} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 811 + y: 257 + width: 791 + height: 573 + m_ShowMode: 0 + m_Title: Project Settings + m_RootView: {fileID: 7} + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 237 + y: 150 + width: 1206 + height: 715 + m_ShowMode: 4 + m_Title: Project + m_RootView: {fileID: 12} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PackageManagerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 800 + height: 573 + m_MinSize: {x: 800, y: 271} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 800 + height: 573 + m_MinSize: {x: 800, y: 271} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 429 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectSettingsWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 791 + height: 573 + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 791 + height: 573 + m_MinSize: {x: 310, y: 221} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 208 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 15} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1206 + height: 665 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 94 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 921 + y: 0 + width: 285 + height: 665 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 21} + m_Panes: + - {fileID: 21} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 228 + height: 394 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 22} + m_Panes: + - {fileID: 22} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 394 + width: 921 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + - {fileID: 25} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 13} + - {fileID: 8} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1206 + height: 715 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1206 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 695 + width: 1206 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 16} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 921 + height: 665 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 55 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 17} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 921 + height: 394 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 35 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 228 + y: 0 + width: 693 + height: 394 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 23} + m_Panes: + - {fileID: 23} + - {fileID: 24} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 13953, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 800, y: 250} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Package Manager + m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 838 + y: 382 + width: 800 + height: 552 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 13854, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 310, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Project Settings + m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 811 + y: 257 + width: 791 + height: 552 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 64} + m_Scope: 1 + m_SplitterFlex: 0.2 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 7b59923f + m_LastClickedID: 1066555771 + m_ExpandedIDs: a01a5fa600000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 237 + y: 574 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Aircraft Physics/Example/Scripts + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Aircraft Physics/Example/Scripts + m_LastFoldersGridSize: -1 + m_LastProjectPath: /Users/alonzomachiraju/Documents/GitHub/Aircraft-Physics + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 46} + m_SelectedIDs: 42640000 + m_LastClickedID: 25666 + m_ExpandedIDs: 000000003064000032640000346400003664000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1158 + y: 180 + width: 284 + height: 644 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 1523.2002 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &22 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 237 + y: 180 + width: 227 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 145b0000 + m_LastClickedID: 0 + m_ExpandedIDs: 80e2ffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &23 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 465 + y: 180 + width: 691 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -98, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + speed: 2 + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &24 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 507 + y: 94 + width: 1532 + height: 790 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1532, y: 769} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -383 + m_HBaseRangeMax: 383 + m_VBaseRangeMin: -192.25 + m_VBaseRangeMax: 192.25 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1532 + height: 769 + m_Scale: {x: 2, y: 2} + m_Translation: {x: 766, y: 384.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -383 + y: -192.25 + width: 766 + height: 384.5 + m_MinimalGUI: 1 + m_defaultScale: 2 + m_LastWindowPixelSize: {x: 3064, y: 1580} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &25 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file From 91ccfc7e3c4c432a32547365b2f97c1c24546e25 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:35:44 -0800 Subject: [PATCH 02/16] First stage of update to use new input --- .../Example/Scripts/AirplaneController.cs | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs index a4c582a..75c16f2 100644 --- a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs +++ b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs @@ -40,10 +40,6 @@ private void Start() private void Update() { - Pitch = Input.GetAxis("Vertical"); - Roll = Input.GetAxis("Horizontal"); - Yaw = Input.GetAxis("Yaw"); - if (Input.GetKeyDown(KeyCode.Space)) { thrustPercent = thrustPercent > 0 ? 0 : 1f; @@ -105,4 +101,20 @@ private void OnDrawGizmos() if (!Application.isPlaying) SetControlSurfecesAngles(Pitch, Roll, Yaw, Flap); } + + // New Unity Input + + void OnVertical(InputValue value) + { + Pitch = value.Get(); + } + + void OnHorizontal(InputValue value) + { + Roll = value.Get(); + } + void OnYaw(InputValue value) + { + Yaw = value.Get(); + } } From 686e558eddf3f0de6f3936ed42676b7627c8e731 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:36:22 -0800 Subject: [PATCH 03/16] Added namespace UnityEngine.InputSystem is required for the new input system to work --- Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs index 75c16f2..f5b2d20 100644 --- a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs +++ b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using UnityEngine.InputSystem; public class AirplaneController : MonoBehaviour { From 7ba0b824cf99d3164c55d1c25db0d700fdf62e2e Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:39:48 -0800 Subject: [PATCH 04/16] Added Player Input component This is used in the new input system to read inputs --- .../Example/Scenes/Cessna 172.unity | 124 +++++++++++++++++- 1 file changed, 120 insertions(+), 4 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity index 4f07742..c9e24f7 100644 --- a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 7b7098d1e3c8d5a4da27e07571b2c209, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: f631954041b5040d0bbab40ef6e7617d, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -149,6 +152,7 @@ Transform: m_LocalRotation: {x: -0.46373448, y: -0.46373492, z: -0.53380746, w: 0.53380704} m_LocalPosition: {x: 0, y: 1.348, z: -1.405} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 7 @@ -212,6 +216,7 @@ Transform: m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.50000006} m_LocalPosition: {x: -0, y: 1.207, z: 1.736} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 8 @@ -245,6 +250,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 616582346} m_RootOrder: 0 @@ -273,10 +279,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -301,6 +309,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &276105952 MeshFilter: m_ObjectHideFlags: 0 @@ -353,10 +362,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -381,6 +392,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &372882691 MeshFilter: m_ObjectHideFlags: 0 @@ -399,6 +411,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 326} m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 502943989} m_RootOrder: 5 @@ -432,6 +445,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1565894463} m_RootOrder: 0 @@ -460,10 +474,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -488,6 +504,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &438060009 MeshFilter: m_ObjectHideFlags: 0 @@ -606,6 +623,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1989807620} - {fileID: 1565894463} @@ -644,6 +662,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2106019377} m_RootOrder: 0 @@ -668,6 +687,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -737,6 +757,7 @@ Transform: m_LocalRotation: {x: -0.15518655, y: -0.07817542, z: 0.012196126, w: 0.98471165} m_LocalPosition: {x: -1.7485917, y: -1.5066619, z: 16.2847} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1188863489} m_RootOrder: 0 @@ -763,6 +784,7 @@ MonoBehaviour: m_YawDamping: 0 m_RollDamping: 2 m_AngularDamping: 0 + m_HideOffsetInInspector: 0 --- !u!114 &579593526 MonoBehaviour: m_ObjectHideFlags: 3 @@ -831,6 +853,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 111, y: 25, z: 162} m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 276105949} m_Father: {fileID: 502943989} @@ -860,10 +883,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -888,6 +913,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &616582349 MeshFilter: m_ObjectHideFlags: 0 @@ -972,6 +998,7 @@ Light: 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 &705507995 @@ -984,6 +1011,7 @@ Transform: m_LocalRotation: {x: 0.8376894, y: -0.13097274, z: -0.08356527, w: 0.52358335} m_LocalPosition: {x: -5.92, y: 2.62, z: -0.02} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1016,6 +1044,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1480701377} m_Father: {fileID: 1600303262} @@ -1041,6 +1070,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 0.6627451} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1090,6 +1120,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: -0.95, y: 1.51, z: -3.61} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 4 @@ -1187,9 +1218,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.061129205, y: 0.000000017293662, z: 0.0000000055957106, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017058815, z: -0.0000000010447456, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1257,6 +1289,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -218, y: 25, z: 481} m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1722032380} m_Father: {fileID: 502943989} @@ -1286,10 +1319,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1314,6 +1349,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &975024905 MeshFilter: m_ObjectHideFlags: 0 @@ -1365,6 +1401,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: 0.95, y: 1.51, z: -3.61} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 5 @@ -1396,6 +1433,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: -1.56, y: 2.057, z: 0.86} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 0 @@ -1459,7 +1497,10 @@ MonoBehaviour: NearClipPlane: 0.3 FarClipPlane: 10000 Dutch: 0 + ModeOverride: 0 LensShift: {x: 0, y: 0} + GateFit: 2 + m_SensorSize: {x: 1.3333334, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1475,9 +1516,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188863487} - m_LocalRotation: {x: 0.061129205, y: -0.000000018111866, z: 0.000000007764077, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017058815, z: -0.0000000010447456, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 579593524} m_Father: {fileID: 0} @@ -1545,6 +1587,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1576,6 +1619,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: 4, y: 2.057, z: 0.83} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 3 @@ -1622,6 +1666,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.18, z: 1.03} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2066979579} m_RootOrder: 3 @@ -1675,6 +1720,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: 1.56, y: 2.057, z: 0.86} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 1 @@ -1705,6 +1751,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1396502946} m_Father: {fileID: 2066979579} @@ -1738,6 +1785,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 771153308} m_RootOrder: 0 @@ -1762,6 +1810,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1819,6 +1868,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.185, y: 0.27700004, z: 0.251} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2030733527} m_RootOrder: 2 @@ -1895,6 +1945,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2136908832} m_RootOrder: 0 @@ -1923,10 +1974,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1951,6 +2004,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1551360291 MeshFilter: m_ObjectHideFlags: 0 @@ -1988,6 +2042,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1989807620} m_RootOrder: 0 @@ -2016,10 +2071,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2044,6 +2101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1560290392 MeshFilter: m_ObjectHideFlags: 0 @@ -2081,6 +2139,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -248.20001, y: 25, z: 130.90001} m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 438060006} m_Father: {fileID: 502943989} @@ -2110,10 +2169,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2138,6 +2199,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1565894466 MeshFilter: m_ObjectHideFlags: 0 @@ -2204,6 +2266,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1600303261 Canvas: m_ObjectHideFlags: 0 @@ -2235,6 +2298,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2106019377} - {fileID: 771153308} @@ -2275,6 +2339,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 975024902} m_RootOrder: 0 @@ -2303,10 +2368,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2331,6 +2398,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1722032383 MeshFilter: m_ObjectHideFlags: 0 @@ -2367,6 +2435,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.185, y: 0.277, z: 0.251} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2030733527} m_RootOrder: 1 @@ -2440,6 +2509,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1075455995} - {fileID: 1424892321} @@ -2496,6 +2566,7 @@ Transform: m_LocalRotation: {x: -0.56098527, y: -0.5609852, z: -0.43045974, w: 0.43045977} m_LocalPosition: {x: -0, y: 2.402, z: -4.042} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 6 @@ -2527,6 +2598,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.7071045, z: -0, w: 0.70710915} m_LocalPosition: {x: -4, y: 2.057, z: 0.83} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1827632704} m_RootOrder: 2 @@ -2575,6 +2647,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.111, z: 2.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2030733527} m_RootOrder: 0 @@ -2651,6 +2724,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -378, y: 25, z: 326} m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1560290389} m_Father: {fileID: 502943989} @@ -2680,10 +2754,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2708,6 +2784,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1989807623 MeshFilter: m_ObjectHideFlags: 0 @@ -2747,6 +2824,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1944279624} - {fileID: 1805377715} @@ -2833,6 +2911,7 @@ GameObject: - component: {fileID: 2066979580} - component: {fileID: 2066979581} - component: {fileID: 2066979582} + - component: {fileID: 2066979583} m_Layer: 0 m_Name: Aircraft m_TagString: Untagged @@ -2850,6 +2929,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.03, z: -0.303} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2030733527} - {fileID: 1827632704} @@ -2929,6 +3009,36 @@ MonoBehaviour: Roll: 0 Flap: 0 displayText: {fileID: 1480701378} +--- !u!114 &2066979583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066979578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: 0} + m_NotificationBehavior: 0 + 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_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &2106019376 GameObject: m_ObjectHideFlags: 0 @@ -2957,6 +3067,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 542925207} m_Father: {fileID: 1600303262} @@ -2982,6 +3093,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 0.6627451} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3033,6 +3145,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 259, y: 25, z: 574} m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1551360288} m_Father: {fileID: 502943989} @@ -3062,10 +3175,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3090,6 +3205,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136908835 MeshFilter: m_ObjectHideFlags: 0 From 0c72f680817970851d2bc0ba9f6aa039a9b52ceb Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:41:00 -0800 Subject: [PATCH 05/16] Added control input manager --- .../Example/AirplaneControl.inputactions | 1 + .../Example/AirplaneControl.inputactions.meta | 14 ++++++++++++++ .../Example/Scenes/Cessna 172.unity | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Assets/Aircraft Physics/Example/AirplaneControl.inputactions create mode 100644 Assets/Aircraft Physics/Example/AirplaneControl.inputactions.meta diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions.meta b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions.meta new file mode 100644 index 0000000..6928469 --- /dev/null +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 2080b83c286994fd688d68665f6756d4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity index c9e24f7..6058b3c 100644 --- a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity @@ -3021,7 +3021,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: 0} + m_Actions: {fileID: -944628639613478452, guid: 2080b83c286994fd688d68665f6756d4, + type: 3} m_NotificationBehavior: 0 m_UIInputModule: {fileID: 0} m_DeviceLostEvent: From 8e91264c337fbb04a70172adf8242a48d6dc832b Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:41:08 -0800 Subject: [PATCH 06/16] lighting updates --- .../Scenes/Cessna 172Settings.lighting | 64 +++++++++++++++++++ .../Scenes/Cessna 172Settings.lighting.meta | 8 +++ UserSettings/EditorUserSettings.asset | 3 + 3 files changed, 75 insertions(+) create mode 100644 Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting create mode 100644 Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting.meta diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting b/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting new file mode 100644 index 0000000..5f0eb96 --- /dev/null +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting @@ -0,0 +1,64 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Cessna 172Settings + serializedVersion: 4 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting.meta b/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting.meta new file mode 100644 index 0000000..e2c7e6a --- /dev/null +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172Settings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f631954041b5040d0bbab40ef6e7617d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 65778f8..8d4add1 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -5,6 +5,9 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedSceneGuid-0: + value: 0154560556565a035c5a097012260e44414f4d2e787b72367d7d1832b2b5623c + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 From 8470d4f9aca035a9ce04a9207c16ba66af91fa33 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:45:20 -0800 Subject: [PATCH 07/16] Use PitchRoll Single action for all pitch roll movement --- .../Example/Scripts/AirplaneController.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs index f5b2d20..bc117ae 100644 --- a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs +++ b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs @@ -105,15 +105,14 @@ private void OnDrawGizmos() // New Unity Input - void OnVertical(InputValue value) + void OnPitchRoll(InputValue value) { - Pitch = value.Get(); - } + Vector2 movement = value.Get(); - void OnHorizontal(InputValue value) - { - Roll = value.Get(); + Pitch = movement.y; + Roll = movement.x; } + void OnYaw(InputValue value) { Yaw = value.Get(); From f35518cd585f1e269253b90871c36a0608ec5354 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:45:36 -0800 Subject: [PATCH 08/16] Setup control bindings on keyboard --- .../Example/AirplaneControl.inputactions | 121 +++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index 9e26dfe..a9da53f 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -1 +1,120 @@ -{} \ No newline at end of file +{ + "name": "AirplaneControl", + "maps": [ + { + "name": "AirplaneControl", + "id": "c70314e2-c193-4362-b7fc-58de1e68a1e8", + "actions": [ + { + "name": "PitchRoll", + "type": "Value", + "id": "71e1194d-1d64-4f9a-8352-5c82661ed35f", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Yaw", + "type": "Value", + "id": "d9cc4d99-1e78-491f-b039-ba4fc66a99b6", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + } + ], + "bindings": [ + { + "name": "2D Vector", + "id": "37a378ba-192c-4aa9-9b00-05bc6df9b2e4", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "PitchRoll", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "912eec02-0f51-453c-ac46-5084005e4c31", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "55da6ffe-d96c-44fd-b533-f61da607d0b8", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0594d19a-2bda-4d2f-99eb-3e0bb2ac5702", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1cb98343-c4f1-48b1-974a-cb8717596550", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "1D Axis", + "id": "89d73883-3d9e-4f71-909e-5cd0d965e7f8", + "path": "1DAxis", + "interactions": "", + "processors": "", + "groups": "", + "action": "Yaw", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "negative", + "id": "08d54320-bd71-481e-96f1-f4cbb53bb9f4", + "path": "/comma", + "interactions": "", + "processors": "", + "groups": "", + "action": "Yaw", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "positive", + "id": "3f955865-0446-45aa-aa60-f5a32463e57e", + "path": "/period", + "interactions": "", + "processors": "", + "groups": "", + "action": "Yaw", + "isComposite": false, + "isPartOfComposite": true + } + ] + } + ], + "controlSchemes": [] +} \ No newline at end of file From 08f7ca65b811a19a6cbebeb5eab695602109ac4e Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:48:13 -0800 Subject: [PATCH 09/16] Keyboard and Joystick controls --- .../Example/AirplaneControl.inputactions | 95 +++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index a9da53f..3292491 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -42,7 +42,7 @@ "path": "/w", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard", "action": "PitchRoll", "isComposite": false, "isPartOfComposite": true @@ -53,7 +53,7 @@ "path": "/s", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard", "action": "PitchRoll", "isComposite": false, "isPartOfComposite": true @@ -64,7 +64,7 @@ "path": "/buttonEast", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard", "action": "PitchRoll", "isComposite": false, "isPartOfComposite": true @@ -75,8 +75,63 @@ "path": "/d", "interactions": "", "processors": "", + "groups": "Keyboard", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "2D Vector", + "id": "bc624559-fc85-4cb5-914c-2996b77b3eba", + "path": "2DVector", + "interactions": "", + "processors": "", "groups": "", "action": "PitchRoll", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "b9eb50fd-9571-4a6c-ae57-316b9eaca377", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "ec5cbca1-0826-4c0d-90cd-b801c9130ec9", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "714f2355-607b-4895-a57a-3066bee0c698", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "PitchRoll", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "b15692e7-4945-429f-9655-7e342f85fe06", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "PitchRoll", "isComposite": false, "isPartOfComposite": true }, @@ -97,7 +152,7 @@ "path": "/comma", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard;Joystick", "action": "Yaw", "isComposite": false, "isPartOfComposite": true @@ -108,7 +163,7 @@ "path": "/period", "interactions": "", "processors": "", - "groups": "", + "groups": "Joystick;Keyboard", "action": "Yaw", "isComposite": false, "isPartOfComposite": true @@ -116,5 +171,33 @@ ] } ], - "controlSchemes": [] + "controlSchemes": [ + { + "name": "Keyboard", + "bindingGroup": "Keyboard", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": true, + "isOR": false + } + ] + } + ] } \ No newline at end of file From f475b7f1af5e1620f21a5ccc06703adc4b76ba46 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 22:59:40 -0800 Subject: [PATCH 10/16] Fixed additional controls --- .../Example/Scripts/AirplaneController.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs index bc117ae..f9f6d5e 100644 --- a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs +++ b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs @@ -41,21 +41,6 @@ private void Start() private void Update() { - if (Input.GetKeyDown(KeyCode.Space)) - { - thrustPercent = thrustPercent > 0 ? 0 : 1f; - } - - if (Input.GetKeyDown(KeyCode.F)) - { - Flap = Flap > 0 ? 0 : 0.3f; - } - - if (Input.GetKeyDown(KeyCode.B)) - { - brakesTorque = brakesTorque > 0 ? 0 : 100f; - } - displayText.text = "V: " + ((int)rb.velocity.magnitude).ToString("D3") + " m/s\n"; displayText.text += "A: " + ((int)transform.position.y).ToString("D4") + " m\n"; displayText.text += "T: " + (int)(thrustPercent * 100) + "%\n"; @@ -117,4 +102,19 @@ void OnYaw(InputValue value) { Yaw = value.Get(); } + + void OnBrakes() + { + brakesTorque = brakesTorque > 0 ? 0 : 100f; + } + + void OnFlaps() + { + Flap = Flap > 0 ? 0 : 0.3f; + } + + void OnThrottle() + { + thrustPercent = thrustPercent > 0 ? 0 : 1f; + } } From b20b43a504e95a4ae0c4cfff6200ae9e2b4f34ef Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 23:01:25 -0800 Subject: [PATCH 11/16] Additional controls --- .../Example/AirplaneControl.inputactions | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index 3292491..0ced04f 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -22,6 +22,33 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Throttle", + "type": "Button", + "id": "40542a18-db82-4a8a-a61f-d7792a3460ab", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Brakes", + "type": "Button", + "id": "5ab1118c-16a0-4fda-b3d8-9299a0689ff2", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Flaps", + "type": "Button", + "id": "a86f45bf-2c33-4251-b889-597d34bf2bc1", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -167,6 +194,39 @@ "action": "Yaw", "isComposite": false, "isPartOfComposite": true + }, + { + "name": "", + "id": "8901ac1f-a22c-41cb-a95c-fe0fe4334862", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard;Joystick", + "action": "Throttle", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d7fb02a7-da11-4548-9ab6-4c819bc47eed", + "path": "/b", + "interactions": "", + "processors": "", + "groups": "Keyboard;Joystick", + "action": "Brakes", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b9457f6b-f589-4841-b38e-f6d25639db20", + "path": "/f", + "interactions": "", + "processors": "", + "groups": "Keyboard;Joystick", + "action": "Flaps", + "isComposite": false, + "isPartOfComposite": false } ] } From 655d4238c492aecd4e8aa349401995444323b4cb Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 23:01:34 -0800 Subject: [PATCH 12/16] Plane update --- .../Example/Scenes/Cessna 172.unity | 66 ++++++++++++------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity index 6058b3c..f5005f4 100644 --- a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity @@ -1218,7 +1218,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.06112921, y: 0.000000017058815, z: -0.0000000010447456, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017041149, z: -0.0000000010436635, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1500,7 +1500,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.3333334, y: 1} + m_SensorSize: {x: 1.9616477, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1516,7 +1516,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188863487} - m_LocalRotation: {x: 0.06112921, y: 0.000000017058815, z: -0.0000000010447456, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017041149, z: -0.0000000010436635, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1535,7 +1535,7 @@ GameObject: m_Component: - component: {fileID: 1205256002} - component: {fileID: 1205256001} - - component: {fileID: 1205256000} + - component: {fileID: 1205256003} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -1543,25 +1543,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1205256000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1205255999} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &1205256001 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1592,6 +1573,45 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1205256003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205255999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!1 &1274110901 GameObject: m_ObjectHideFlags: 0 From 5abe9daf0d06470becebf6e9652b5b0055ae032d Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 23:06:01 -0800 Subject: [PATCH 13/16] Default control updates --- Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity index f5005f4..72401dc 100644 --- a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity @@ -1218,7 +1218,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.06112921, y: 0.000000017041149, z: -0.0000000010436635, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017041074, z: -0.000000001043659, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1516,7 +1516,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188863487} - m_LocalRotation: {x: 0.06112921, y: 0.000000017041149, z: -0.0000000010436635, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.000000017041074, z: -0.000000001043659, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3056,8 +3056,8 @@ MonoBehaviour: m_Calls: [] m_ActionEvents: [] m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: + m_DefaultControlScheme: Keyboard + m_DefaultActionMap: AirplaneControl m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!1 &2106019376 From 4d4d752e2bac67723253d06668990458bac3dab7 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Mon, 15 Nov 2021 23:08:42 -0800 Subject: [PATCH 14/16] Default controls changed to reflect text --- Assets/Aircraft Physics/Example/AirplaneControl.inputactions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index 0ced04f..c2fd007 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -176,7 +176,7 @@ { "name": "negative", "id": "08d54320-bd71-481e-96f1-f4cbb53bb9f4", - "path": "/comma", + "path": "/q", "interactions": "", "processors": "", "groups": "Keyboard;Joystick", @@ -187,7 +187,7 @@ { "name": "positive", "id": "3f955865-0446-45aa-aa60-f5a32463e57e", - "path": "/period", + "path": "/e", "interactions": "", "processors": "", "groups": "Joystick;Keyboard", From f1a161a8a5a0a263ecd6d0a28679d1322ae97669 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Tue, 16 Nov 2021 17:52:35 -0800 Subject: [PATCH 15/16] Added throttle up-down with granularity --- .../Example/AirplaneControl.inputactions | 50 ++- .../Example/Scenes/Cessna 172.unity | 9 +- .../Example/Scripts/AirplaneController.cs | 9 +- UserSettings/Layouts/default-2021.dwlt | 413 ++++-------------- 4 files changed, 138 insertions(+), 343 deletions(-) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index c2fd007..d49bc5d 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -25,12 +25,12 @@ }, { "name": "Throttle", - "type": "Button", + "type": "Value", "id": "40542a18-db82-4a8a-a61f-d7792a3460ab", - "expectedControlType": "Button", + "expectedControlType": "Axis", "processors": "", "interactions": "", - "initialStateCheck": false + "initialStateCheck": true }, { "name": "Brakes", @@ -195,17 +195,6 @@ "isComposite": false, "isPartOfComposite": true }, - { - "name": "", - "id": "8901ac1f-a22c-41cb-a95c-fe0fe4334862", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard;Joystick", - "action": "Throttle", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "d7fb02a7-da11-4548-9ab6-4c819bc47eed", @@ -227,6 +216,39 @@ "action": "Flaps", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "1D Axis", + "id": "14705b29-c4a8-49a7-b0a4-c2deea3d0d47", + "path": "1DAxis", + "interactions": "", + "processors": "", + "groups": "", + "action": "Throttle", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "negative", + "id": "ac3f9a8f-0f00-43e8-b7fe-9063ad523b1c", + "path": "/minus", + "interactions": "", + "processors": "", + "groups": "", + "action": "Throttle", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "positive", + "id": "555e02df-cc95-4b29-950c-f2ba7259e111", + "path": "/equals", + "interactions": "", + "processors": "", + "groups": "", + "action": "Throttle", + "isComposite": false, + "isPartOfComposite": true } ] } diff --git a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity index 72401dc..abb0f8a 100644 --- a/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity +++ b/Assets/Aircraft Physics/Example/Scenes/Cessna 172.unity @@ -719,7 +719,7 @@ MonoBehaviour: BRAKES TOGGLE - B - THROTTLE TOGGLE - Space' + THROTTLE - -/=' --- !u!222 &542925209 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1218,7 +1218,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.06112921, y: 0.000000017041074, z: -0.000000001043659, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.00000001704107, z: -0.0000000010436588, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1500,7 +1500,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.9616477, y: 1} + m_SensorSize: {x: 1.9630681, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1516,7 +1516,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188863487} - m_LocalRotation: {x: 0.06112921, y: 0.000000017041074, z: -0.000000001043659, w: 0.9981299} + m_LocalRotation: {x: 0.06112921, y: 0.00000001704107, z: -0.0000000010436588, w: 0.9981299} m_LocalPosition: {x: 0, y: 6.21, z: -14.273} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3029,6 +3029,7 @@ MonoBehaviour: Roll: 0 Flap: 0 displayText: {fileID: 1480701378} + thrustFactor: 0.3 --- !u!114 &2066979583 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs index f9f6d5e..e812dd8 100644 --- a/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs +++ b/Assets/Aircraft Physics/Example/Scripts/AirplaneController.cs @@ -27,6 +27,9 @@ public class AirplaneController : MonoBehaviour [SerializeField] Text displayText = null; + [SerializeField] + float thrustFactor = 0.3f; + float thrustPercent; float brakesTorque; @@ -113,8 +116,10 @@ void OnFlaps() Flap = Flap > 0 ? 0 : 0.3f; } - void OnThrottle() + void OnThrottle(InputValue value) { - thrustPercent = thrustPercent > 0 ? 0 : 1f; + float input = value.Get(); + + thrustPercent = Mathf.Clamp(thrustPercent + thrustFactor * input, 0.0f, 1.0f); } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ac2bafd..304c688 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,54 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 838 - y: 382 - width: 800 - height: 573 - m_ShowMode: 0 - m_Title: Package Manager - m_RootView: {fileID: 5} - m_MinSize: {x: 800, y: 271} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 811 - y: 257 - width: 791 - height: 573 - m_ShowMode: 0 - m_Title: Project Settings - m_RootView: {fileID: 7} - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -67,112 +19,12 @@ MonoBehaviour: width: 1206 height: 715 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 12} + m_Title: Inspector + m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: PackageManagerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 800 - height: 573 - m_MinSize: {x: 800, y: 271} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 800 - height: 573 - m_MinSize: {x: 800, y: 271} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 429 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectSettingsWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 791 - height: 573 - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 791 - height: 573 - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 208 ---- !u!114 &8 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -185,8 +37,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - {fileID: 9} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 @@ -196,8 +48,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 94 ---- !u!114 &9 + controlID: 53 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -212,18 +64,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 920 y: 0 - width: 285 + width: 286 height: 665 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 21} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -240,16 +92,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 228 + width: 227 height: 394 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 22} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,17 +118,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 394 - width: 921 + width: 920 height: 271 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 20} - - {fileID: 25} + - {fileID: 12} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -289,9 +141,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} + - {fileID: 7} + - {fileID: 2} - {fileID: 8} - - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -304,7 +156,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &13 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -326,7 +178,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &14 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -347,7 +199,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -360,19 +212,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 16} - - {fileID: 11} + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 + width: 920 height: 665 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 55 ---- !u!114 &16 + controlID: 19 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -385,19 +237,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 17} + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 + width: 920 height: 394 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 35 ---- !u!114 &17 + controlID: 20 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -407,109 +259,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 227 y: 0 width: 693 height: 394 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 23} - - {fileID: 24} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 13953, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 250} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Package Manager - m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 838 - y: 382 - width: 800 - height: 552 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 811 - y: 257 - width: 791 - height: 552 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 64} - m_Scope: 1 - m_SplitterFlex: 0.2 - m_SearchText: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7b59923f - m_LastClickedID: 1066555771 - m_ExpandedIDs: a01a5fa600000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &20 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -532,7 +299,7 @@ MonoBehaviour: serializedVersion: 2 x: 237 y: 574 - width: 920 + width: 919 height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -551,22 +318,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Aircraft Physics/Example/Scripts + - Assets/Aircraft Physics/Example m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Aircraft Physics/Example/Scripts + - Assets/Aircraft Physics/Example m_LastFoldersGridSize: -1 m_LastProjectPath: /Users/alonzomachiraju/Documents/GitHub/Aircraft-Physics m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 46} - m_SelectedIDs: 42640000 - m_LastClickedID: 25666 - m_ExpandedIDs: 000000003064000032640000346400003664000000ca9a3b + scrollPos: {x: 0, y: 59.999878} + m_SelectedIDs: 14510000 + m_LastClickedID: 20756 + m_ExpandedIDs: 000000000e5100001051000012510000145100001651000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -594,7 +361,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 000000000e51000010510000125100001451000016510000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -621,7 +388,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -650,7 +417,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &21 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -671,9 +438,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1158 + x: 1157 y: 180 - width: 284 + width: 285 height: 644 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -686,13 +453,13 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 1523.2002 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &22 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -715,7 +482,7 @@ MonoBehaviour: serializedVersion: 2 x: 237 y: 180 - width: 227 + width: 226 height: 373 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -724,9 +491,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 145b0000 - m_LastClickedID: 0 - m_ExpandedIDs: 80e2ffff + m_SelectedIDs: 204f0000 + m_LastClickedID: 20256 + m_ExpandedIDs: 1cfbffffc24f00001a500000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -742,7 +509,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -750,7 +517,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &23 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -771,7 +538,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 465 + x: 464 y: 180 width: 691 height: 373 @@ -1029,9 +796,9 @@ MonoBehaviour: speed: 2 m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_Size: - m_Target: 10 + m_Target: 2.614609 speed: 2 - m_Value: 10 + m_Value: 2.614609 m_Ortho: m_Target: 0 speed: 2 @@ -1056,7 +823,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &24 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1077,10 +844,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 464 + y: 180 + width: 691 + height: 373 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1091,10 +858,10 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 691, y: 352} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 @@ -1106,10 +873,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -383 - m_HBaseRangeMax: 383 - m_VBaseRangeMin: -192.25 - m_VBaseRangeMax: 192.25 + m_HBaseRangeMin: -172.75 + m_HBaseRangeMax: 172.75 + m_VBaseRangeMin: -88 + m_VBaseRangeMax: 88 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1118,7 +885,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1127,29 +894,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1532 - height: 769 + width: 691 + height: 352 m_Scale: {x: 2, y: 2} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 345.5, y: 176} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -383 - y: -192.25 - width: 766 - height: 384.5 + x: -172.75 + y: -88 + width: 345.5 + height: 176 m_MinimalGUI: 1 m_defaultScale: 2 - m_LastWindowPixelSize: {x: 3064, y: 1580} + m_LastWindowPixelSize: {x: 1382, y: 746} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &25 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1170,9 +937,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 + x: 237 + y: 574 + width: 919 height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: From d091e9c819cde9a74dfc73214c2bb8d9ad677333 Mon Sep 17 00:00:00 2001 From: Alonzo Machiraju Date: Tue, 16 Nov 2021 22:54:40 -0800 Subject: [PATCH 16/16] Fixed control bugs --- .../Aircraft Physics/Example/AirplaneControl.inputactions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions index d49bc5d..31bc88f 100644 --- a/Assets/Aircraft Physics/Example/AirplaneControl.inputactions +++ b/Assets/Aircraft Physics/Example/AirplaneControl.inputactions @@ -88,7 +88,7 @@ { "name": "left", "id": "0594d19a-2bda-4d2f-99eb-3e0bb2ac5702", - "path": "/buttonEast", + "path": "/a", "interactions": "", "processors": "", "groups": "Keyboard", @@ -234,7 +234,7 @@ "path": "/minus", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard;Joystick", "action": "Throttle", "isComposite": false, "isPartOfComposite": true @@ -245,7 +245,7 @@ "path": "/equals", "interactions": "", "processors": "", - "groups": "", + "groups": "Keyboard;Joystick", "action": "Throttle", "isComposite": false, "isPartOfComposite": true