diff --git a/Assets/Plugins/x64/libpd.dll b/Assets/Plugins/x64/libpd.dll index 5decfa2..8ec4cdd 100644 Binary files a/Assets/Plugins/x64/libpd.dll and b/Assets/Plugins/x64/libpd.dll differ diff --git a/Assets/Plugins/x86/libpd.dll b/Assets/Plugins/x86/libpd.dll index 193c49c..812e1d0 100644 Binary files a/Assets/Plugins/x86/libpd.dll and b/Assets/Plugins/x86/libpd.dll differ diff --git a/Assets/Scenes/SpatialiseScene.unity b/Assets/Scenes/SpatialiseScene.unity index fa04ab5..2636992 100644 --- a/Assets/Scenes/SpatialiseScene.unity +++ b/Assets/Scenes/SpatialiseScene.unity @@ -145,7 +145,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: patchName: SineDrone - patchDir: /StreamingAssets/PdAssets/SpatialisationPatches/ + patchDir: /PdAssets/SpatialisationPatches/ patch: {fileID: 102900000, guid: 55f52df84da09804c81d203410a4fdde, type: 3} pipePrintToConsole: 1 pureDataEvents: @@ -519,7 +519,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: patchName: FilteredNoise-ADC - patchDir: /StreamingAssets/PdAssets/SpatialisationPatches/ + patchDir: /PdAssets/SpatialisationPatches/ patch: {fileID: 102900000, guid: 8d059ad70b1caa34abcb319fba07da55, type: 3} pipePrintToConsole: 1 pureDataEvents: @@ -1326,7 +1326,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: patchName: FilteredNoise - patchDir: /StreamingAssets/PdAssets/SpatialisationPatches/ + patchDir: /PdAssets/SpatialisationPatches/ patch: {fileID: 102900000, guid: 0f0b3965e1ca19a479d4cc4e00cd2810, type: 3} pipePrintToConsole: 1 pureDataEvents: diff --git a/Assets/Scenes/Unity2LibPdScene.unity b/Assets/Scenes/Unity2LibPdScene.unity index e67b7cb..7d48847 100644 --- a/Assets/Scenes/Unity2LibPdScene.unity +++ b/Assets/Scenes/Unity2LibPdScene.unity @@ -968,7 +968,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: patchName: FloatExample - patchDir: /StreamingAssets/PdAssets/Unity2LibPdPatches/ + patchDir: /PdAssets/Unity2LibPdPatches/ patch: {fileID: 102900000, guid: 7341d6c8b5ae80f4b9c3e55c68de573e, type: 3} pipePrintToConsole: 0 pureDataEvents: @@ -1413,7 +1413,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: patchName: BangExample - patchDir: /StreamingAssets/PdAssets/Unity2LibPdPatches/ + patchDir: /PdAssets/Unity2LibPdPatches/ patch: {fileID: 102900000, guid: 131d5aebbccdcfb4cb9e49d9daf8227c, type: 3} pipePrintToConsole: 0 pureDataEvents: diff --git a/Assets/Scripts/LibPdInstance.cs b/Assets/Scripts/LibPdInstance.cs index 2dafca4..0182297 100644 --- a/Assets/Scripts/LibPdInstance.cs +++ b/Assets/Scripts/LibPdInstance.cs @@ -1,6 +1,6 @@ // LibPdInstance.cs - Unity integration of libpd, supporting multiple instances. // ----------------------------------------------------------------------------- -// Copyright (c) 2018 Niall Moody +// Copyright (c) 2019 Niall Moody // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -109,7 +109,8 @@ public class IntIntEvent : UnityEvent {} /// /// [RequireComponent(typeof(AudioSource))] -public class LibPdInstance : MonoBehaviour { +public class LibPdInstance : MonoBehaviour +{ #region libpd imports //-------------------------------------------------------------------------- @@ -396,7 +397,7 @@ public class LibPdInstance : MonoBehaviour { /// The Pd patch this instance is running. [HideInInspector] public string patchName; - /// The path to the directory of the Pd patch this instance is running. + /// Path to the folder the patch is in. [HideInInspector] public string patchDir; @@ -450,7 +451,8 @@ public class LibPdInstance : MonoBehaviour { //-------------------------------------------------------------------------- /// Events placed in a struct so they don't clutter up the Inspector by default. [System.Serializable] - public struct PureDataEvents { + public struct PureDataEvents + { /// UnityEvent that will be invoked whenever we recieve a bang from the PD patch. public StringEvent Bang; /// UnityEvent that will be invoked whenever we recieve a float from the PD patch. @@ -467,7 +469,8 @@ public class LibPdInstance : MonoBehaviour { /// Events placed in a struct so they don't clutter up the Inspector by default. [System.Serializable] - public struct MidiEvents { + public struct MidiEvents + { /// UnityEvent that will be invoked whenever we recieve a MIDI note on from the PD patch. public IntIntIntEvent MidiNoteOn; /// UnityEvent that will be invoked whenever we recieve a MIDI CC from the PD patch. @@ -489,7 +492,7 @@ public class LibPdInstance : MonoBehaviour { #region MonoBehaviour methods //-------------------------------------------------------------------------- /// Initialise LibPd. - void Awake () + void Awake() { // Initialise libpd, if it's not already. if(!pdInitialised) @@ -542,7 +545,7 @@ public class LibPdInstance : MonoBehaviour { Debug.LogWarning("(if you're running this in the editor that probably just means this isn't the first time you've run your game, and is not a problem)"); } pdInitialised = true; - + // Try and add the patch directory to libpd's search path for // loading externals (still can't seem to load externals when // running in Unity though). @@ -597,7 +600,7 @@ public class LibPdInstance : MonoBehaviour { // Initialise audio. int err = libpd_init_audio(2, 2, AudioSettings.outputSampleRate); - if (err != 0) + if(err != 0) { pdFail = true; Debug.LogError(gameObject.name + ": Could not initialise Pure Data audio. Error = " + err); @@ -615,10 +618,14 @@ public class LibPdInstance : MonoBehaviour { bindings = new Dictionary(); // Open our patch. - patchPointer = libpd_openfile(patchName + ".pd", Application.dataPath + patchDir); + patchPointer = libpd_openfile(patchName + ".pd", + Application.streamingAssetsPath + patchDir); if(patchPointer == IntPtr.Zero) { - Debug.LogError(gameObject.name + ": Could not open patch. Directory: " + (Application.dataPath + patchDir) + " Patch: " + patchName + ".pd"); + Debug.LogError(gameObject.name + + ": Could not open patch. Directory: " + + Application.streamingAssetsPath + patchDir + + " Patch: " + patchName + ".pd"); patchFail = true; } @@ -632,7 +639,7 @@ public class LibPdInstance : MonoBehaviour { //-------------------------------------------------------------------------- /// Close the patch file on quit. - void OnApplicationQuit () + void OnApplicationQuit() { if(!pdFail && !patchFail) { @@ -663,12 +670,15 @@ public class LibPdInstance : MonoBehaviour { /// Any send/MIDI events sent from libpd will be sent from the audio thread, /// so we have to queue them and send them from the main thread, or Unity /// will get very upset. - public void Update() { - if(actionsPending) { + public void Update() + { + if(actionsPending) + { mainThreadActions.Clear(); //Copy events queued from audio thread. - lock(audioThreadActions) { + lock(audioThreadActions) + { mainThreadActions.AddRange(audioThreadActions); audioThreadActions.Clear(); @@ -705,12 +715,15 @@ public class LibPdInstance : MonoBehaviour { if(patch != null) patchName = patch.name; - if(lastName != patchName) { + if((lastName != patchName) || + ((patch != null) && (patchDir == null)) || + ((patch != null) && (patchDir != null) && (patchDir.IndexOf("StreamingAssets") != -1))) //This is unfortunately necessary to upgrade the serialised data saved from versions of LibPdIntegration < v2.0.1. + { patchDir = AssetDatabase.GetAssetPath(patch.GetInstanceID()); - //Strip out "Assets", as the files won't be in the Assets folder in - //a built version, only when running in the editor. - patchDir = patchDir.Substring(patchDir.IndexOf("Assets") + 6); + //Strip out "Assets/StreamingAssets", as the files won't be in the + //Assets folder in a built version, only when running in the editor. + patchDir = patchDir.Substring(patchDir.IndexOf("Assets/StreamingAssets") + 22); //Remove the name of the patch, as we only need the directory. patchDir = patchDir.Substring(0, patchDir.LastIndexOf('/') + 1); @@ -720,7 +733,7 @@ public class LibPdInstance : MonoBehaviour { //-------------------------------------------------------------------------- /// Process audio. - void OnAudioFilterRead (float[] data, int channels) + void OnAudioFilterRead(float[] data, int channels) { if(!pdFail && !patchFail) { @@ -1127,11 +1140,13 @@ public class LibPdInstance : MonoBehaviour { //-------------------------------------------------------------------------- /// Used to queue an event/action from the audio thread, to be dispatched in /// the main thread. - private void addAudioAction(System.Action action) { + private void addAudioAction(System.Action action) + { if (action == null) throw new ArgumentNullException("action"); - lock(audioThreadActions) { + lock(audioThreadActions) + { audioThreadActions.Add(action); actionsPending = true; diff --git a/LibPdIntegrationExamples.csproj b/LibPdIntegrationExamples.csproj index 3c82764..823c598 100644 --- a/LibPdIntegrationExamples.csproj +++ b/LibPdIntegrationExamples.csproj @@ -7,21 +7,28 @@ 2.0 {A483BD06-E30A-FEC7-8139-ACBA2BD2B58D} Library - Assembly-CSharp.dll + Assembly-CSharp 512 {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} .NETFramework v3.5 - Unity Subset v3.5 + + + VSTU Game:1 StandaloneWindows64:19 - 2018.1.0f2 + 2018.1.6f1 4 + + true + true + false + pdbonly false @@ -29,7 +36,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - 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_2018_1_OR_NEWER;UNITY_2018_1_0;UNITY_2018_1;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;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;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_PACKMAN;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_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;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_2018_1_OR_NEWER;UNITY_2018_1_6;UNITY_2018_1;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;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;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_PACKMAN;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_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_POST_PROCESSING_STACK_V2 true @@ -39,218 +46,216 @@ Temp\UnityVS_obj\Release\ prompt 4 - 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_2018_1_OR_NEWER;UNITY_2018_1_0;UNITY_2018_1;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;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;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_PACKMAN;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_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_POST_PROCESSING_STACK_V2 + 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_2018_1_OR_NEWER;UNITY_2018_1_6;UNITY_2018_1;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;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;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_PACKMAN;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_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_POST_PROCESSING_STACK_V2 true - - - - - - - - + + Library/ScriptAssemblies/UnityEditor.StandardEvents.dll + + + Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll + - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.AIModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.AIModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ARModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ARModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.AnimationModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.AnimationModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.AudioModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.AudioModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.BaselibModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.BaselibModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ClothModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ClothModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.CloudWebServicesModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.CloudWebServicesModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.CoreModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.CoreModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.DirectorModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.DirectorModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.FacebookModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.FacebookModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.GameCenterModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.GameCenterModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.GridModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.GridModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.HotReloadModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.HotReloadModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.IMGUIModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.IMGUIModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.InputModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.InputModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ParticlesLegacyModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ParticlesLegacyModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.PhysicsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.PhysicsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.Physics2DModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.Physics2DModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.StyleSheetsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.StyleSheetsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.SubstanceModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.SubstanceModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TLSModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TLSModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TerrainModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TerrainModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TilemapModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TilemapModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.TimelineModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.TimelineModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UIModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UIModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UIElementsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UIElementsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UNETModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UNETModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UmbraModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UmbraModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.VRModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.VRModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.VehiclesModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.VehiclesModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.VideoModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.VideoModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.WebModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.WebModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.WindModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.WindModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEngine/UnityEngine.XRModule.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEngine/UnityEngine.XRModule.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/UnityEditor.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/UnityEditor.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\Managed/Unity.Locator.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\Managed/Unity.Locator.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll - C:/Program Files/Unity-2018.1.0f2/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll + C:/Program Files/Unity-2018.1.6f1/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll C:/Users/Niall Moody/AppData/Local/Unity/cache/packages/packages.unity.com/com.unity.analytics@2.0.16/UnityEngine.Analytics.dll @@ -262,43 +267,33 @@ C:/Users/Niall Moody/AppData/Local/Unity/cache/packages/packages.unity.com/com.unity.standardevents@1.0.13/UnityEngine.StandardEvents.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\mscorlib.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\mscorlib.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Core.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Core.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Runtime.Serialization.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Runtime.Serialization.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Xml.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Xml.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Xml.Linq.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\System.Xml.Linq.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\UnityScript.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\UnityScript.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\UnityScript.Lang.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\UnityScript.Lang.dll - C:\Program Files\Unity-2018.1.0f2\Editor\Data\MonoBleedingEdge\lib\mono\unity\Boo.Lang.dll + C:\Program Files\Unity-2018.1.6f1\Editor\Data\MonoBleedingEdge\lib\mono\unity\Boo.Lang.dll - - - {6800202F-4402-D405-F8CB-03DC7BD78B92} - UnityEditor.StandardEvents - - - {6877705C-FBD9-0C4F-5AFB-6FB431E5D39D} - Unity.PackageManagerUI.Editor - - diff --git a/LibPdIntegrationExamples.sln b/LibPdIntegrationExamples.sln index 1788746..5d589cc 100644 --- a/LibPdIntegrationExamples.sln +++ b/LibPdIntegrationExamples.sln @@ -1,11 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2017 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibPdIntegrationExamples", "LibPdIntegrationExamples.csproj", "{A483BD06-E30A-FEC7-8139-ACBA2BD2B58D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.PackageManagerUI.Editor", "Unity.PackageManagerUI.Editor.csproj", "{6877705C-FBD9-0C4F-5AFB-6FB431E5D39D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.StandardEvents", "UnityEditor.StandardEvents.csproj", "{6800202F-4402-D405-F8CB-03DC7BD78B92}" +# Visual Studio 15 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibPdIntegrationExamples", "Assembly-CSharp.csproj", "{F0B4C44C-426F-A1BA-F9AE-AD0AF41B3477}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,18 +9,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A483BD06-E30A-FEC7-8139-ACBA2BD2B58D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A483BD06-E30A-FEC7-8139-ACBA2BD2B58D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A483BD06-E30A-FEC7-8139-ACBA2BD2B58D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A483BD06-E30A-FEC7-8139-ACBA2BD2B58D}.Release|Any CPU.Build.0 = Release|Any CPU - {6877705C-FBD9-0C4F-5AFB-6FB431E5D39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6877705C-FBD9-0C4F-5AFB-6FB431E5D39D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6877705C-FBD9-0C4F-5AFB-6FB431E5D39D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6877705C-FBD9-0C4F-5AFB-6FB431E5D39D}.Release|Any CPU.Build.0 = Release|Any CPU - {6800202F-4402-D405-F8CB-03DC7BD78B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6800202F-4402-D405-F8CB-03DC7BD78B92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6800202F-4402-D405-F8CB-03DC7BD78B92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6800202F-4402-D405-F8CB-03DC7BD78B92}.Release|Any CPU.Build.0 = Release|Any CPU + {F0B4C44C-426F-A1BA-F9AE-AD0AF41B3477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0B4C44C-426F-A1BA-F9AE-AD0AF41B3477}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0B4C44C-426F-A1BA-F9AE-AD0AF41B3477}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0B4C44C-426F-A1BA-F9AE-AD0AF41B3477}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3d7798f..93c1cc8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -420,6 +420,7 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 22977b3..29eae9e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.0f2 +m_EditorVersion: 2018.1.6f1