From 26c9872df63a50d8b3dc07f0b443c3653f040ad0 Mon Sep 17 00:00:00 2001 From: qhdwight Date: Tue, 19 Apr 2022 18:30:43 -0400 Subject: [PATCH] Add build pipeline for linux, change parsing of list object --- .../Facepunch.Steamworks.Win64.dll.meta | 2 +- .../osx/libsteam_api.bundle.meta | 2 +- Assets/Resources/Config.asset | 2 +- Assets/Scenes/Base.unity | 22 +- .../Voxelfield/Session/SessionManager.cs | 7 +- LiteNetLib.csproj.DotSettings | 4 +- .../Runtime/ListProperty.cs | 8 +- .../Runtime/PropertyBase.cs | 21 +- .../Runtime/StringProperty.cs | 12 +- .../Runtime/Config/DefaultConfig.cs | 87 +-- .../Runtime/Config/InputProvider.cs | 21 +- ProjectSettings/ProjectSettings.asset | 8 +- .../RiderScriptEditorPersistedState.asset | 2 +- Swihoni.Collections.csproj.DotSettings | 3 +- Swihoni.Components.Editor.csproj.DotSettings | 2 + Swihoni.Components.Tests.csproj.DotSettings | 2 + Swihoni.Components.csproj.DotSettings | 3 +- Swihoni.Session.Editor.csproj.DotSettings | 2 +- Swihoni.Session.csproj.DotSettings | 3 +- Swihoni.Sessions.Tests.csproj.DotSettings | 2 + Swihoni.Util.Editor.csproj.DotSettings | 2 + Swihoni.Util.csproj.DotSettings | 3 +- .../Layouts/CurrentMaximizeLayout.dwlt | 514 +++++++++--------- UserSettings/Layouts/default-2021.dwlt | 337 +++++++----- voxelfield.sln.DotSettings | 1 + 25 files changed, 593 insertions(+), 479 deletions(-) create mode 100644 Swihoni.Components.Editor.csproj.DotSettings create mode 100644 Swihoni.Sessions.Tests.csproj.DotSettings diff --git a/Assets/Plugins/Steamworks/Facepunch.Steamworks.Win64.dll.meta b/Assets/Plugins/Steamworks/Facepunch.Steamworks.Win64.dll.meta index d0a3d4be..2678df08 100644 --- a/Assets/Plugins/Steamworks/Facepunch.Steamworks.Win64.dll.meta +++ b/Assets/Plugins/Steamworks/Facepunch.Steamworks.Win64.dll.meta @@ -12,7 +12,7 @@ PluginImporter: validateReferences: 1 platformData: - first: - '': Any + : Any second: enabled: 0 settings: diff --git a/Assets/Plugins/Steamworks/redistributable_bin/osx/libsteam_api.bundle.meta b/Assets/Plugins/Steamworks/redistributable_bin/osx/libsteam_api.bundle.meta index 93541db0..4e2c6faa 100644 --- a/Assets/Plugins/Steamworks/redistributable_bin/osx/libsteam_api.bundle.meta +++ b/Assets/Plugins/Steamworks/redistributable_bin/osx/libsteam_api.bundle.meta @@ -39,7 +39,7 @@ PluginImporter: second: enabled: 0 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: OSXUniversal second: diff --git a/Assets/Resources/Config.asset b/Assets/Resources/Config.asset index 55aa2b2c..55de84e7 100644 --- a/Assets/Resources/Config.asset +++ b/Assets/Resources/Config.asset @@ -78,7 +78,7 @@ MonoBehaviour: m_Value: 0 authenticateSteam: m_Flags: 1 - m_Value: 1 + m_Value: 0 secureAreaConfig: roundEndDurationUs: m_Flags: 1 diff --git a/Assets/Scenes/Base.unity b/Assets/Scenes/Base.unity index 410a66a5..97e35212 100644 --- a/Assets/Scenes/Base.unity +++ b/Assets/Scenes/Base.unity @@ -1197,7 +1197,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1571494958} m_HandleRect: {fileID: 1571494957} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -10091,7 +10091,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.6 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -12720,7 +12720,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_HideSoftKeyboard: 0 m_CharacterValidation: 6 - m_RegexValue: ^[\w \.:&;]+$ + m_RegexValue: ^[\w \.:&;,]+$ m_GlobalPointSize: 14 m_CharacterLimit: 0 m_OnEndEdit: @@ -18539,7 +18539,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.6 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -19942,7 +19942,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.6 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -24095,7 +24095,7 @@ PrefabInstance: - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} @@ -24105,27 +24105,27 @@ PrefabInstance: - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_SizeDelta.x - value: 271.45248 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_AnchoredPosition.x - value: 135.72624 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7936714082184610991, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ec2d5468a4c30524d85166d333868ddd, type: 3} diff --git a/Assets/Scripts/Voxelfield/Session/SessionManager.cs b/Assets/Scripts/Voxelfield/Session/SessionManager.cs index 2bfed0b4..1d8c4fa7 100644 --- a/Assets/Scripts/Voxelfield/Session/SessionManager.cs +++ b/Assets/Scripts/Voxelfield/Session/SessionManager.cs @@ -404,6 +404,10 @@ public static void BuildWindowsIl2CppServer() public static void BuildLinuxMonoServer() => Build(ScriptingImplementation.Mono2x, BuildTarget.StandaloneLinux64, "Debug Linux Mono Server", true); + [MenuItem("Build/Linux IL2CPP Player", priority = 100)] + public static void BuildLinuxIl2CppPlayer() + => Build(ScriptingImplementation.IL2CPP, BuildTarget.StandaloneLinux64, "Debug Linux IL2CPP Player"); + // [MenuItem("Build/Release Windows Player")] // private static void BuildWindowsRelease() // => Build(ScriptingImplementation.Mono2x, BuildTarget.StandaloneWindows64, "Release Windows Mono Player", defines: new[] {"VOXELFIELD_RELEASE_CLIENT"}); @@ -451,7 +455,8 @@ private static void Build(ScriptingImplementation scripting, BuildTarget target, { scenes = new[] { "Assets/Scenes/Base.unity" }, locationPathName = executablePath, - target = target + target = target, + options = BuildOptions.CompressWithLz4 }; EditorUserBuildSettings.standaloneBuildSubtarget = isServer ? StandaloneBuildSubtarget.Server : StandaloneBuildSubtarget.Player; if (defines != null) buildPlayerOptions.extraScriptingDefines = defines; diff --git a/LiteNetLib.csproj.DotSettings b/LiteNetLib.csproj.DotSettings index 6a34f79b..42cfb9c8 100644 --- a/LiteNetLib.csproj.DotSettings +++ b/LiteNetLib.csproj.DotSettings @@ -1,4 +1,4 @@  - True - True + + False True \ No newline at end of file diff --git a/Packages/Swihoni.Components/Runtime/ListProperty.cs b/Packages/Swihoni.Components/Runtime/ListProperty.cs index 3ede69a4..6258f451 100644 --- a/Packages/Swihoni.Components/Runtime/ListProperty.cs +++ b/Packages/Swihoni.Components/Runtime/ListProperty.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Text.RegularExpressions; using LiteNetLib.Utils; using UnityEngine; @@ -71,7 +72,7 @@ public bool TryRemoveEnd(out TElement element) [Serializable] public class ListProperty : ListPropertyBase where TElement : ElementBase { - private const string Separator = ";"; + private const string Separator = ", "; public ListProperty() { } public ListProperty(int maxSize) : base(maxSize) { } @@ -111,8 +112,9 @@ public override StringBuilder AppendValue(StringBuilder builder) var afterFirst = false; foreach (TElement element in m_List) { - if (afterFirst) builder.Append(Separator).Append(" "); + if (afterFirst) builder.Append(Separator); builder.Stringify(element); + // builder.Append(new StringBuilder().Stringify(element).ToString().Replace(Separator, $"\\{Separator}")); afterFirst = true; } return builder; @@ -121,7 +123,7 @@ public override StringBuilder AppendValue(StringBuilder builder) public override void ParseValue(string stringValue) { Zero(); - string[] elementStrings = stringValue.Split(new[] {Separator}, StringSplitOptions.RemoveEmptyEntries); + string[] elementStrings = stringValue.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries); foreach (string elementString in elementStrings) { var element = ComponentExtensions.NewElement(); diff --git a/Packages/Swihoni.Components/Runtime/PropertyBase.cs b/Packages/Swihoni.Components/Runtime/PropertyBase.cs index e1edf7be..fd5ac49f 100644 --- a/Packages/Swihoni.Components/Runtime/PropertyBase.cs +++ b/Packages/Swihoni.Components/Runtime/PropertyBase.cs @@ -26,11 +26,7 @@ public abstract class PropertyBase : ElementBase { [SerializeField] private ElementFlags m_Flags = ElementFlags.None; - public byte RawFlags - { - get => (byte) m_Flags; - set => m_Flags = (ElementFlags) value; - } + public byte RawFlags { get => (byte)m_Flags; set => m_Flags = (ElementFlags)value; } public bool WithValue { @@ -80,7 +76,7 @@ public override int GetHashCode() { unchecked { - return (base.GetHashCode() * 397) ^ (int) m_Flags; + return (base.GetHashCode() * 397) ^ (int)m_Flags; } } @@ -118,6 +114,8 @@ public virtual bool TryParseValue(string propertyString) } } + public virtual string GetParseFormat() => null; + public virtual void Clear() => WithValue = false; public virtual void SetFromIfWith(PropertyBase other) @@ -144,10 +142,11 @@ public class BoxedEnumProperty : PropertyBase where TEnum : struct public BoxedEnumProperty() { } public BoxedEnumProperty(TEnum value) : base(value) { } public override bool ValueEquals(in TEnum value) => Equals(Value, value); - public override void SerializeValue(NetDataWriter writer) => writer.Put((int) (object) Value); - public override void DeserializeValue(NetDataReader reader) => Value = (TEnum) (object) reader.GetInt(); + public override void SerializeValue(NetDataWriter writer) => writer.Put((int)(object)Value); + public override void DeserializeValue(NetDataReader reader) => Value = (TEnum)(object)reader.GetInt(); public override StringBuilder AppendValue(StringBuilder builder) => builder.Append(Names.GetForward(Value)); public override void ParseValue(string stringValue) => Value = Names.GetReverse(stringValue); + public override string GetParseFormat() => string.Join(", ", Names.Backwards); } /// @@ -200,7 +199,7 @@ public T ValueOverride public ref T DirectValue => ref m_Value; - public T? AsNullable => WithValue ? m_Value : (T?) null; + public T? AsNullable => WithValue ? m_Value : null; protected PropertyBase() { } @@ -215,7 +214,7 @@ public override int GetHashCode() } } - public override bool Equals(object other) => this == (PropertyBase) other; + public override bool Equals(object other) => this == (PropertyBase)other; public static implicit operator T(PropertyBase property) => property.Value; @@ -261,7 +260,7 @@ public PropertyBase If(Action action) public T Else(T @default = default) => WithValue ? m_Value : @default; /// False if types are different. Equal if both values are the same, or if both do not have values. - public sealed override bool Equals(PropertyBase other) => this == (PropertyBase) other; + public sealed override bool Equals(PropertyBase other) => this == (PropertyBase)other; /// Use on two properties that are known to have values. /// False if types are different. Equal if both values are the same. diff --git a/Packages/Swihoni.Components/Runtime/StringProperty.cs b/Packages/Swihoni.Components/Runtime/StringProperty.cs index 18b1061f..3e7f1929 100644 --- a/Packages/Swihoni.Components/Runtime/StringProperty.cs +++ b/Packages/Swihoni.Components/Runtime/StringProperty.cs @@ -55,8 +55,8 @@ private void ThrowIfOverMaxSize(int size) public override void Serialize(NetDataWriter writer) { - if (m_MaxSize <= byte.MaxValue) writer.Put((byte) Builder.Length); - else writer.Put((ushort) Builder.Length); + if (m_MaxSize <= byte.MaxValue) writer.Put((byte)Builder.Length); + else writer.Put((ushort)Builder.Length); for (var i = 0; i < Builder.Length; i++) writer.Put(Builder[i]); } @@ -82,17 +82,17 @@ public override int GetHashCode() public bool Equals(string @string) => this == @string; - public override bool Equals(object other) => this == (StringProperty) other; + public override bool Equals(object other) => this == (StringProperty)other; - public override bool Equals(PropertyBase other) => this == (StringProperty) other; + public override bool Equals(PropertyBase other) => this == (StringProperty)other; - public static bool operator ==(StringProperty s1, string s2) => s1.Builder.ToString() == s2; + public static bool operator ==(StringProperty s1, string s2) => s1!.Builder.ToString() == s2; public static bool operator !=(StringProperty s1, string s2) => !(s1 == s2); public static bool operator ==(StringProperty s1, StringProperty s2) { - if (s1.Builder.Length != s2.Builder.Length) return false; + if (s1!.Builder.Length != s2!.Builder.Length) return false; for (var i = 0; i < s1.Builder.Length; i++) if (s1.Builder[i] != s2.Builder[i]) return false; diff --git a/Packages/Swihoni.Sessions/Runtime/Config/DefaultConfig.cs b/Packages/Swihoni.Sessions/Runtime/Config/DefaultConfig.cs index 506f80dc..57dac92f 100644 --- a/Packages/Swihoni.Sessions/Runtime/Config/DefaultConfig.cs +++ b/Packages/Swihoni.Sessions/Runtime/Config/DefaultConfig.cs @@ -34,16 +34,18 @@ public ConfigAttribute(ConfigType type = ConfigType.Client, string name = null) [Serializable] public class ResolutionProperty : PropertyBase { - private const char Separator = ';'; + private const char Separator = ','; public override StringBuilder AppendValue(StringBuilder builder) => builder.Append(Value.width).Append(Separator).Append(" ").Append(Value.height).Append(Separator).Append(" ").Append(Value.refreshRate); public override void ParseValue(string stringValue) { - string[] split = stringValue.Split(new[] {Separator}, StringSplitOptions.RemoveEmptyEntries); - Value = new Resolution {width = int.Parse(split[0]), height = int.Parse(split[1]), refreshRate = int.Parse(split[2])}; + string[] split = stringValue.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries); + Value = new Resolution { width = int.Parse(split[0]), height = int.Parse(split[1]), refreshRate = int.Parse(split[2]) }; } + + public override string GetParseFormat() => ",,"; } [CreateAssetMenu(fileName = "Config", menuName = "Session/Config", order = 0)] @@ -95,7 +97,7 @@ private static void Initialize() { _logTag = Default.Value.GetType().Name; - Active = ((DefaultConfig) CreateInstance(Default.Value.GetType())).Introspect(); + Active = ((DefaultConfig)CreateInstance(Default.Value.GetType())).Introspect(); // #if UNITY_EDITOR // SetActiveToDefault(); // #else @@ -103,14 +105,14 @@ private static void Initialize() // #endif ReadActive(); - ConsoleCommandExecutor.SetCommand("restore_default_config", arguments => + ConsoleCommandExecutor.SetCommand("restore_default_config", _ => { WriteDefaults(); SetActiveToDefault(); }); - ConsoleCommandExecutor.SetCommand("write_config", arguments => WriteActive()); - ConsoleCommandExecutor.SetCommand("read_config", arguments => ReadActive()); - ConsoleCommandExecutor.SetCommand("open_config", arguments => Application.OpenURL($"file://{GetConfigFile()}")); + ConsoleCommandExecutor.SetCommand("write_config", _ => WriteActive()); + ConsoleCommandExecutor.SetCommand("read_config", _ => ReadActive()); + ConsoleCommandExecutor.SetCommand("open_config", _ => Application.OpenURL($"file://{GetConfigFile()}")); } private DefaultConfig Introspect() @@ -122,37 +124,36 @@ private DefaultConfig Introspect() void Recurse(ElementBase element) { bool isConfig = element.TryAttribute(out ConfigAttribute config); - if (isConfig) + if (!isConfig) return; + + config.Name ??= element.Field.Name.ToSnakeCase(); + switch (element) { - config.Name ??= element.Field.Name.ToSnakeCase(); - switch (element) - { - case ComponentBase component: - names.Push(config.Name); - foreach (ElementBase childElement in component) - Recurse(childElement); - names.Pop(); - break; - case PropertyBase property: - string fullName = string.Join(".", names.Append(config.Name)); - m_NameToConfig.Add(fullName, (property, config)); - if (config.Type == ConfigType.Client) - { - ConsoleCommandExecutor.SetCommand(fullName, TryHandleArguments); - } - else - { - if (config.Type == ConfigType.Session) - m_TypeToConfig.Add(property.GetType(), (property, config)); - SessionBase.RegisterSessionCommand(fullName); - } - break; - } + case ComponentBase component: + names.Push(config.Name); + foreach (ElementBase childElement in component) + Recurse(childElement); + names.Pop(); + break; + case PropertyBase property: + string fullName = string.Join(".", names.Append(config.Name)); + m_NameToConfig.Add(fullName, (property, config)); + if (config.Type == ConfigType.Client) + { + ConsoleCommandExecutor.SetCommand(fullName, TryHandleArguments); + } + else + { + if (config.Type == ConfigType.Session) + m_TypeToConfig.Add(property.GetType(), (property, config)); + SessionBase.RegisterSessionCommand(fullName); + } + break; } } foreach (FieldInfo field in GetType().GetFields(BindingFlags.Instance | BindingFlags.Public)) { - var element = (ElementBase) field.GetValue(this); + var element = (ElementBase)field.GetValue(this); element.Field = field; Recurse(element); } @@ -183,8 +184,16 @@ public static void TryHandleArguments(IReadOnlyList split) } else { - property.TryParseValue(split[1]); - Debug.Log($"[{_logTag}] Set {split[0]} to {split[1]}"); + if (property.TryParseValue(split[1])) + { + Debug.Log($"[{_logTag}] Set {split[0]} to {split[1]}"); + } + else + { + string parseFormat = property.GetParseFormat(); + string hint = string.IsNullOrEmpty(parseFormat) ? string.Empty : $", expected: {parseFormat}"; + Debug.LogWarning($"[{_logTag}] Could not set {split[0]} to {split[1]}{hint}"); + } } Active.OnConfigUpdated(property, attribute); break; @@ -226,8 +235,8 @@ public static void UpdateSessionConfig(ComponentBase session) public static string GetConfigFile() { - string parentFolder = Directory.GetParent(Application.dataPath).FullName; - if (Application.platform == RuntimePlatform.OSXPlayer) parentFolder = Directory.GetParent(parentFolder).FullName; + string parentFolder = Directory.GetParent(Application.dataPath)!.FullName; + if (Application.platform == RuntimePlatform.OSXPlayer) parentFolder = Directory.GetParent(parentFolder)!.FullName; return Path.ChangeExtension(Path.Combine(parentFolder, "Config"), "vfc"); } @@ -263,7 +272,7 @@ private static void ReadActive() string[] lines = File.ReadAllLines(configPath); foreach (string line in lines) { - string[] cells = line.Split(new[] {Separator}, StringSplitOptions.RemoveEmptyEntries); + string[] cells = line.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries); if (cells.Length == 0) continue; string configName = cells[0], stringValue = cells.Length == 1 ? string.Empty : cells[1].Trim(); diff --git a/Packages/Swihoni.Sessions/Runtime/Config/InputProvider.cs b/Packages/Swihoni.Sessions/Runtime/Config/InputProvider.cs index 45390aa0..765d6654 100644 --- a/Packages/Swihoni.Sessions/Runtime/Config/InputProvider.cs +++ b/Packages/Swihoni.Sessions/Runtime/Config/InputProvider.cs @@ -64,8 +64,8 @@ public static class InputType static InputType() { - foreach (FieldInfo field in new[] {typeof(InputType), typeof(PlayerInput)}.SelectMany(t => t.GetFields(BindingFlags.Static | BindingFlags.Public))) - Names.Add((byte) field.GetValue(null), field.Name.ToSnakeCase()); + foreach (FieldInfo field in new[] { typeof(InputType), typeof(PlayerInput) }.SelectMany(t => t.GetFields(BindingFlags.Static | BindingFlags.Public))) + Names.Add((byte)field.GetValue(null), field.Name.ToSnakeCase()); } public static StringBuilder AppendInputKey(this StringBuilder builder, byte input) @@ -82,7 +82,7 @@ public KeyCodeProperty(KeyCode value) : base(value) { } [Serializable] public class InputBindingProperty : DictProperty { - private const string Separator = ";"; + private const string Separator = ", "; private static ByteProperty _lookupProperty = new(); private static Dictionary _defaultMap = new() @@ -149,7 +149,7 @@ public override StringBuilder AppendValue(StringBuilder builder) var afterFirst = false; foreach ((ByteProperty input, KeyCodeProperty keyCode) in m_Map) { - if (afterFirst) builder.Append(Separator).Append(" "); + if (afterFirst) builder.Append(Separator); builder.Append(InputType.Names.GetForward(input)).Append("=").AppendPropertyValue(keyCode); afterFirst = true; } @@ -159,12 +159,12 @@ public override StringBuilder AppendValue(StringBuilder builder) public override void ParseValue(string stringValue) { Zero(); - string[] pairs = stringValue.Split(new[] {Separator}, StringSplitOptions.RemoveEmptyEntries); + string[] pairs = stringValue.Split(new[] { Separator}, StringSplitOptions.RemoveEmptyEntries); foreach (string pair in pairs) { var keyProperty = new ByteProperty(); var valueProperty = new KeyCodeProperty(); - string[] keyAndValue = pair.Split(new[] {"="}, StringSplitOptions.RemoveEmptyEntries); + string[] keyAndValue = pair.Split(new[] { "=" }, StringSplitOptions.RemoveEmptyEntries); string key = keyAndValue[0].Trim(), value = keyAndValue[1]; keyProperty.Value = InputType.Names.GetReverse(key); valueProperty.ParseValue(value); @@ -173,11 +173,10 @@ public override void ParseValue(string stringValue) foreach ((byte _input, KeyCode keyCode) in _defaultMap) { var input = new ByteProperty(_input); - if (!m_Map.ContainsKey(input)) - { - Set(input, new KeyCodeProperty(keyCode)); - Debug.LogWarning($"Had to add default input for {InputType.Names.GetForward(input)}"); - } + if (m_Map.ContainsKey(input)) continue; + + Set(input, new KeyCodeProperty(keyCode)); + Debug.LogWarning($"Had to add default input for {InputType.Names.GetForward(input)}"); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ebbd1e13..af38101e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -344,10 +344,10 @@ PlayerSettings: m_Automatic: 0 - m_BuildTarget: LinuxStandaloneSupport m_APIs: 1500000011000000 - m_Automatic: 1 + m_Automatic: 0 - m_BuildTarget: WindowsStandaloneSupport m_APIs: 1500000002000000 - m_Automatic: 1 + m_Automatic: 0 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -629,10 +629,10 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Standalone: 0 + Standalone: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: - Standalone: 0 + Standalone: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset index 6fd945f9..7152382b 100644 --- a/ProjectSettings/RiderScriptEditorPersistedState.asset +++ b/ProjectSettings/RiderScriptEditorPersistedState.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 0} m_Name: m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState - lastWriteTicks: -8585512103848805523 + lastWriteTicks: -8585512044926483111 diff --git a/Swihoni.Collections.csproj.DotSettings b/Swihoni.Collections.csproj.DotSettings index beab07b4..80517b72 100644 --- a/Swihoni.Collections.csproj.DotSettings +++ b/Swihoni.Collections.csproj.DotSettings @@ -1,3 +1,4 @@  - True + False + True \ No newline at end of file diff --git a/Swihoni.Components.Editor.csproj.DotSettings b/Swihoni.Components.Editor.csproj.DotSettings new file mode 100644 index 00000000..3f8f9b96 --- /dev/null +++ b/Swihoni.Components.Editor.csproj.DotSettings @@ -0,0 +1,2 @@ + + False \ No newline at end of file diff --git a/Swihoni.Components.Tests.csproj.DotSettings b/Swihoni.Components.Tests.csproj.DotSettings index b0cbb4bc..7a046769 100644 --- a/Swihoni.Components.Tests.csproj.DotSettings +++ b/Swihoni.Components.Tests.csproj.DotSettings @@ -1,2 +1,4 @@  + False + True \ No newline at end of file diff --git a/Swihoni.Components.csproj.DotSettings b/Swihoni.Components.csproj.DotSettings index d7fb7158..546ba565 100644 --- a/Swihoni.Components.csproj.DotSettings +++ b/Swihoni.Components.csproj.DotSettings @@ -1,3 +1,4 @@  - True + False + True \ No newline at end of file diff --git a/Swihoni.Session.Editor.csproj.DotSettings b/Swihoni.Session.Editor.csproj.DotSettings index cd3abf14..6d39ddad 100644 --- a/Swihoni.Session.Editor.csproj.DotSettings +++ b/Swihoni.Session.Editor.csproj.DotSettings @@ -1,2 +1,2 @@  - True \ No newline at end of file + False \ No newline at end of file diff --git a/Swihoni.Session.csproj.DotSettings b/Swihoni.Session.csproj.DotSettings index b316cfd1..035ff3da 100644 --- a/Swihoni.Session.csproj.DotSettings +++ b/Swihoni.Session.csproj.DotSettings @@ -1,3 +1,4 @@  - True + False + True \ No newline at end of file diff --git a/Swihoni.Sessions.Tests.csproj.DotSettings b/Swihoni.Sessions.Tests.csproj.DotSettings new file mode 100644 index 00000000..6d39ddad --- /dev/null +++ b/Swihoni.Sessions.Tests.csproj.DotSettings @@ -0,0 +1,2 @@ + + False \ No newline at end of file diff --git a/Swihoni.Util.Editor.csproj.DotSettings b/Swihoni.Util.Editor.csproj.DotSettings index 6a3044f4..6afb5681 100644 --- a/Swihoni.Util.Editor.csproj.DotSettings +++ b/Swihoni.Util.Editor.csproj.DotSettings @@ -1,2 +1,4 @@  + False + False \ No newline at end of file diff --git a/Swihoni.Util.csproj.DotSettings b/Swihoni.Util.csproj.DotSettings index fb718120..2339bfec 100644 --- a/Swihoni.Util.csproj.DotSettings +++ b/Swihoni.Util.csproj.DotSettings @@ -1,3 +1,4 @@  - True + False + True \ No newline at end of file diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 119e0c84..e6404b3d 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 12273 + controlID: 7116 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -34,90 +34,138 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1801 - y: 359 - width: 1922 - height: 785 + x: 1152 + y: 1166 + width: 2572 + height: 472 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1922, y: 764} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -961 - m_HBaseRangeMax: 961 - m_VBaseRangeMin: -382 - m_VBaseRangeMax: 382 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1922 - height: 764 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 961, y: 382} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -961 - y: -382 - width: 1922 - height: 764 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1922, y: 785} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Resources + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Resources + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/quintin/Programming/voxelfield + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 9a510000 + m_LastClickedID: 20890 + m_ExpandedIDs: 000000006e51000070510000725100007451000076510000785100007a5100007c5100007e51000080510000825100008451000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000006e51000070510000725100007451000076510000785100007a5100007c5100007e51000080510000825100008451000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -132,7 +180,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 12} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -142,7 +190,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 12274 + controlID: 7117 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,11 +211,11 @@ MonoBehaviour: x: 0 y: 0 width: 2573 - height: 806 + height: 807 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 12275 + controlID: 6932 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,8 +233,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 649 - height: 806 + width: 623 + height: 807 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -217,8 +265,8 @@ MonoBehaviour: serializedVersion: 2 x: 1152 y: 359 - width: 648 - height: 785 + width: 622 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,9 +274,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f6010000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 92acffff60aeffff68aeffff88b0ffffacb1ffff5eb8fffff2beffff40d7ffff088000000e8000004280000062800000208100003c810000e8810000668200000683000020830000 + m_ExpandedIDs: 262affff622affffc831ffffa651ffffe251ffff4859ffff7e67ffffbc67ffff166effff0274ffff3e74ffffa47bfffffa82ffff3683ffff9c8affff30adffff6aadffffd0b4ffff26b9ffff60b9ffffc6c0ffff52c4ffffa0c4ffff06ccffffeaf5ffffc6f7ffff0afbffff704a0000504c00003a4d0000401b0100601d010064200100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -267,21 +315,21 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 649 + x: 623 y: 0 - width: 1924 - height: 806 + width: 1950 + height: 807 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 8} - {fileID: 9} - - {fileID: 2} - {fileID: 10} - {fileID: 11} + - {fileID: 12} m_Selected: 2 - m_LastSelected: 0 + m_LastSelected: 3 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -303,10 +351,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1801 + x: 1774 y: 359 - width: 1922 - height: 785 + width: 1949 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -508,9 +556,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 320, y: 240, z: 0} + m_Target: {x: 1305.0431, y: 316.36316, z: 3.1252608} speed: 2 - m_Value: {x: 320, y: 240, z: 0} + m_Value: {x: 1305.0431, y: 316.36316, z: 3.1252608} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -561,9 +609,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 400 + m_Target: 703.5488 speed: 2 - m_Value: 400 + m_Value: 703.5488 m_Ortho: m_Target: 1 speed: 2 @@ -608,10 +656,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2113 + x: 1774 y: 359 - width: 1610 - height: 785 + width: 1949 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -639,6 +687,99 @@ MonoBehaviour: m_ClientGUIView: {fileID: 0} m_SearchString: --- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1775 + y: 359 + width: 1948 + height: 786 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1948, y: 765} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -974 + m_HBaseRangeMax: 974 + m_VBaseRangeMin: -382.5 + m_VBaseRangeMax: 382.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1948 + height: 765 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 974, y: 382.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -974 + y: -382.5 + width: 1948 + height: 765 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1948, y: 786} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -659,10 +800,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1801 + x: 1775 y: 359 - width: 1922 - height: 785 + width: 1948 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -674,8 +815,8 @@ MonoBehaviour: m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c53aba5a - m_LastClickedID: 1522154181 + m_SelectedIDs: 4dcf9b58 + m_LastClickedID: 1486606157 m_ExpandedIDs: a01a5fa600000000c53aba5a m_RenameOverlay: m_UserAcceptedRename: 0 @@ -694,7 +835,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -715,15 +856,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1801 + x: 1774 y: 359 - width: 1922 - height: 785 + width: 1949 + height: 786 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -739,159 +880,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 806 + y: 807 width: 2573 - height: 494 + height: 493 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 2} m_Panes: - - {fileID: 13} + - {fileID: 2} - {fileID: 14} - {fileID: 15} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1152 - y: 1165 - width: 2572 - height: 473 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Resources - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Resources - m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/quintin/Programming/voxelfield - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68690000 - m_LastClickedID: 26984 - m_ExpandedIDs: 00000000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000646900006c690000ae6900001c6a000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000646900006c690000ae6900001c6a000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: f6010000 - m_LastClickedInstanceID: 502 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -914,9 +914,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1152 - y: 1165 + y: 1166 width: 2572 - height: 473 + height: 472 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3730268b..ea6033b8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 3368 height: 1350 m_ShowMode: 4 - m_Title: Project + m_Title: Project Settings m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4599 + controlID: 12601 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4600 + controlID: 12606 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,11 +165,11 @@ MonoBehaviour: x: 0 y: 0 width: 2573 - height: 805 + height: 806 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4437 + controlID: 12607 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 961 - height: 805 + width: 622 + height: 806 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -206,24 +206,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow + m_Name: ProjectSettingsWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 961 + x: 622 y: 0 - width: 1612 - height: 805 - m_MinSize: {x: 642, y: 601} + width: 1951 + height: 806 + m_MinSize: {x: 312, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 14} - {fileID: 15} + - {fileID: 12} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 2 + - {fileID: 17} + m_Selected: 3 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,16 +242,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 805 + y: 806 width: 2573 - height: 495 + height: 494 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} - - {fileID: 12} - {fileID: 18} + - {fileID: 19} + - {fileID: 20} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -273,9 +275,9 @@ MonoBehaviour: height: 1300 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 19} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 @@ -287,26 +289,90 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1152 - y: 1164 - width: 2572 - height: 474 + x: 1774 + y: 359 + width: 1949 + height: 785 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1949, y: 764} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -974.5 + m_HBaseRangeMax: 974.5 + m_VBaseRangeMin: -382 + m_VBaseRangeMax: 382 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1949 + height: 764 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 974.5, y: 382} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -974.5 + y: -382 + width: 1949 + height: 764 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1949, y: 785} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -330,8 +396,8 @@ MonoBehaviour: serializedVersion: 2 x: 1152 y: 359 - width: 960 - height: 784 + width: 621 + height: 785 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -339,9 +405,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2a6d0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2ad8ffff + m_ExpandedIDs: 64fbfeffb2fbfeff0c02ffffd031ffff0e32ffff6838fffff839ffff363affff9c41ffff92acffff60aeffff68aeffff88b0ffffacb1ffff5eb8fffff2beffff40d7ffff088000000e8000004280000062800000208100003c810000e8810000668200000683000020830000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -386,10 +452,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 547 - y: 73 - width: 917 - height: 535 + x: 1774 + y: 359 + width: 1949 + height: 785 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -400,7 +466,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -98, y: -26} + snapOffsetDelta: {x: -101, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -694,7 +760,7 @@ MonoBehaviour: x: 2113 y: 359 width: 1610 - height: 784 + height: 785 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -729,92 +795,84 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 310, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Text: Project Settings + m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 547 - y: 73 - width: 917 - height: 535 + x: 1774 + y: 359 + width: 1949 + height: 785 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 917, y: 514} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -458.5 - m_HBaseRangeMax: 458.5 - m_VBaseRangeMin: -267.5 - m_VBaseRangeMax: 267.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 0 - width: 917 - height: 535 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 458.5, y: 267.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -458.5 - y: -267.5 - width: 917 - height: 535 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 917, y: 535} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 721} + m_Scope: 1 + m_SplitterFlex: 0.2 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 4dcf9b58 + m_LastClickedID: 1486606157 + m_ExpandedIDs: a01a5fa600000000c53aba5a + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: --- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13953, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 800, y: 250} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Package Manager + m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1801 + y: 359 + width: 1922 + height: 785 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -836,9 +894,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1152 - y: 1164 + y: 1165 width: 2572 - height: 474 + height: 473 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -856,22 +914,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Voxelfield/Editor + - Assets/Resources m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Voxelfield/Editor + - Assets/Resources m_LastFoldersGridSize: -1 m_LastProjectPath: /home/quintin/Programming/voxelfield m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 2a6d0000 - m_LastClickedID: 27946 - m_ExpandedIDs: 00000000846700008e67000096670000ac670000ae670000b0670000b2670000626c0000646c00006e6c0000706c0000dc6c0000286d000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 68690000 + m_LastClickedID: 26984 + m_ExpandedIDs: 00000000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000646900006c690000ae6900001c6a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -899,7 +957,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000846700008e670000b0670000626c0000646c0000706c0000dc6c000000ca9a3bffffff7f + m_ExpandedIDs: 00000000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000646900006c690000ae6900001c6a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,7 +984,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -955,7 +1013,36 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1152 + y: 1165 + width: 2572 + height: 473 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1977,7 +2064,7 @@ MonoBehaviour: data: m_SortAscending: 0 m_SortedColumn: -1 ---- !u!114 &19 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/voxelfield.sln.DotSettings b/voxelfield.sln.DotSettings index 1ed2d4b7..9634afd6 100644 --- a/voxelfield.sln.DotSettings +++ b/voxelfield.sln.DotSettings @@ -1,2 +1,3 @@  + True True \ No newline at end of file