From 75320b6bc5a70f3572b4ca8d9051b37bf2d854d7 Mon Sep 17 00:00:00 2001 From: Niall Moody <21282294+NiallMoody@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:31:47 +0000 Subject: [PATCH] Updated to match LibPdIntegration v2.1.0; disabled Oculus Spatializer example. --- Assembly-CSharp.csproj | 181 +++---- Assets/Plugins/x64/libpd.so.meta | 76 +++ Assets/Plugins/x86/libpd.so.meta | 76 +++ Assets/Scenes/SpatialiseScene.unity | 734 +++++++++++++++------------- Assets/Scripts/LibPdInstance.cs | 27 +- ProjectSettings/AudioManager.asset | 4 +- ProjectSettings/ProjectVersion.txt | 2 +- ToDo.txt | 16 +- 8 files changed, 667 insertions(+), 449 deletions(-) create mode 100644 Assets/Plugins/x64/libpd.so.meta create mode 100644 Assets/Plugins/x86/libpd.so.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 65ab8be..2e4b8b8 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -23,7 +23,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2018_4_25;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_POST_PROCESSING_STACK_V2 + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2018_4_29;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_POST_PROCESSING_STACK_V2 prompt 4 0169 @@ -50,17 +50,17 @@ Unity/VSTU Game:1 StandaloneWindows64:19 - 2018.4.25f1 + 2018.4.29f1 - C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll + C:\Program Files\Unity\Hub\Editor\2018.4.29f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll - C:\Program Files\Unity\Hub\Editor\2018.4.25f1\Editor\Data\Managed/UnityEditor.dll + C:\Program Files\Unity\Hub\Editor\2018.4.29f1\Editor\Data\Managed/UnityEditor.dll @@ -75,254 +75,257 @@ - - C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll - C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + + C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll + C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.TextMeshPro.dll + + C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll + + + C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/UnityEngine.Purchasing.dll + + + C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/ScriptAssemblies/UnityEditor.Purchasing.dll + - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.BaselibModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.BaselibModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.FileSystemHttpModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.FileSystemHttpModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.StyleSheetsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.StyleSheetsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.TimelineModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.TimelineModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/Managed/Unity.Locator.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/Managed/Unity.Locator.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll - - - C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/PackageCache/com.unity.ads@2.0.8/UnityEngine.Advertisements.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/PackageCache/com.unity.analytics@3.2.3/AnalyticsStandardEvents/Unity.Analytics.StandardEvents.dll - - C:/Users/Niall Moody/Programming/Unity/LibPdIntegrationExamples/Library/PackageCache/com.unity.purchasing@2.0.3/UnityEngine.Purchasing.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/mscorlib.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/mscorlib.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Core.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Core.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Runtime.Serialization.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Runtime.Serialization.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Xml.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Xml.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Xml.Linq.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Xml.Linq.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.Lang.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.Lang.dll - C:/Program Files/Unity/Hub/Editor/2018.4.25f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/Boo.Lang.dll + C:/Program Files/Unity/Hub/Editor/2018.4.29f1/Editor/Data/MonoBleedingEdge/lib/mono/unity/Boo.Lang.dll diff --git a/Assets/Plugins/x64/libpd.so.meta b/Assets/Plugins/x64/libpd.so.meta new file mode 100644 index 0000000..78c23bb --- /dev/null +++ b/Assets/Plugins/x64/libpd.so.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 240adea15d8cdd44f81930bdb8f32f39 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86_64 + DefaultValueInitialized: true + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Facebook: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/x86/libpd.so.meta b/Assets/Plugins/x86/libpd.so.meta new file mode 100644 index 0000000..167afc2 --- /dev/null +++ b/Assets/Plugins/x86/libpd.so.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: f5caf708a1ee8f8498dd41f7d56ab690 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86 + DefaultValueInitialized: true + - first: + Facebook: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SpatialiseScene.unity b/Assets/Scenes/SpatialiseScene.unity index 2636992..48d0a14 100644 --- a/Assets/Scenes/SpatialiseScene.unity +++ b/Assets/Scenes/SpatialiseScene.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &27935064 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 27935070} - component: {fileID: 27935069} @@ -136,8 +136,9 @@ GameObject: --- !u!114 &27935065 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_Enabled: 1 m_EditorHideFlags: 0 @@ -152,69 +153,46 @@ MonoBehaviour: Bang: m_PersistentCalls: m_Calls: [] - m_TypeName: StringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Float: m_PersistentCalls: m_Calls: [] - m_TypeName: StringFloatEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Symbol: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null List: m_PersistentCalls: m_Calls: [] - m_TypeName: StringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Message: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null midiEvents: MidiNoteOn: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiControlChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiProgramChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPitchBend: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPolyAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiByte: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null --- !u!82 &27935066 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_Enabled: 1 serializedVersion: 4 @@ -308,8 +286,9 @@ AudioSource: --- !u!135 &27935067 SphereCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -320,8 +299,9 @@ SphereCollider: --- !u!23 &27935068 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_Enabled: 1 m_CastShadows: 1 @@ -331,6 +311,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: af2e17fa3a795994ca358b16833ababc, type: 2} m_StaticBatchInfo: @@ -355,15 +336,17 @@ MeshRenderer: --- !u!33 &27935069 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &27935070 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27935064} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.5, z: 20} @@ -375,9 +358,10 @@ Transform: --- !u!1 &144170968 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 144170969} m_Layer: 0 @@ -390,8 +374,9 @@ GameObject: --- !u!4 &144170969 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144170968} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 15} @@ -411,9 +396,10 @@ Transform: --- !u!1 &170076733 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 170076735} - component: {fileID: 170076734} @@ -427,8 +413,9 @@ GameObject: --- !u!108 &170076734 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_Enabled: 1 serializedVersion: 8 @@ -454,6 +441,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -463,8 +451,9 @@ Light: --- !u!4 &170076735 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} @@ -476,9 +465,10 @@ Transform: --- !u!1 &178383049 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 178383056} - component: {fileID: 178383055} @@ -497,8 +487,9 @@ GameObject: --- !u!114 &178383050 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Enabled: 1 m_EditorHideFlags: 0 @@ -510,8 +501,9 @@ MonoBehaviour: --- !u!114 &178383051 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Enabled: 1 m_EditorHideFlags: 0 @@ -526,69 +518,46 @@ MonoBehaviour: Bang: m_PersistentCalls: m_Calls: [] - m_TypeName: StringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Float: m_PersistentCalls: m_Calls: [] - m_TypeName: StringFloatEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Symbol: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null List: m_PersistentCalls: m_Calls: [] - m_TypeName: StringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Message: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null midiEvents: MidiNoteOn: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiControlChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiProgramChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPitchBend: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPolyAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiByte: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null --- !u!82 &178383052 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Enabled: 1 serializedVersion: 4 @@ -682,8 +651,9 @@ AudioSource: --- !u!135 &178383053 SphereCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -694,8 +664,9 @@ SphereCollider: --- !u!23 &178383054 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Enabled: 1 m_CastShadows: 1 @@ -705,6 +676,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 12d804f550e0a5c45ae576449fd2309f, type: 2} m_StaticBatchInfo: @@ -729,15 +701,17 @@ MeshRenderer: --- !u!33 &178383055 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &178383056 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178383049} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 3, z: 40} @@ -749,9 +723,10 @@ Transform: --- !u!1 &222970854 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 222970855} m_Layer: 0 @@ -764,8 +739,9 @@ GameObject: --- !u!4 &222970855 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222970854} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: -20} @@ -781,9 +757,10 @@ Transform: --- !u!1 &249640534 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 249640535} - component: {fileID: 249640538} @@ -799,8 +776,9 @@ GameObject: --- !u!4 &249640535 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 249640534} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 4.75, z: 0} @@ -812,8 +790,9 @@ Transform: --- !u!65 &249640536 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 249640534} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -824,8 +803,9 @@ BoxCollider: --- !u!23 &249640537 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 249640534} m_Enabled: 1 m_CastShadows: 1 @@ -835,6 +815,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f62dea09a9b5afc468918e6c978c1d29, type: 2} m_StaticBatchInfo: @@ -859,16 +840,18 @@ MeshRenderer: --- !u!33 &249640538 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 249640534} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &282840810 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 282840814} - component: {fileID: 282840813} @@ -883,20 +866,27 @@ GameObject: --- !u!81 &282840811 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 --- !u!20 &282840813 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 1, g: 1, b: 1, a: 1} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -926,8 +916,9 @@ Camera: --- !u!4 &282840814 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -939,9 +930,10 @@ Transform: --- !u!1 &288967915 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 288967916} - component: {fileID: 288967918} @@ -956,8 +948,9 @@ GameObject: --- !u!4 &288967916 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 288967915} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 3.7869995, y: 0.01, z: -3.464} @@ -970,8 +963,9 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 288967915} m_Text: "(note the use of a looping\n SpatialiserFix Soundfile;\n see FilteredNoise-ADC.pd\n for more details)" @@ -991,8 +985,9 @@ TextMesh: --- !u!23 &288967918 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 288967915} m_Enabled: 1 m_CastShadows: 1 @@ -1002,6 +997,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -1026,9 +1022,10 @@ MeshRenderer: --- !u!1 &294292267 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 294292268} - component: {fileID: 294292271} @@ -1044,8 +1041,9 @@ GameObject: --- !u!4 &294292268 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294292267} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.75, y: 2.25, z: 0} @@ -1057,8 +1055,9 @@ Transform: --- !u!65 &294292269 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294292267} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1069,8 +1068,9 @@ BoxCollider: --- !u!23 &294292270 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294292267} m_Enabled: 1 m_CastShadows: 1 @@ -1080,6 +1080,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f62dea09a9b5afc468918e6c978c1d29, type: 2} m_StaticBatchInfo: @@ -1104,16 +1105,18 @@ MeshRenderer: --- !u!33 &294292271 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294292267} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &352689371 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 352689375} - component: {fileID: 352689374} @@ -1129,8 +1132,9 @@ GameObject: --- !u!64 &352689372 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352689371} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1138,13 +1142,13 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &352689373 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352689371} m_Enabled: 1 m_CastShadows: 1 @@ -1154,6 +1158,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 27881e641d124234f96397e072d202e6, type: 2} m_StaticBatchInfo: @@ -1178,15 +1183,17 @@ MeshRenderer: --- !u!33 &352689374 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352689371} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &352689375 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352689371} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1198,9 +1205,10 @@ Transform: --- !u!1 &440634029 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 440634030} - component: {fileID: 440634033} @@ -1216,8 +1224,9 @@ GameObject: --- !u!4 &440634030 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440634029} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.75, y: 2.25, z: 0} @@ -1229,8 +1238,9 @@ Transform: --- !u!65 &440634031 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440634029} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1241,8 +1251,9 @@ BoxCollider: --- !u!23 &440634032 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440634029} m_Enabled: 1 m_CastShadows: 1 @@ -1252,6 +1263,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f62dea09a9b5afc468918e6c978c1d29, type: 2} m_StaticBatchInfo: @@ -1276,16 +1288,18 @@ MeshRenderer: --- !u!33 &440634033 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440634029} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &779449923 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 779449930} - component: {fileID: 779449929} @@ -1300,12 +1314,13 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &779449924 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1317,8 +1332,9 @@ MonoBehaviour: --- !u!114 &779449925 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1333,69 +1349,46 @@ MonoBehaviour: Bang: m_PersistentCalls: m_Calls: [] - m_TypeName: StringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Float: m_PersistentCalls: m_Calls: [] - m_TypeName: StringFloatEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Symbol: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null List: m_PersistentCalls: m_Calls: [] - m_TypeName: StringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null Message: m_PersistentCalls: m_Calls: [] - m_TypeName: StringStringObjArrEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null midiEvents: MidiNoteOn: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiControlChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiProgramChange: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPitchBend: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiPolyAftertouch: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null MidiByte: m_PersistentCalls: m_Calls: [] - m_TypeName: IntIntEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null --- !u!82 &779449926 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Enabled: 1 serializedVersion: 4 @@ -1489,8 +1482,9 @@ AudioSource: --- !u!135 &779449927 SphereCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1501,8 +1495,9 @@ SphereCollider: --- !u!23 &779449928 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Enabled: 1 m_CastShadows: 1 @@ -1512,6 +1507,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 1a64bb011787acd448e61d0add544e33, type: 2} m_StaticBatchInfo: @@ -1536,15 +1532,17 @@ MeshRenderer: --- !u!33 &779449929 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &779449930 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779449923} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 3, z: 30} @@ -1556,9 +1554,10 @@ Transform: --- !u!1 &917451453 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 917451454} m_Layer: 0 @@ -1571,8 +1570,9 @@ GameObject: --- !u!4 &917451454 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 917451453} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1587,9 +1587,10 @@ Transform: --- !u!1 &1161935235 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1161935236} - component: {fileID: 1161935239} @@ -1606,8 +1607,9 @@ GameObject: --- !u!4 &1161935236 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161935235} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2.25, z: 0} @@ -1619,8 +1621,9 @@ Transform: --- !u!64 &1161935237 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161935235} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -1628,13 +1631,13 @@ MeshCollider: serializedVersion: 3 m_Convex: 1 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1161935238 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161935235} m_Enabled: 1 m_CastShadows: 1 @@ -1644,6 +1647,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: a9e56815a9dc92143b6865708e03e148, type: 2} m_StaticBatchInfo: @@ -1668,15 +1672,17 @@ MeshRenderer: --- !u!33 &1161935239 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161935235} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &1161935240 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161935235} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1687,9 +1693,10 @@ MonoBehaviour: --- !u!1 &1171049196 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1171049197} - component: {fileID: 1171049200} @@ -1704,8 +1711,9 @@ GameObject: --- !u!4 &1171049197 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171049196} m_LocalRotation: {x: 0.99984777, y: -0, z: -0, w: -0.017452264} m_LocalPosition: {x: 0, y: 2.25, z: 0} @@ -1717,8 +1725,9 @@ Transform: --- !u!23 &1171049199 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171049196} m_Enabled: 1 m_CastShadows: 1 @@ -1728,6 +1737,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: a9e56815a9dc92143b6865708e03e148, type: 2} m_StaticBatchInfo: @@ -1752,16 +1762,18 @@ MeshRenderer: --- !u!33 &1171049200 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171049196} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1490087608 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1490087609} - component: {fileID: 1490087612} @@ -1777,8 +1789,9 @@ GameObject: --- !u!4 &1490087609 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490087608} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.677, y: 0.01, z: -1.88} @@ -1790,8 +1803,9 @@ Transform: --- !u!64 &1490087610 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490087608} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1799,13 +1813,13 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1490087611 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490087608} m_Enabled: 1 m_CastShadows: 1 @@ -1815,6 +1829,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 538e9369aa2be2d49931c26165cfba51, type: 2} m_StaticBatchInfo: @@ -1839,16 +1854,18 @@ MeshRenderer: --- !u!33 &1490087612 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490087608} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1561123769 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1561123770} - component: {fileID: 1561123772} @@ -1863,8 +1880,9 @@ GameObject: --- !u!4 &1561123770 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1561123769} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 6, z: 0} @@ -1877,8 +1895,9 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1561123769} m_Text: Return to Main Scene m_OffsetZ: 0 @@ -1897,8 +1916,9 @@ TextMesh: --- !u!23 &1561123772 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1561123769} m_Enabled: 1 m_CastShadows: 1 @@ -1908,6 +1928,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -1932,9 +1953,10 @@ MeshRenderer: --- !u!1 &1648548011 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1648548012} - component: {fileID: 1648548014} @@ -1949,8 +1971,9 @@ GameObject: --- !u!4 &1648548012 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648548011} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -4, y: 0.01, z: 0} @@ -1963,14 +1986,17 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648548011} m_Text: "This scene demonstrates how to\r\nspatialise PD patches in Unity.\r\n\nThe - Green (FilteredSound.pd) and\r\nRed - (FilteredSound-ADC.pd)\nspheres are spatialised, while the\nBlue - sphere (SineDrone.pd) is not.\n\nLook at the AudioSources for the - 3\nspheres to see how this is done:" + Red (FilteredSound-ADC.pd)\nsphere is + spatialised, while the\nBlue sphere (SineDrone.pd) + is not.\n\nNote that there is an additional\n(hidden) Green + Sphere in the\nHeirarchy; this demonstrates how\nto use a spatialisation framework\nlike + Steam Audio as an alternative\napproach. See the wiki for details.\n\nLook at + the AudioSources for the\nspheres to see how this is done:" m_OffsetZ: 0 m_CharacterSize: 0.03 m_LineSpacing: 1 @@ -1987,8 +2013,9 @@ TextMesh: --- !u!23 &1648548014 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648548011} m_Enabled: 1 m_CastShadows: 1 @@ -1998,6 +2025,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -2022,9 +2050,10 @@ MeshRenderer: --- !u!1 &1664882002 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1664882003} - component: {fileID: 1664882005} @@ -2035,12 +2064,13 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1664882003 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1664882002} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 1.29, y: 0.01, z: 0.038000107} @@ -2053,8 +2083,9 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1664882002} m_Text: 'Green Sphere @@ -2075,8 +2106,9 @@ TextMesh: --- !u!23 &1664882005 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1664882002} m_Enabled: 1 m_CastShadows: 1 @@ -2086,6 +2118,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -2110,9 +2143,10 @@ MeshRenderer: --- !u!1 &1739204888 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1739204891} - component: {fileID: 1739204890} @@ -2127,8 +2161,9 @@ GameObject: --- !u!114 &1739204889 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1739204888} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2139,8 +2174,9 @@ MonoBehaviour: --- !u!143 &1739204890 CharacterController: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1739204888} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2156,8 +2192,9 @@ CharacterController: --- !u!4 &1739204891 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1739204888} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} @@ -2170,9 +2207,10 @@ Transform: --- !u!1 &1814864770 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1814864771} - component: {fileID: 1814864774} @@ -2184,12 +2222,13 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1814864771 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814864770} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 2.32, y: 0.01, z: -1.92} @@ -2201,8 +2240,9 @@ Transform: --- !u!64 &1814864772 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814864770} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2210,13 +2250,13 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1814864773 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814864770} m_Enabled: 1 m_CastShadows: 1 @@ -2226,6 +2266,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 586d054146c25994a9c7ca9ff85701a4, type: 2} m_StaticBatchInfo: @@ -2250,16 +2291,18 @@ MeshRenderer: --- !u!33 &1814864774 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814864770} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1975205259 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1975205260} - component: {fileID: 1975205262} @@ -2274,8 +2317,9 @@ GameObject: --- !u!4 &1975205260 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975205259} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 3.9199998, y: 0.01, z: 0.038000107} @@ -2288,8 +2332,9 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975205259} m_Text: 'Red Sphere @@ -2310,8 +2355,9 @@ TextMesh: --- !u!23 &1975205262 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975205259} m_Enabled: 1 m_CastShadows: 1 @@ -2321,6 +2367,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -2345,9 +2392,10 @@ MeshRenderer: --- !u!1 &1984785755 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1984785756} - component: {fileID: 1984785758} @@ -2362,8 +2410,9 @@ GameObject: --- !u!4 &1984785756 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984785755} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0.45, y: 0.01, z: -0.15} @@ -2376,8 +2425,9 @@ Transform: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984785755} m_Text: Blue Sphere m_OffsetZ: 0 @@ -2396,8 +2446,9 @@ TextMesh: --- !u!23 &1984785758 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984785755} m_Enabled: 1 m_CastShadows: 1 @@ -2407,6 +2458,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -2431,9 +2483,10 @@ MeshRenderer: --- !u!1 &2026451846 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2026451849} - component: {fileID: 2026451848} @@ -2449,8 +2502,9 @@ GameObject: TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026451846} m_Text: 'Spatialisation Example @@ -2471,8 +2525,9 @@ TextMesh: --- !u!23 &2026451848 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026451846} m_Enabled: 1 m_CastShadows: 1 @@ -2482,6 +2537,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} m_StaticBatchInfo: @@ -2506,8 +2562,9 @@ MeshRenderer: --- !u!4 &2026451849 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026451846} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 20} @@ -2519,9 +2576,10 @@ Transform: --- !u!1 &2036315273 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2036315274} - component: {fileID: 2036315277} @@ -2537,8 +2595,9 @@ GameObject: --- !u!4 &2036315274 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036315273} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.01, z: -1.88} @@ -2550,8 +2609,9 @@ Transform: --- !u!64 &2036315275 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036315273} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2559,13 +2619,13 @@ MeshCollider: serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 - m_SkinWidth: 0.01 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2036315276 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036315273} m_Enabled: 1 m_CastShadows: 1 @@ -2575,6 +2635,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 73a5d6a13e5d1de4fae4a3bdbfc3354f, type: 2} m_StaticBatchInfo: @@ -2599,7 +2660,8 @@ MeshRenderer: --- !u!33 &2036315277 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036315273} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Scripts/LibPdInstance.cs b/Assets/Scripts/LibPdInstance.cs index 29f9d7d..e2f00ed 100644 --- a/Assets/Scripts/LibPdInstance.cs +++ b/Assets/Scripts/LibPdInstance.cs @@ -114,12 +114,17 @@ public class LibPdInstance : MonoBehaviour { #region libpd imports - - #if UNITY_IOS + +#if UNITY_IOS private const string DLL_NAME="__Internal"; - #else +//The following lines will be needed if we can get externals working on Windows. +//Just renaming libpd.dll to pd.dll does not seem to be enough though, so +//they're commented out for now. +//#elif UNITY_STANDALONE_WIN +// private const string DLL_NAME="pd"; +#else private const string DLL_NAME="libpd"; - #endif +#endif //-------------------------------------------------------------------------- @@ -661,14 +666,6 @@ void OnDestroy() libpd_add_float(0.0f); libpd_finish_message("pd", "dsp"); - //TODO: Is this correct? What happens if one LibPdInstance is - //destroyed while another stays alive? - if(printHook != null) - { - printHook = null; - libpd_set_queued_printhook(printHook); - } - foreach(var ptr in bindings.Values) libpd_unbind(ptr); bindings.Clear(); @@ -681,6 +678,12 @@ void OnDestroy() //If we're the last instance left, release libpd's ringbuffer. if(pdInitialised && (activeInstances.Count < 1)) { + if(printHook != null) + { + printHook = null; + libpd_set_queued_printhook(printHook); + } + libpd_queued_release(); pdInitialised = true; diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index 4c668a9..07ebfb0 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -3,6 +3,7 @@ --- !u!11 &1 AudioManager: m_ObjectHideFlags: 0 + serializedVersion: 2 m_Volume: 1 Rolloff Scale: 1 Doppler Factor: 1 @@ -11,7 +12,8 @@ AudioManager: m_DSPBufferSize: 1024 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 - m_SpatializerPlugin: OculusSpatializer + m_SpatializerPlugin: m_AmbisonicDecoderPlugin: m_DisableAudio: 0 m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 1024 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 44c6f16..7dbf3ee 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.4.25f1 +m_EditorVersion: 2018.4.29f1 diff --git a/ToDo.txt b/ToDo.txt index bce1796..a434718 100644 --- a/ToDo.txt +++ b/ToDo.txt @@ -1,10 +1,6 @@ -LibPd Integration Examples --------------------------- -- Add OculusSpatializer example. - -Further down the line: ----------------------- -- LibPd -> Unity Example. -- MIDI Example. -- Array Example. -- List/Message Example. +LibPd Integration Examples +-------------------------- +- LibPd -> Unity Example. +- MIDI Example. +- Array Example. +- List/Message Example.