diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index d339cf467..50680a4ef 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -561,8 +561,6 @@ - - diff --git a/Assets/Scenes/PoissonTest.unity b/Assets/Scenes/PoissonTest.unity deleted file mode 100644 index 00999e737..000000000 --- a/Assets/Scenes/PoissonTest.unity +++ /dev/null @@ -1,243 +0,0 @@ -%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 deleted file mode 100644 index 148fbafdc..000000000 --- a/Assets/Scenes/PoissonTest.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8a9903e4e6338334987333bde1b53a28 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PoissonDiskSampling.meta b/Assets/Scripts/PoissonDiskSampling.meta deleted file mode 100644 index 837ff20ac..000000000 --- a/Assets/Scripts/PoissonDiskSampling.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index a12efd959..000000000 --- a/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs +++ /dev/null @@ -1,90 +0,0 @@ -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 deleted file mode 100644 index 684253fdc..000000000 --- a/Assets/Scripts/PoissonDiskSampling/PoissonDiskSampling.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index bb2a41950..000000000 --- a/Assets/Scripts/PoissonDiskSampling/Test.cs +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 47009b584..000000000 --- a/Assets/Scripts/PoissonDiskSampling/Test.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5c5e780ee090df142929fc2b1806e78c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: