From 86b86eef3236eaacd6c0c3991fd56a39f8c35f14 Mon Sep 17 00:00:00 2001 From: Bruno Couto Date: Fri, 28 Feb 2020 12:42:00 +0000 Subject: [PATCH] Shitty uniform Poisson Disk Sampling This is just a very basic implementation of the algorithm, just to test and for me to understand it better, next commit I'm gonna implement the last version of it with variable density --- .gitignore | 5 +- Aetheria-Economy.sln | 24 +- Assembly-CSharp-Editor.csproj | 45 ++-- Assembly-CSharp-Editor.csproj.meta | 3 + Assembly-CSharp.csproj | 38 +-- Assembly-CSharp.csproj.meta | 3 + Assets.meta | 3 + Assets/Plugins/Editor.meta | 2 +- Assets/Scenes/PoissonTest.unity | 243 ++++++++++++++++++ Assets/Scenes/PoissonTest.unity.meta | 7 + Assets/Scripts/PoissonDiskSampling.meta | 8 + .../PoissonDiskSampling.cs | 90 +++++++ .../PoissonDiskSampling.cs.meta | 11 + Assets/Scripts/PoissonDiskSampling/Test.cs | 32 +++ .../Scripts/PoissonDiskSampling/Test.cs.meta | 11 + Economy.Shared.Unity.csproj | 31 +-- Economy.Shared.Unity.csproj.meta | 3 + MagicOnion.Abstractions.csproj | 31 +-- MagicOnion.Abstractions.csproj.meta | 3 + MagicOnion.Unity.csproj | 31 +-- MagicOnion.Unity.csproj.meta | 3 + MagicOnion.csproj | 31 +-- MagicOnion.csproj.meta | 3 + MessagePack.csproj | 31 +-- MessagePack.csproj.meta | 3 + ProjectSettings/EditorSettings.asset | 4 +- 26 files changed, 556 insertions(+), 143 deletions(-) create mode 100644 Assembly-CSharp-Editor.csproj.meta create mode 100644 Assembly-CSharp.csproj.meta create mode 100644 Assets.meta create mode 100644 Assets/Scenes/PoissonTest.unity create mode 100644 Assets/Scenes/PoissonTest.unity.meta create mode 100644 Assets/Scripts/PoissonDiskSampling.meta create mode 100644 Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs create mode 100644 Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs.meta create mode 100644 Assets/Scripts/PoissonDiskSampling/Test.cs create mode 100644 Assets/Scripts/PoissonDiskSampling/Test.cs.meta create mode 100644 Economy.Shared.Unity.csproj.meta create mode 100644 MagicOnion.Abstractions.csproj.meta create mode 100644 MagicOnion.Unity.csproj.meta create mode 100644 MagicOnion.csproj.meta create mode 100644 MessagePack.csproj.meta diff --git a/.gitignore b/.gitignore index b01208053..e54ee1fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -60,4 +60,7 @@ crashlytics-build.properties Economy.Server/bin/ Economy.Server/obj/ Economy.Shared/bin/ -Economy.Shared/obj/ \ No newline at end of file +Economy.Shared/obj/ + +# JetBrains Rider .idea folder +.idea/ \ No newline at end of file diff --git a/Aetheria-Economy.sln b/Aetheria-Economy.sln index fde0e4e6c..0e606f381 100644 --- a/Aetheria-Economy.sln +++ b/Aetheria-Economy.sln @@ -1,17 +1,17 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{29B684F0-E616-CD9C-EFF8-10A39DB37A52}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessagePack", "MessagePack.csproj", "{21EF11C5-27DC-3D88-B027-9A4B6F36BAE4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion", "MagicOnion.csproj", "{8646472B-6F4E-DCCA-A987-99E48366FF7F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Abstractions", "MagicOnion.Abstractions.csproj", "{7A90811F-E771-FAB4-C8B5-EA6DF36C4D19}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Unity", "MagicOnion.Unity.csproj", "{B83AC090-25E2-7BA3-4612-A18BBB80B3E6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{29B684F0-E616-CD9C-EFF8-10A39DB37A52}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Economy.Shared.Unity", "Economy.Shared.Unity.csproj", "{A62B36C2-E9DE-B992-0779-F5FCF5968986}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagicOnion.Unity", "MagicOnion.Unity.csproj", "{B83AC090-25E2-7BA3-4612-A18BBB80B3E6}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{E389FCA7-CA14-82FB-7D67-C13788BEE74A}" EndProject Global @@ -20,6 +20,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Release|Any CPU.Build.0 = Release|Any CPU {21EF11C5-27DC-3D88-B027-9A4B6F36BAE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21EF11C5-27DC-3D88-B027-9A4B6F36BAE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {21EF11C5-27DC-3D88-B027-9A4B6F36BAE4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -32,18 +36,14 @@ Global {7A90811F-E771-FAB4-C8B5-EA6DF36C4D19}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A90811F-E771-FAB4-C8B5-EA6DF36C4D19}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A90811F-E771-FAB4-C8B5-EA6DF36C4D19}.Release|Any CPU.Build.0 = Release|Any CPU - {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Release|Any CPU.Build.0 = Release|Any CPU - {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29B684F0-E616-CD9C-EFF8-10A39DB37A52}.Release|Any CPU.Build.0 = Release|Any CPU {A62B36C2-E9DE-B992-0779-F5FCF5968986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A62B36C2-E9DE-B992-0779-F5FCF5968986}.Debug|Any CPU.Build.0 = Debug|Any CPU {A62B36C2-E9DE-B992-0779-F5FCF5968986}.Release|Any CPU.ActiveCfg = Release|Any CPU {A62B36C2-E9DE-B992-0779-F5FCF5968986}.Release|Any CPU.Build.0 = Release|Any CPU + {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B83AC090-25E2-7BA3-4612-A18BBB80B3E6}.Release|Any CPU.Build.0 = Release|Any CPU {E389FCA7-CA14-82FB-7D67-C13788BEE74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E389FCA7-CA14-82FB-7D67-C13788BEE74A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E389FCA7-CA14-82FB-7D67-C13788BEE74A}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index a92bfae91..ae6c9af1d 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -134,19 +134,19 @@ - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -376,35 +376,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assembly-CSharp-Editor.csproj.meta b/Assembly-CSharp-Editor.csproj.meta new file mode 100644 index 000000000..6ff68a1cc --- /dev/null +++ b/Assembly-CSharp-Editor.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1bdcce7f9eb0489c884f73565654ba50 +timeCreated: 1582883063 \ No newline at end of file diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 767279a42..1a9f405cc 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -556,6 +556,8 @@ + + @@ -581,19 +583,19 @@ - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -797,25 +799,25 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assembly-CSharp.csproj.meta b/Assembly-CSharp.csproj.meta new file mode 100644 index 000000000..b857e5d82 --- /dev/null +++ b/Assembly-CSharp.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d0b551d8628747f084f8be220e954447 +timeCreated: 1582883062 \ No newline at end of file diff --git a/Assets.meta b/Assets.meta new file mode 100644 index 000000000..538ef0167 --- /dev/null +++ b/Assets.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bd359a8daa974229a49df0563e183861 +timeCreated: 1582883062 \ No newline at end of file diff --git a/Assets/Plugins/Editor.meta b/Assets/Plugins/Editor.meta index eb9c50384..3bc326405 100644 --- a/Assets/Plugins/Editor.meta +++ b/Assets/Plugins/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1829d9a4a1359de47bda1a7f40ce3d04 +guid: f76d0e937a209ee42b3e807299a9e7cf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/PoissonTest.unity b/Assets/Scenes/PoissonTest.unity new file mode 100644 index 000000000..00999e737 --- /dev/null +++ b/Assets/Scenes/PoissonTest.unity @@ -0,0 +1,243 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &236807370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 236807373} + - component: {fileID: 236807372} + - component: {fileID: 236807371} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &236807371 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236807370} + m_Enabled: 1 +--- !u!20 &236807372 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236807370} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &236807373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236807370} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1046604421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1046604422} + - component: {fileID: 1046604423} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1046604422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046604421} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1046604423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046604421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c5e780ee090df142929fc2b1806e78c, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 1 + regionSize: {x: 25, y: 25} + rejectionSamples: 30 + displayRadius: 0.5 diff --git a/Assets/Scenes/PoissonTest.unity.meta b/Assets/Scenes/PoissonTest.unity.meta new file mode 100644 index 000000000..148fbafdc --- /dev/null +++ b/Assets/Scenes/PoissonTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8a9903e4e6338334987333bde1b53a28 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PoissonDiskSampling.meta b/Assets/Scripts/PoissonDiskSampling.meta new file mode 100644 index 000000000..837ff20ac --- /dev/null +++ b/Assets/Scripts/PoissonDiskSampling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7bff5c0928691046a0367080aaeee65 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs b/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs new file mode 100644 index 000000000..a12efd959 --- /dev/null +++ b/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.Mathematics; +using UnityEngine; +using Random = UnityEngine.Random; + +public static class PoissonDiskSampling +{ + public static List PoissonGenerate(float radius, Vector2 sampleRegionSize, + int numSamplesBeforeRejection = 30) + { + float cellSize = radius / Mathf.Sqrt(2); + + int[,] grid = new int[Mathf.CeilToInt(sampleRegionSize.x / cellSize), Mathf.CeilToInt(sampleRegionSize.y / cellSize)]; + List points = new List(); + List spawnPoints = new List(); + spawnPoints.Add(sampleRegionSize / 2); + + while (spawnPoints.Count > 0) + { + int spawnIndex = Random.Range(0, spawnPoints.Count); + Vector2 spawnCentre = spawnPoints[spawnIndex]; + bool isCandidateAccepted = false; + + for (int i = 0; i < numSamplesBeforeRejection; i++) + { + float angle = Random.value * Mathf.PI * 2; + Vector2 dir = new Vector2(Mathf.Sin(angle), Mathf.Cos(angle)); + Vector2 candidate = spawnCentre + dir * Random.Range(radius, 2 * radius); + if (IsValid(candidate, sampleRegionSize, cellSize, radius, points, grid)) + { + points.Add(candidate); + spawnPoints.Add(candidate); + grid[(int)(candidate.x / cellSize), (int)(candidate.y / cellSize)] = points.Count; + isCandidateAccepted = true; + break; + } + } + if (!isCandidateAccepted) + spawnPoints.RemoveAt(spawnIndex); + } + + return points; + } + + static bool IsValid(Vector2 candidate, Vector2 sampleRegionSize, float cellSize, float radius, List points, int[,] grid) + { + if (candidate.x >= 0 && candidate.x < sampleRegionSize.x && candidate.y >= 0 && candidate.y < sampleRegionSize.y) + { + int cellX = (int) (candidate.x / cellSize); + int cellY = (int) (candidate.y / cellSize); + int searchStartX = Mathf.Max(0, cellX - 2); + int searchEndX = Mathf.Min(cellX + 2, grid.GetLength(0) - 1); + int searchStartY = Mathf.Max(0, cellY - 2); + int searchEndY = Mathf.Min(cellY + 2, grid.GetLength(1) - 1); + + for (int x = searchStartX; x <= searchEndX; x++) + { + for (int y = searchStartY; y <= searchEndY; y++) + { + int pointIndex = grid[x, y] - 1; + if (pointIndex != -1) + { + float sqrDst = (candidate - points[pointIndex]).sqrMagnitude; + if (sqrDst < radius * radius) + { + return false; + } + } + } + } + + return true; + } + + return false; + } + + // float squaredEuclideanDistance(Array point1, Array point2) + // { + // + // } + // + // + // void PoissonDiskGenerate() + // { + // + // } +} diff --git a/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs.meta b/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs.meta new file mode 100644 index 000000000..684253fdc --- /dev/null +++ b/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 57fd96a54b211924aaf17bb990812215 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PoissonDiskSampling/Test.cs b/Assets/Scripts/PoissonDiskSampling/Test.cs new file mode 100644 index 000000000..bb2a41950 --- /dev/null +++ b/Assets/Scripts/PoissonDiskSampling/Test.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Test : MonoBehaviour +{ + public float radius = 1; + public Vector2 regionSize = Vector2.one; + public int rejectionSamples = 30; + public float displayRadius = 1; + + private List points; + + private void OnValidate() + { + points = PoissonDiskSampling.PoissonGenerate(radius, regionSize, rejectionSamples); + } + + private void OnDrawGizmos() + { + Gizmos.DrawWireCube(regionSize/2, regionSize); + + if (points != null) + { + foreach (Vector2 p in points) + { + Gizmos.DrawSphere(p, displayRadius); + } + } + } +} diff --git a/Assets/Scripts/PoissonDiskSampling/Test.cs.meta b/Assets/Scripts/PoissonDiskSampling/Test.cs.meta new file mode 100644 index 000000000..47009b584 --- /dev/null +++ b/Assets/Scripts/PoissonDiskSampling/Test.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5c5e780ee090df142929fc2b1806e78c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Economy.Shared.Unity.csproj b/Economy.Shared.Unity.csproj index c9d38d2e7..0daf10ddf 100644 --- a/Economy.Shared.Unity.csproj +++ b/Economy.Shared.Unity.csproj @@ -291,35 +291,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Economy.Shared.Unity.csproj.meta b/Economy.Shared.Unity.csproj.meta new file mode 100644 index 000000000..261def036 --- /dev/null +++ b/Economy.Shared.Unity.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: db26a4b8689f47c9a8ff88d619fecfe7 +timeCreated: 1582883063 \ No newline at end of file diff --git a/MagicOnion.Abstractions.csproj b/MagicOnion.Abstractions.csproj index 4ce1540ee..7028bedfe 100644 --- a/MagicOnion.Abstractions.csproj +++ b/MagicOnion.Abstractions.csproj @@ -297,35 +297,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/MagicOnion.Abstractions.csproj.meta b/MagicOnion.Abstractions.csproj.meta new file mode 100644 index 000000000..e576f413b --- /dev/null +++ b/MagicOnion.Abstractions.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ebc9a6aec7f545df980e5b4f1672ec3f +timeCreated: 1582883063 \ No newline at end of file diff --git a/MagicOnion.Unity.csproj b/MagicOnion.Unity.csproj index 174ab120f..eafee88b1 100644 --- a/MagicOnion.Unity.csproj +++ b/MagicOnion.Unity.csproj @@ -288,35 +288,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/MagicOnion.Unity.csproj.meta b/MagicOnion.Unity.csproj.meta new file mode 100644 index 000000000..2e959b5d4 --- /dev/null +++ b/MagicOnion.Unity.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: af7156ea54cc44e68b40196f5d6e0adf +timeCreated: 1582883063 \ No newline at end of file diff --git a/MagicOnion.csproj b/MagicOnion.csproj index 13a22d51b..08d488c23 100644 --- a/MagicOnion.csproj +++ b/MagicOnion.csproj @@ -312,35 +312,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/MagicOnion.csproj.meta b/MagicOnion.csproj.meta new file mode 100644 index 000000000..67a4b8f48 --- /dev/null +++ b/MagicOnion.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ff2dc7c00ea44b3ca4bb4db0985deaff +timeCreated: 1582883063 \ No newline at end of file diff --git a/MessagePack.csproj b/MessagePack.csproj index 5e9ea9f52..3a6b08d50 100644 --- a/MessagePack.csproj +++ b/MessagePack.csproj @@ -381,35 +381,32 @@ C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Buffers.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Buffers.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Memory.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Memory.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll - - - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll - C:/Users/rwvens/Documents/GitHub/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll + + + C:/Users/Bruno/Desktop/Project/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll C:/Program Files/Unity/Hub/Editor/2018.4.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/MessagePack.csproj.meta b/MessagePack.csproj.meta new file mode 100644 index 000000000..d3f0c1b7d --- /dev/null +++ b/MessagePack.csproj.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fe1ea83225ff48be9c68989b77389260 +timeCreated: 1582883062 \ No newline at end of file diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index d9008f07c..71f9c580e 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3aea39a4d3a57a6af67d37960a06ae1019b2196a3e2af04f7cd3b9ac6887b2b -size 643 +oid sha256:56874e4e30c18bef61d8b88405901227a76ca739817ff7bb80393bb6c4adb1eb +size 715