From e14824b7576a553a1f9ceeae3888a83a205a6fab Mon Sep 17 00:00:00 2001 From: Prin_E Date: Fri, 22 Mar 2019 02:44:48 +0900 Subject: [PATCH 1/3] Metal compatibility fix SPHFluid --- .gitignore | 9 + Assets/SPHFluid/Materials/Particle.mat | 5 +- Assets/SPHFluid/Resources/GenParticle.compute | 40 +++++ .../Resources/GenParticle.compute.meta | 8 + Assets/SPHFluid/Resources/SPH2D.compute | 5 +- Assets/SPHFluid/Scenes/Main.unity | 164 ++++++++---------- Assets/SPHFluid/Scripts/FluidRenderer.cs | 31 +++- Assets/SPHFluid/Shaders/Particle.shader | 38 +++- 8 files changed, 195 insertions(+), 105 deletions(-) create mode 100644 Assets/SPHFluid/Resources/GenParticle.compute create mode 100644 Assets/SPHFluid/Resources/GenParticle.compute.meta diff --git a/.gitignore b/.gitignore index eb83a8f..80b7f60 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,15 @@ /[Bb]uild/ /[Bb]uilds/ /Assets/AssetStoreTools* +/Logs/ +/Packages/ # Visual Studio 2015 cache directory /.vs/ +# Visual Studio Code cache directory +.vscode + # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ .consulo/ @@ -32,3 +37,7 @@ sysinfo.txt # Builds *.apk *.unitypackage + +# Mac hidden files +.DS_Store +._* diff --git a/Assets/SPHFluid/Materials/Particle.mat b/Assets/SPHFluid/Materials/Particle.mat index 1a0d76f..b327464 100644 --- a/Assets/SPHFluid/Materials/Particle.mat +++ b/Assets/SPHFluid/Materials/Particle.mat @@ -4,8 +4,9 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Particle m_Shader: {fileID: 4800000, guid: 1d85cfa19103757468e2cbbf822e6915, type: 3} m_ShaderKeywords: diff --git a/Assets/SPHFluid/Resources/GenParticle.compute b/Assets/SPHFluid/Resources/GenParticle.compute new file mode 100644 index 0000000..25faeb8 --- /dev/null +++ b/Assets/SPHFluid/Resources/GenParticle.compute @@ -0,0 +1,40 @@ +// Each #kernel tells which function to compile; you can have many kernels +#pragma kernel GenParticleMain + +#define THREAD_SIZE_X 1024 + +struct Particle { + float2 position; + float2 velocity; +}; + +struct ParticlePoint { + float4 position; + float2 uv; +}; + +StructuredBuffer _ParticlesBufferRead; +RWStructuredBuffer _ParticlesBufferWrite; + +[numthreads(THREAD_SIZE_X,1,1)] +void GenParticleMain (uint3 id : SV_DispatchThreadID) +{ + uint index = id.x; + const uint numVertices = 4; + const uint outIndex = index * numVertices; + + float2 uv[numVertices]; + uv[0] = float2(0, 0); + uv[1] = float2(0, 1); + uv[2] = float2(1, 1); + uv[3] = float2(1, 0); + //uv[3] = float2(0, 0); + //uv[4] = float2(1, 1); + //uv[5] = float2(1, 0); + + [unroll] + for(uint i = 0; i < numVertices; i++) { + _ParticlesBufferWrite[outIndex + i].position = float4(_ParticlesBufferRead[index].position, 0, 1); + _ParticlesBufferWrite[outIndex + i].uv = uv[i]; + } +} diff --git a/Assets/SPHFluid/Resources/GenParticle.compute.meta b/Assets/SPHFluid/Resources/GenParticle.compute.meta new file mode 100644 index 0000000..c7ad39c --- /dev/null +++ b/Assets/SPHFluid/Resources/GenParticle.compute.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb1290ea45f7a48799a7ba084c7c91c1 +ComputeShaderImporter: + externalObjects: {} + currentAPIMask: 65536 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SPHFluid/Resources/SPH2D.compute b/Assets/SPHFluid/Resources/SPH2D.compute index 14d8641..f142e0b 100644 --- a/Assets/SPHFluid/Resources/SPH2D.compute +++ b/Assets/SPHFluid/Resources/SPH2D.compute @@ -43,7 +43,7 @@ RWStructuredBuffer _ParticlesForceBufferWrite; // ▼ シェーダ定数の定義 ----------------------- cbuffer CB { - int _NumParticles; // 粒子数 + uint _NumParticles; // 粒子数 float _TimeStep; // 時間刻み幅(dt) float _Smoothlen; // 粒子半径 float _PressureStiffness; // Beckerの係数 @@ -79,7 +79,8 @@ inline float CalculateDensity(float r_sq) { /// Pressure = B * ((rho / rho_0)^gamma - 1) /// 圧力定数Bは正確に計算するべきだが、リアルタイム向きではないので適当な値にする inline float CalculatePressure(float density) { - return _PressureStiffness * max(pow(density / _RestDensity, 7) - 1, 0); + float densityPow = pow(abs(density / _RestDensity), 7); + return _PressureStiffness * max(densityPow * (density < 0 ? -1 : 1) - 1, 0); } /// Spikyカーネルの実装: diff --git a/Assets/SPHFluid/Scenes/Main.unity b/Assets/SPHFluid/Scenes/Main.unity index 9bcfc5e..38a81af 100644 --- a/Assets/SPHFluid/Scenes/Main.unity +++ b/Assets/SPHFluid/Scenes/Main.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: 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 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -77,15 +76,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + 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_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,69 +109,16 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &209498683 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 1383463523752164, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, - type: 2} - m_PrefabInternal: {fileID: 670400347} - serializedVersion: 5 - m_Component: - - component: {fileID: 209498686} - - component: {fileID: 209498685} - - component: {fileID: 209498684} - m_Layer: 0 - m_Name: Fluid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &209498684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114726282885069800, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, - type: 2} - m_PrefabInternal: {fileID: 670400347} - m_GameObject: {fileID: 209498683} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60f35f1c699acf84aa9eb5d719741368, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &209498685 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, - type: 2} - m_PrefabInternal: {fileID: 670400347} - m_GameObject: {fileID: 209498683} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 71dbfd03938b013479a67a104c563ea8, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &209498686 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, - type: 2} - m_PrefabInternal: {fileID: 670400347} - m_GameObject: {fileID: 209498683} - 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!1 &420660001 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 420660007} - component: {fileID: 420660002} @@ -184,13 +133,19 @@ GameObject: --- !u!20 &420660002 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420660001} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, 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 @@ -212,23 +167,25 @@ Camera: 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 - m_StereoMirrorMode: 0 --- !u!92 &420660006 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420660001} m_Enabled: 1 --- !u!4 &420660007 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420660001} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8, y: 4.5, z: -10} @@ -238,50 +195,73 @@ Transform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &670400347 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 114726282885069800, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: genParticleShader + value: + objectReference: {fileID: 7200000, guid: bb1290ea45f7a48799a7ba084c7c91c1, type: 3} + - target: {fileID: 114726282885069800, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: particleRadius + value: 0.206 + objectReference: {fileID: 0} + - target: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: simScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: particleNum + value: 2048 + objectReference: {fileID: 0} + - target: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: range.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, + type: 3} + propertyPath: range.y + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} + - target: {fileID: 4564428974380106, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 114520192571769522, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, - type: 2} - propertyPath: simScale - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 2} - m_RootGameObject: {fileID: 209498683} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: c3b2f6c965eb27a419edb7bbd9ba3c87, type: 3} diff --git a/Assets/SPHFluid/Scripts/FluidRenderer.cs b/Assets/SPHFluid/Scripts/FluidRenderer.cs index c68e4fa..e4ea88b 100644 --- a/Assets/SPHFluid/Scripts/FluidRenderer.cs +++ b/Assets/SPHFluid/Scripts/FluidRenderer.cs @@ -5,21 +5,44 @@ namespace Kodai.Fluid.SPH { [RequireComponent(typeof(Fluid2D))] public class FluidRenderer : MonoBehaviour { - public Fluid2D solver; public Material RenderParticleMat; public Color WaterColor; + public ComputeBuffer particleBuffer; + public ComputeShader genParticleShader; + + void Start() { + if(solver == null) + solver = GetComponent(); + particleBuffer = new ComputeBuffer(solver.NumParticles * 4, 24); + } + + void LateUpdate() { + GenerateParticles(); + } + void OnRenderObject() { DrawParticle(); } - void DrawParticle() { + void OnDestroy() { + particleBuffer.Release(); + } + void GenerateParticles() { + int kernelId = genParticleShader.FindKernel("GenParticleMain"); + genParticleShader.SetBuffer(kernelId, "_ParticlesBufferRead", solver.ParticlesBufferRead); + genParticleShader.SetBuffer(kernelId, "_ParticlesBufferWrite", particleBuffer); + genParticleShader.Dispatch(kernelId, solver.NumParticles / 1024, 1, 1); + } + + void DrawParticle() { RenderParticleMat.SetPass(0); RenderParticleMat.SetColor("_WaterColor", WaterColor); - RenderParticleMat.SetBuffer("_ParticlesBuffer", solver.ParticlesBufferRead); - Graphics.DrawProcedural(MeshTopology.Points, solver.NumParticles); + //RenderParticleMat.SetBuffer("_ParticlesBuffer", solver.ParticlesBufferRead); + RenderParticleMat.SetBuffer("_ParticlesBuffer", particleBuffer); + Graphics.DrawProcedural(MeshTopology.Quads, solver.NumParticles); } } } \ No newline at end of file diff --git a/Assets/SPHFluid/Shaders/Particle.shader b/Assets/SPHFluid/Shaders/Particle.shader index 14e43bb..0219678 100644 --- a/Assets/SPHFluid/Shaders/Particle.shader +++ b/Assets/SPHFluid/Shaders/Particle.shader @@ -26,28 +26,56 @@ float4 color : COLOR; }; + struct v2f { + float4 pos : SV_POSITION; + float2 tex : TEXCOORD0; + float4 color : COLOR; + }; + struct FluidParticle { float2 position; float2 velocity; }; + + struct ParticlePoint { + float4 position; + float2 uv; + }; - StructuredBuffer _ParticlesBuffer; + //StructuredBuffer _ParticlesBuffer; + StructuredBuffer _ParticlesBuffer; // -------------------------------------------------------------------- // Vertex Shader // -------------------------------------------------------------------- + /* v2g vert(uint id : SV_VertexID) { - v2g o = (v2g)0; o.pos = float4(_ParticlesBuffer[id].position.xy, 0, 1); o.color = float4(0, 0.1, 0.1, 1); return o; } + */ + + v2f vert(uint id : SV_VertexID) { + v2f o = (v2f)0; + float halfS = _ParticleRadius; + float4x4 billboardMatrix = UNITY_MATRIX_V; + billboardMatrix._m03 = billboardMatrix._m13 = billboardMatrix._m23 = billboardMatrix._m33 = 0; + float2 uv = _ParticlesBuffer[id].uv; + + o.pos = _ParticlesBuffer[id].position + mul(float4((uv * 2 - float2(1, 1)) * halfS, 0, 1), billboardMatrix); + o.pos = mul(UNITY_MATRIX_VP, o.pos); + o.color = float4(0, 0.1, 0.1, 1); + o.tex = _ParticlesBuffer[id].uv; + return o; + } // -------------------------------------------------------------------- // Geometry Shader // -------------------------------------------------------------------- + /* [maxvertexcount(4)] void geom(point v2g IN[1], inout TriangleStream triStream) { @@ -76,11 +104,11 @@ triStream.RestartStrip(); } - + */ // -------------------------------------------------------------------- // Fragment Shader // -------------------------------------------------------------------- - fixed4 frag(g2f input) : SV_Target { + fixed4 frag(v2f input) : SV_Target { return tex2D(_MainTex, input.tex)*_WaterColor; } @@ -97,7 +125,7 @@ CGPROGRAM #pragma target 5.0 #pragma vertex vert - #pragma geometry geom + //#pragma geometry geom #pragma fragment frag ENDCG } From acb5ca98fd33668627c0b95dcadb87fa7e2a3b8e Mon Sep 17 00:00:00 2001 From: Prin_E Date: Fri, 22 Mar 2019 02:45:29 +0900 Subject: [PATCH 2/3] Metal compatibility fix Removed comments right before kernel defines. --- Assets/BoidsSimulationOnGPU/ComputeShaders/Boids.compute | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/BoidsSimulationOnGPU/ComputeShaders/Boids.compute b/Assets/BoidsSimulationOnGPU/ComputeShaders/Boids.compute index 30491cb..97348ab 100644 --- a/Assets/BoidsSimulationOnGPU/ComputeShaders/Boids.compute +++ b/Assets/BoidsSimulationOnGPU/ComputeShaders/Boids.compute @@ -1,6 +1,6 @@ // カーネル関数を指定 -#pragma kernel ForceCS // 操舵力を計算 -#pragma kernel IntegrateCS // 速度, 位置を計算 +#pragma kernel ForceCS +#pragma kernel IntegrateCS // Boidデータの構造体 struct BoidData From 37b07c40396b4523211ba43f02f266cdea4547e7 Mon Sep 17 00:00:00 2001 From: Prin_E Date: Fri, 22 Mar 2019 02:45:53 +0900 Subject: [PATCH 3/3] Unity 2018.3.6 --- ProjectSettings/PresetManager.asset | 6 + ProjectSettings/ProjectSettings.asset | 261 +++++++++++++------------- ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | 11 ++ 4 files changed, 151 insertions(+), 129 deletions(-) create mode 100644 ProjectSettings/PresetManager.asset create mode 100644 ProjectSettings/VFXManager.asset diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..636a595 --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + m_DefaultList: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de19c1e..e8639af 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,9 +3,11 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 15 productGUID: 7e8c1682c6f8c20419b9c12cd5be28ec AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 + AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -15,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -38,8 +40,6 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_SplashScreenBackgroundLandscape: {fileID: 0} - m_SplashScreenBackgroundPortrait: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -49,11 +49,9 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - m_MobileMTRendering: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 2 iosAllowHTTPDownload: 1 @@ -63,14 +61,20 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 + preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 - defaultIsFullScreen: 1 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 0 + androidBlitType: 0 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 @@ -88,33 +92,26 @@ PlayerSettings: visibleInBackground: 1 allowFullscreenSwitch: 1 graphicsJobMode: 0 - macFullscreenMode: 2 - d3d9FullscreenMode: 1 - d3d11FullscreenMode: 1 + fullscreenMode: 2 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 - ignoreAlphaClear: 0 + metalFramebufferOnly: 0 xboxOneResolution: 0 + xboxOneSResolution: 0 + xboxOneXResolution: 3 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 - wiiUTVResolution: 0 - wiiUGamePadMSAA: 1 - wiiUSupportsNunchuk: 0 - wiiUSupportsClassicController: 0 - wiiUSupportsBalanceBoard: 0 - wiiUSupportsMotionPlus: 0 - wiiUSupportsProController: 0 - wiiUAllowScreenCapture: 1 - wiiUControllerCount: 0 + xboxOnePresentImmediateThreshold: 0 + switchQueueCommandMemory: 1048576 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -124,9 +121,11 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 + wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -134,12 +133,25 @@ PlayerSettings: daydream: depthFormat: 0 useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 + minimumSupportedHeadTracking: 0 + maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 + depthBufferSharingEnabled: 0 + oculus: + sharedDepthBuffer: 1 + dashSupport: 1 + enable360StereoCapture: 0 protectGraphicsMemory: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 - targetPixelDensity: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 30 resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 @@ -156,14 +168,12 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 + VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: + iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: + tvOSTargetOSVersionString: 9.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -176,15 +186,22 @@ PlayerSettings: iPhone47inSplashScreen: {fileID: 0} iPhone55inPortraitSplashScreen: {fileID: 0} iPhone55inLandscapeSplashScreen: {fileID: 0} + iPhone58inPortraitSplashScreen: {fileID: 0} + iPhone58inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} @@ -202,6 +219,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: + iOSUseLaunchScreenStoryboard: 0 + iOSLaunchScreenCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -212,15 +231,25 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 - AndroidTargetDevice: 0 + iOSRequireARKit: 0 + appleEnableProMotion: 0 + clonedFromGUID: 00000000000000000000000000000000 + templatePackageId: + templateDefaultScene: + AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 m_AndroidBanners: - width: 320 height: 180 @@ -228,32 +257,30 @@ PlayerSettings: androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] + m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: MacStandaloneSupport + m_APIs: 1000000011000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] + m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 - webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} - wiiUTitleID: 0005000011000000 - wiiUGroupID: 00010000 - wiiUCommonSaveSize: 4096 - wiiUAccountSaveSize: 2048 - wiiUOlvAccessKey: 0 - wiiUTinCode: 0 - wiiUJoinGameId: 0 - wiiUJoinGameModeMask: 0000000000000000 - wiiUCommonBossSize: 0 - wiiUAccountBossSize: 0 - wiiUAddOnUniqueIDs: [] - wiiUMainThreadStackSize: 3072 - wiiULoaderThreadStackSize: 1024 - wiiUSystemHeapSize: 128 - wiiUTVStartupScreen: {fileID: 0} - wiiUGamePadStartupScreen: {fileID: 0} - wiiUDrcBufferDisabled: 0 - wiiUProfilerLibPath: + mobileMTRendering: + iPhone: 1 + tvOS: 1 + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 1 + - m_BuildTarget: XboxOne + m_EncodingQuality: 1 + - m_BuildTarget: PS4 + m_EncodingQuality: 1 + m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 + runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -281,6 +308,9 @@ PlayerSettings: switchTitleNames_9: switchTitleNames_10: switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -293,6 +323,9 @@ PlayerSettings: switchPublisherNames_9: switchPublisherNames_10: switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -305,6 +338,9 @@ PlayerSettings: switchIcons_9: {fileID: 0} switchIcons_10: {fileID: 0} switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -317,6 +353,9 @@ PlayerSettings: switchSmallIcons_9: {fileID: 0} switchSmallIcons_10: {fileID: 0} switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -358,8 +397,15 @@ PlayerSettings: switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -389,6 +435,8 @@ PlayerSettings: ps4PronunciationSIGPath: ps4BackgroundImagePath: ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: ps4SaveDataImagePath: ps4SdkOverride: ps4BGMPath: @@ -413,6 +461,8 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -436,54 +486,6 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 0 - psmSplashimage: {fileID: 0} splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: @@ -497,8 +499,9 @@ PlayerSettings: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLUseWasm: 0 webGLCompressionFormat: 1 + webGLLinkerTarget: 1 + webGLThreadsSupport: 0 scriptingDefineSymbols: 1: CROSS_PLATFORM_INPUT 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT @@ -509,7 +512,10 @@ PlayerSettings: 22: MOBILE_INPUT platformArchitecture: {} scriptingBackend: {} + il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} + allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 apiCompatibilityLevelPerPlatform: {} @@ -525,11 +531,12 @@ PlayerSettings: metroApplicationDescription: UnityGraphicsProgramming wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} @@ -537,35 +544,11 @@ PlayerSettings: a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} + metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF - stvDeviceAddress: - stvProductDescription: - stvProductAuthor: - stvProductAuthorEmail: - stvProductLink: - stvProductCategory: 0 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -575,6 +558,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: @@ -588,17 +572,38 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 + XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 + XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: {} + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_PrivateKeyPath: + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: facebookSdkVersion: 7.9.4 + facebookAppId: + facebookCookies: 1 + facebookLogging: 1 + facebookStatus: 1 + facebookXfbml: 0 + facebookFrictionlessRequests: 1 apiCompatibilityLevel: 3 cloudProjectId: + framebufferDepthMemorylessMode: 0 projectName: organizationId: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a211ccd..1b2cd94 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.1f1 +m_EditorVersion: 2018.3.6f1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..6e0eaca --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05