From 02caa276b08d61e058c0684ee3be6ede0c47e20d Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Sat, 26 Jan 2019 03:11:19 +0200 Subject: [PATCH 1/6] Unity 2018.3.2f1 + Post Processing 2.1.2 + LWRP 4.8.0-preview --- Assets/Post-process LWRP AO/Runtime/LWRPAO.cs | 61 +++-- .../Post-process LWRP AO.Runtime.asmdef | 22 +- Assets/Post-process LWRP AO/package.json.meta | 7 + .../Test/Lightweight/Lightweight Scene.unity | 208 ++++++++++++------ .../Post-process Volume Profile.asset | 27 ++- Packages/manifest.json | 40 +++- ProjectSettings/EditorSettings.asset | 44 ++-- ProjectSettings/ProjectSettings.asset | 120 ++++------ ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | 11 + 10 files changed, 336 insertions(+), 206 deletions(-) create mode 100644 Assets/Post-process LWRP AO/package.json.meta create mode 100644 ProjectSettings/VFXManager.asset diff --git a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs index 976c39c..ca78e4d 100644 --- a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs +++ b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs @@ -1,7 +1,6 @@ using System; using System.Reflection; using UnityEngine; -using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; using UnityEngine.Rendering.PostProcessing; @@ -24,33 +23,48 @@ private enum Pass CompositionForward, DebugOverlay } + + private bool IsInitialized; + + private Type AmbientOcclusionRenderer; + private Type MultiScaleVO; private MethodInfo CastRendererMethod; - private MethodInfo PreparePropertySheetMethod; + private MethodInfo PreparePropertySheetMethod; + private MethodInfo GenerateAOMapMethod; + private MethodInfo SetResourcesMethod; + private MethodInfo GetMethod; private PostProcessResources PostProcessResources; private PropertySheet PropertySheet; private RenderTexture AmbientOnlyAO; + private RenderTargetIdentifier AmbientOnlyAOIdentifier; + + private Assembly PostProcessAssembly = Assembly.GetAssembly(typeof(PostProcessVolume)); + private void ResolveCastRendererMethod() { - if (CastRendererMethod != null && PreparePropertySheetMethod != null) + if (IsInitialized) { return; } - { - var m = typeof(PostProcessBundle).GetMethod("CastRenderer", BindingFlags.Instance | BindingFlags.NonPublic); - var method = m != null ? m.MakeGenericMethod(typeof(AmbientOcclusionRenderer)) : null; + + AmbientOcclusionRenderer = PostProcessAssembly.GetType("UnityEngine.Rendering.PostProcessing.AmbientOcclusionRenderer"); + MultiScaleVO = PostProcessAssembly.GetType("UnityEngine.Rendering.PostProcessing.MultiScaleVO"); + + GenerateAOMapMethod = MultiScaleVO.GetMethod("GenerateAOMap", BindingFlags.Public | BindingFlags.Instance); + SetResourcesMethod = MultiScaleVO.GetMethod("SetResources", BindingFlags.Public | BindingFlags.Instance); + GetMethod = AmbientOcclusionRenderer.GetMethod("Get", BindingFlags.Public | BindingFlags.Instance); - CastRendererMethod = method; - } - { - var m = typeof(MultiScaleVO).GetMethod("PreparePropertySheet", BindingFlags.Instance | BindingFlags.NonPublic); + CastRendererMethod = typeof(PostProcessBundle).GetMethod("CastRenderer", BindingFlags.Instance | BindingFlags.NonPublic) + .MakeGenericMethod(AmbientOcclusionRenderer); - PreparePropertySheetMethod = m; - } + PreparePropertySheetMethod = MultiScaleVO.GetMethod("PreparePropertySheet", BindingFlags.Instance | BindingFlags.NonPublic); + + IsInitialized = true; } - + private void SetResources(PostProcessResources resources) { PostProcessResources = resources; @@ -77,6 +91,8 @@ private void CheckAOTexture(PostProcessRenderContext context) enableRandomWrite = true }; AmbientOnlyAO.Create(); + + AmbientOnlyAOIdentifier = new RenderTargetIdentifier(AmbientOnlyAO); } } @@ -87,7 +103,7 @@ private void PushDebug(PostProcessRenderContext context) context.PushDebugOverlay(context.command, AmbientOnlyAO, PropertySheet, (int)Pass.DebugOverlay); } } - + public override void Render(PostProcessRenderContext ctx) { ResolveCastRendererMethod(); @@ -100,15 +116,14 @@ public override void Render(PostProcessRenderContext ctx) var aoSettings = (AmbientOcclusion) aoBundle.settings; if (aoSettings.IsEnabledAndSupported(ctx) && CastRendererMethod != null) { - var aoRenderer = (AmbientOcclusionRenderer) CastRendererMethod.Invoke(aoBundle, null); - var aoMethod = aoRenderer.Get(); - if (aoMethod is MultiScaleVO) + var aoRenderer = CastRendererMethod.Invoke(aoBundle, null); + var aoMethod = GetMethod.Invoke(aoRenderer, new object[0]); + + if (aoMethod.GetType() == MultiScaleVO) { - var msvo = (MultiScaleVO) aoMethod; - cmd.BeginSample("Ambient Occlusion"); - msvo.SetResources(ctx.resources); - PreparePropertySheetMethod.Invoke(msvo, new object[] { ctx }); + SetResourcesMethod.Invoke(aoMethod, new object[] {ctx.resources}); + PreparePropertySheetMethod.Invoke(aoMethod, new object[] { ctx }); SetResources(ctx.resources); PreparePropertySheet(ctx, aoSettings); @@ -124,8 +139,8 @@ public override void Render(PostProcessRenderContext ctx) new Vector3(RenderSettings.fogDensity, RenderSettings.fogStartDistance, RenderSettings.fogEndDistance) ); } - - msvo.GenerateAOMap(cmd, cam, AmbientOnlyAO, null, false); + + GenerateAOMapMethod.Invoke(aoMethod, new object[] {cmd, cam, AmbientOnlyAOIdentifier, null, false, false}); PushDebug(ctx); cmd.SetGlobalTexture(ShaderIDsMSVOcclusionTexture, AmbientOnlyAO); cmd.BlitFullscreenTriangle(ctx.source, ctx.destination); diff --git a/Assets/Post-process LWRP AO/Runtime/Post-process LWRP AO.Runtime.asmdef b/Assets/Post-process LWRP AO/Runtime/Post-process LWRP AO.Runtime.asmdef index eb789b4..e8231d2 100644 --- a/Assets/Post-process LWRP AO/Runtime/Post-process LWRP AO.Runtime.asmdef +++ b/Assets/Post-process LWRP AO/Runtime/Post-process LWRP AO.Runtime.asmdef @@ -1,7 +1,15 @@ -{ - "name": "Post-processLWRPAO", - "references": [ - "com.unity.render-pipelines.core.Runtime", - "com.unity.postprocessing.Runtime" - ] -} +{ + "name": "Post-processLWRPAO", + "references": [ + "Unity.RenderPipelines.Core.Runtime", + "Unity.Postprocessing.Runtime" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [] +} \ No newline at end of file diff --git a/Assets/Post-process LWRP AO/package.json.meta b/Assets/Post-process LWRP AO/package.json.meta new file mode 100644 index 0000000..091964d --- /dev/null +++ b/Assets/Post-process LWRP AO/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e437b90805a4fb94d854ac243605addf +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Test/Lightweight/Lightweight Scene.unity b/Assets/Test/Lightweight/Lightweight Scene.unity index 5ea86a8..408d909 100644 --- a/Assets/Test/Lightweight/Lightweight Scene.unity +++ b/Assets/Test/Lightweight/Lightweight Scene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1526980366} - m_IndirectSpecularColor: {r: 0.18378657, g: 0.22912724, b: 0.30429944, a: 1} + m_IndirectSpecularColor: {r: 0.18378711, g: 0.22912776, b: 0.30430067, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -116,15 +115,15 @@ NavMeshSettings: --- !u!1 &282840810 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: 282840814} - component: {fileID: 282840813} - component: {fileID: 282840811} - component: {fileID: 282840812} - - component: {fileID: 282840815} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -135,15 +134,17 @@ GameObject: --- !u!81 &282840811 AudioListener: 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: 282840810} m_Enabled: 1 --- !u!114 &282840812 MonoBehaviour: 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: 282840810} m_Enabled: 1 m_EditorHideFlags: 0 @@ -155,6 +156,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 256 stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 antialiasingMode: 0 temporalAntialiasing: jitterSpread: 0.75 @@ -185,6 +187,7 @@ MonoBehaviour: size: 256 exposure: 0.12 overlaySettings: + linearDepth: 0 motionColorIntensity: 4 motionGridSize: 64 colorBlindnessType: 0 @@ -197,19 +200,23 @@ MonoBehaviour: - assemblyQualifiedName: LWRPAO, Post-processLWRPAO, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_BeforeStackBundles: [] - m_AfterStackBundles: - - assemblyQualifiedName: FFmpegOut.PostProcessingCameraCapture, FFmpegOut, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null + m_AfterStackBundles: [] --- !u!20 &282840813 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: 282840810} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.53453183, g: 0.7924528, b: 0.7189336, 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 @@ -239,8 +246,9 @@ Camera: --- !u!4 &282840814 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: 282840810} m_LocalRotation: {x: -0.12819433, y: 0.33225256, z: 0.04563643, w: 0.93332297} m_LocalPosition: {x: -10.837406, y: -4.1183395, z: -7.7272115} @@ -250,32 +258,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &282840815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 282840810} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a66fbd5ffe9b9d64da304996f1919f40, type: 3} - m_Name: - m_EditorClassIdentifier: - _setResolution: 1 - _width: 720 - _height: 720 - _frameRate: 60 - _allowSlowDown: 1 - _preset: 0 - _startTime: 0 - _recordLength: 10 - _shader: {fileID: 4800000, guid: a4bd3b00ad1ed53458ec6ff07694985e, type: 3} --- !u!1 &1063081793 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: 1063081796} - component: {fileID: 1063081795} @@ -289,10 +278,11 @@ GameObject: m_IsActive: 1 --- !u!199 &1063081794 ParticleSystemRenderer: - serializedVersion: 5 + 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_GameObject: {fileID: 1063081793} m_Enabled: 1 m_CastShadows: 1 @@ -302,6 +292,7 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: bf28ac421af4a4c32baf505e8133dce4, type: 2} - {fileID: 0} @@ -333,10 +324,14 @@ ParticleSystemRenderer: m_LengthScale: 2 m_SortingFudge: 0 m_NormalDirection: 1 + m_ShadowBias: 0 m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 0 + m_AllowRoll: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} @@ -346,13 +341,17 @@ ParticleSystemRenderer: --- !u!198 &1063081795 ParticleSystem: 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: 1063081793} - serializedVersion: 5 + serializedVersion: 6 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 + cullingMode: 3 + ringBufferMode: 0 + ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 playOnAwake: 1 @@ -964,7 +963,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 5 + serializedVersion: 6 enabled: 1 type: 5 angle: 25 @@ -978,9 +977,67 @@ ParticleSystem: placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 + m_MeshSpawn: + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 m_Mesh: {fileID: 0} m_MeshRenderer: {fileID: 0} m_SkinnedMeshRenderer: {fileID: 0} + m_Sprite: {fileID: 0} + m_SpriteRenderer: {fileID: 0} m_UseMeshMaterialIndex: 0 m_UseMeshColors: 1 alignToDirection: 0 @@ -1629,6 +1686,8 @@ ParticleSystem: UVModule: enabled: 0 mode: 0 + timeMode: 0 + fps: 30 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -1735,17 +1794,18 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + speedRange: {x: 0, y: 1} tilesX: 1 tilesY: 1 animationType: 0 rowIndex: 0 cycles: 1 uvChannelMask: -1 - flipU: 0 - flipV: 0 randomRow: 1 sprites: - sprite: {fileID: 0} + flipU: 0 + flipV: 0 VelocityModule: enabled: 0 x: @@ -2554,6 +2614,11 @@ ParticleSystem: ExternalForcesModule: enabled: 0 multiplier: 1 + influenceFilter: 0 + influenceMask: + serializedVersion: 2 + m_Bits: 4294967295 + influenceList: [] ClampVelocityModule: enabled: 0 x: @@ -3961,10 +4026,11 @@ ParticleSystem: serializedVersion: 2 enabled: 0 subEmitters: - - serializedVersion: 2 + - serializedVersion: 3 emitter: {fileID: 0} type: 0 properties: 0 + emitProbability: 1 LightsModule: enabled: 0 ratio: 0 @@ -4140,6 +4206,7 @@ ParticleSystem: minVertexDistance: 0.2 textureMode: 0 ribbonCount: 1 + shadowBias: 0.5 worldSpace: 0 dieWithParticles: 1 sizeAffectsWidth: 1 @@ -4147,6 +4214,7 @@ ParticleSystem: inheritParticleColor: 1 generateLightingData: 0 splitSubEmitterRibbons: 0 + attachRibbonsToTransform: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -4895,8 +4963,9 @@ ParticleSystem: --- !u!4 &1063081796 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: 1063081793} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4908,9 +4977,10 @@ Transform: --- !u!1 &1526980365 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: 1526980367} - component: {fileID: 1526980366} @@ -4924,8 +4994,9 @@ GameObject: --- !u!108 &1526980366 Light: 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: 1526980365} m_Enabled: 1 serializedVersion: 8 @@ -4951,6 +5022,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -4960,8 +5032,9 @@ Light: --- !u!4 &1526980367 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: 1526980365} m_LocalRotation: {x: 0.24742907, y: -0.47964713, z: 0.11895277, w: 0.83340734} m_LocalPosition: {x: 0, y: 3, z: 0} @@ -4973,9 +5046,10 @@ Transform: --- !u!1 &1862272562 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: 1862272563} - component: {fileID: 1862272564} @@ -4989,8 +5063,9 @@ GameObject: --- !u!4 &1862272563 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: 1862272562} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5002,8 +5077,9 @@ Transform: --- !u!114 &1862272564 MonoBehaviour: 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: 1862272562} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Assets/Test/Lightweight/Post-process Volume Profile.asset b/Assets/Test/Lightweight/Post-process Volume Profile.asset index b9a9182..e78dcb8 100644 --- a/Assets/Test/Lightweight/Post-process Volume Profile.asset +++ b/Assets/Test/Lightweight/Post-process Volume Profile.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: 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: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -15,12 +16,12 @@ MonoBehaviour: - {fileID: 114298231876092106} - {fileID: 114263866692197818} - {fileID: 114676672515457720} - - {fileID: 114465254252225856} --- !u!114 &114263866692197818 MonoBehaviour: m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -55,14 +56,16 @@ MonoBehaviour: mask: overrideState: 0 value: {fileID: 0} + defaultState: 1 opacity: overrideState: 0 value: 1 --- !u!114 &114298231876092106 MonoBehaviour: m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -109,8 +112,9 @@ MonoBehaviour: --- !u!114 &114465254252225856 MonoBehaviour: m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -124,8 +128,9 @@ MonoBehaviour: --- !u!114 &114676672515457720 MonoBehaviour: m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index fd39672..dece1fe 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,43 @@ { "dependencies": { - "com.unity.render-pipelines.lightweight": "1.1.2-preview" + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.3", + "com.unity.postprocessing": "2.1.2", + "com.unity.purchasing": "2.0.3", + "com.unity.render-pipelines.core": "4.8.0-preview", + "com.unity.render-pipelines.lightweight": "4.8.0-preview", + "com.unity.textmeshpro": "1.3.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" } } diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 78c18ac..de17694 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -1,21 +1,23 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!159 &1 -EditorSettings: - m_ObjectHideFlags: 0 - serializedVersion: 7 - m_ExternalVersionControlSupport: Visible Meta Files - m_SerializationMode: 2 - m_LineEndingsForNewScripts: 2 - m_DefaultBehaviorMode: 0 - m_SpritePackerMode: 0 - m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 1 - m_EtcTextureFastCompressor: 1 - m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd - m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: - m_CollabEditorSettings: - inProgressEnabled: 1 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!159 &1 +EditorSettings: + m_ObjectHideFlags: 0 + serializedVersion: 7 + m_ExternalVersionControlSupport: Visible Meta Files + m_SerializationMode: 2 + m_LineEndingsForNewScripts: 2 + m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} + m_SpritePackerMode: 0 + m_SpritePackerPaddingPower: 1 + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 4 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef + m_ProjectGenerationRootNamespace: + m_CollabEditorSettings: + inProgressEnabled: 1 + m_EnableTextureStreamingInPlayMode: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 23ee83b..c359346 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 iosAllowHTTPDownload: 1 @@ -64,6 +63,8 @@ PlayerSettings: use32BitDisplayBuffer: 1 preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -97,9 +98,6 @@ PlayerSettings: xboxEnableGuest: 0 xboxEnablePIXSampling: 0 metalFramebufferOnly: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 @@ -108,9 +106,7 @@ PlayerSettings: xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 + vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -124,6 +120,7 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -138,11 +135,12 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 - enable360StereoCapture: 0 oculus: sharedDepthBuffer: 0 dashSupport: 0 + enable360StereoCapture: 0 protectGraphicsMemory: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 @@ -167,7 +165,7 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 8.0 + iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 9.0 @@ -228,6 +226,8 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 appleEnableProMotion: 0 @@ -239,6 +239,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 @@ -275,6 +276,7 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -396,7 +398,11 @@ PlayerSettings: switchAllowsVideoCapturing: 1 switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -453,6 +459,7 @@ PlayerSettings: ps4pnGameCustomData: 1 playerPrefsSupport: 0 enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -476,53 +483,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 splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: @@ -538,11 +498,13 @@ PlayerSettings: webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 webGLLinkerTarget: 0 + webGLThreadsSupport: 0 scriptingDefineSymbols: 1: UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2 + 14: UNITY_POST_PROCESSING_STACK_V2 17: UNITY_POST_PROCESSING_STACK_V2 18: UNITY_POST_PROCESSING_STACK_V2 19: UNITY_POST_PROCESSING_STACK_V2 @@ -552,9 +514,11 @@ PlayerSettings: 25: UNITY_POST_PROCESSING_STACK_V2 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 + 28: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: @@ -572,11 +536,12 @@ PlayerSettings: metroApplicationDescription: Template_3D 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} @@ -584,29 +549,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 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -616,6 +563,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: @@ -631,17 +579,37 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 + XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: UNet: 1 + 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: 2 cloudProjectId: + framebufferDepthMemorylessMode: 0 projectName: Template_3D organizationId: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 77a649c..78fa540 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.0b12 +m_EditorVersion: 2018.3.2f1 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 From 4dc3c6c73f6847974a00e37ee5ce0c4f01237b73 Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Sun, 3 Feb 2019 15:25:28 +0200 Subject: [PATCH 2/6] Fixed editor black screen --- Assets/Post-process LWRP AO/Runtime/LWRPAO.cs | 1 - Packages/manifest.json | 6 +++--- ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs index ca78e4d..047d5f6 100644 --- a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs +++ b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs @@ -143,7 +143,6 @@ public override void Render(PostProcessRenderContext ctx) GenerateAOMapMethod.Invoke(aoMethod, new object[] {cmd, cam, AmbientOnlyAOIdentifier, null, false, false}); PushDebug(ctx); cmd.SetGlobalTexture(ShaderIDsMSVOcclusionTexture, AmbientOnlyAO); - cmd.BlitFullscreenTriangle(ctx.source, ctx.destination); cmd.BlitFullscreenTriangle(BuiltinRenderTextureType.None, ctx.destination, PropertySheet, (int)Pass.CompositionForward); cmd.EndSample("Ambient Occlusion"); } diff --git a/Packages/manifest.json b/Packages/manifest.json index dece1fe..76869b7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,10 +4,10 @@ "com.unity.analytics": "3.2.2", "com.unity.collab-proxy": "1.2.15", "com.unity.package-manager-ui": "2.0.3", - "com.unity.postprocessing": "2.1.2", + "com.unity.postprocessing": "2.1.3", "com.unity.purchasing": "2.0.3", - "com.unity.render-pipelines.core": "4.8.0-preview", - "com.unity.render-pipelines.lightweight": "4.8.0-preview", + "com.unity.render-pipelines.core": "4.9.0-preview", + "com.unity.render-pipelines.lightweight": "4.9.0-preview", "com.unity.textmeshpro": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78fa540..1816da4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.2f1 +m_EditorVersion: 2018.3.4f1 From 722913c36ae87b60b87c17c59fdd8ea4230aa4ea Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Tue, 19 Feb 2019 23:00:20 +0200 Subject: [PATCH 3/6] Fix for IOS --- Assets/Post-process LWRP AO/Runtime/LWRPAO.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs index 047d5f6..3becb51 100644 --- a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs +++ b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs @@ -143,6 +143,11 @@ public override void Render(PostProcessRenderContext ctx) GenerateAOMapMethod.Invoke(aoMethod, new object[] {cmd, cam, AmbientOnlyAOIdentifier, null, false, false}); PushDebug(ctx); cmd.SetGlobalTexture(ShaderIDsMSVOcclusionTexture, AmbientOnlyAO); + + #if !UNITY_EDITOR && UNITY_IOS + cmd.BlitFullscreenTriangle(ctx.source, ctx.destination); + #endif + cmd.BlitFullscreenTriangle(BuiltinRenderTextureType.None, ctx.destination, PropertySheet, (int)Pass.CompositionForward); cmd.EndSample("Ambient Occlusion"); } From 6bc42ce42d24ca0c917434782d89f6b9ab76475c Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Thu, 23 May 2019 00:11:23 +0300 Subject: [PATCH 4/6] Unity 2019.1.3f1 + Post Processing 2.1.6 + LWRP 5.7.2 --- Assets/Post-process LWRP AO/Runtime/LWRPAO.cs | 4 +- Packages/manifest.json | 19 +++--- ProjectSettings/ProjectSettings.asset | 40 ++++++++--- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/UnityConnectSettings.asset | 68 +++++++++---------- ProjectSettings/XRSettings.asset | 10 +++ 6 files changed, 89 insertions(+), 55 deletions(-) create mode 100644 ProjectSettings/XRSettings.asset diff --git a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs index 3becb51..00415c8 100644 --- a/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs +++ b/Assets/Post-process LWRP AO/Runtime/LWRPAO.cs @@ -5,7 +5,7 @@ using UnityEngine.Rendering.PostProcessing; [Serializable] -[PostProcess(typeof(LWRPAORenderer), PostProcessEvent.BeforeTransparent, "Custom/LWRP Ambient Occlusion")] +[PostProcess(typeof(LWRPAORenderer), PostProcessEvent.BeforeStack, "Custom/LWRP Ambient Occlusion")] public sealed class LWRPAO : PostProcessEffectSettings { } @@ -144,9 +144,7 @@ public override void Render(PostProcessRenderContext ctx) PushDebug(ctx); cmd.SetGlobalTexture(ShaderIDsMSVOcclusionTexture, AmbientOnlyAO); - #if !UNITY_EDITOR && UNITY_IOS cmd.BlitFullscreenTriangle(ctx.source, ctx.destination); - #endif cmd.BlitFullscreenTriangle(BuiltinRenderTextureType.None, ctx.destination, PropertySheet, (int)Pass.CompositionForward); cmd.EndSample("Ambient Occlusion"); diff --git a/Packages/manifest.json b/Packages/manifest.json index 76869b7..e3fb3d6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,17 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.3", - "com.unity.postprocessing": "2.1.3", - "com.unity.purchasing": "2.0.3", - "com.unity.render-pipelines.core": "4.9.0-preview", - "com.unity.render-pipelines.lightweight": "4.9.0-preview", - "com.unity.textmeshpro": "1.3.0", + "com.unity.analytics": "3.3.2", + "com.unity.collab-proxy": "1.2.16", + "com.unity.multiplayer-hlapi": "1.0.2", + "com.unity.package-manager-ui": "2.1.2", + "com.unity.postprocessing": "2.1.6", + "com.unity.purchasing": "2.0.6", + "com.unity.render-pipelines.core": "5.7.2", + "com.unity.render-pipelines.lightweight": "5.7.2", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.0.2", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c359346..3a9ec21 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 16 productGUID: 17406f3e7ee404c0d84f085d39d47282 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -65,7 +65,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 - androidBlitType: 0 + androidBlitType: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -106,6 +106,11 @@ PlayerSettings: xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 @@ -120,7 +125,6 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -135,10 +139,17 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 0 dashSupport: 0 enable360StereoCapture: 0 + isWsaHolographicRemotingEnabled: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 @@ -187,6 +198,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -230,6 +245,7 @@ PlayerSettings: tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 clonedFromGUID: 56e7a2d3a00f33d44bdd161b773c35b5 templatePackageId: com.unity.3d@1.0.0 @@ -237,7 +253,7 @@ PlayerSettings: AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 @@ -245,6 +261,7 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 @@ -270,6 +287,7 @@ PlayerSettings: m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -399,6 +417,7 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 @@ -452,6 +471,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -499,6 +519,7 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 0 webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: 1: UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 @@ -522,7 +543,9 @@ PlayerSettings: incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -553,7 +576,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -578,7 +600,7 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 + xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -592,7 +614,7 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 @@ -604,7 +626,7 @@ PlayerSettings: facebookStatus: 1 facebookXfbml: 0 facebookFrictionlessRequests: 1 - apiCompatibilityLevel: 2 + apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0 projectName: Template_3D diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1816da4..ead9cf2 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.4f1 +m_EditorVersion: 2019.1.3f1 +m_EditorVersionWithRevision: 2019.1.3f1 (dc414eb9ed43) diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 9b1020b..06db74a 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -1,34 +1,34 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!310 &1 -UnityConnectSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: - m_TestInitMode: 0 - CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate - m_Enabled: 0 - m_CaptureEditorExceptions: 1 - UnityPurchasingSettings: - m_Enabled: 0 - m_TestMode: 0 - UnityAnalyticsSettings: - m_Enabled: 1 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: - UnityAdsSettings: - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_IosGameId: - m_AndroidGameId: - m_GameIds: {} - m_GameId: - PerformanceReportingSettings: - m_Enabled: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 1 + m_Enabled: 1 + m_TestMode: 0 + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_TestInitMode: 0 + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com + m_Enabled: 0 + m_LogBufferSize: 10 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 1 + m_TestMode: 0 + m_InitializeOnStartup: 1 + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_IosGameId: + m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file From 390e578cce878d07a6846cdcc3f6dc3c34406a4a Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Sun, 14 Jul 2019 22:50:20 +0300 Subject: [PATCH 5/6] Unity 2019.1.10f1 + Post Processing 2.1.7 + LWRP 5.7.2 --- Packages/manifest.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index e3fb3d6..31415ae 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.collab-proxy": "1.2.16", "com.unity.multiplayer-hlapi": "1.0.2", "com.unity.package-manager-ui": "2.1.2", - "com.unity.postprocessing": "2.1.6", + "com.unity.postprocessing": "2.1.7", "com.unity.purchasing": "2.0.6", "com.unity.render-pipelines.core": "5.7.2", "com.unity.render-pipelines.lightweight": "5.7.2", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ead9cf2..93895bd 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.1.3f1 -m_EditorVersionWithRevision: 2019.1.3f1 (dc414eb9ed43) +m_EditorVersion: 2019.1.10f1 +m_EditorVersionWithRevision: 2019.1.10f1 (f007ed779b7a) From 327f96a74634bf52ecf17ecfc0e009f6b61ecdd5 Mon Sep 17 00:00:00 2001 From: PinkPanter Date: Sat, 5 Oct 2019 01:49:22 +0300 Subject: [PATCH 6/6] Unity 2019.2.8f1 + Post Processing 2.1.7 + LWRP 6.9.1 --- Assets/Test/Lightweight/Cube Lightweight.mat | 32 +++++++++++++++++--- Packages/manifest.json | 19 ++++++++---- ProjectSettings/ProjectSettings.asset | 18 ++++++++--- ProjectSettings/ProjectVersion.txt | 4 +-- 4 files changed, 57 insertions(+), 16 deletions(-) diff --git a/Assets/Test/Lightweight/Cube Lightweight.mat b/Assets/Test/Lightweight/Cube Lightweight.mat index 3e4e924..51c629d 100644 --- a/Assets/Test/Lightweight/Cube Lightweight.mat +++ b/Assets/Test/Lightweight/Cube Lightweight.mat @@ -4,20 +4,26 @@ 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: Cube Lightweight m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -66,6 +72,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -73,6 +80,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -81,6 +91,20 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &200326388708793063 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 31415ae..09a75d2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,25 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.3.2", "com.unity.collab-proxy": "1.2.16", - "com.unity.multiplayer-hlapi": "1.0.2", - "com.unity.package-manager-ui": "2.1.2", + "com.unity.ext.nunit": "1.0.0", + "com.unity.ide.vscode": "1.1.2", + "com.unity.multiplayer-hlapi": "1.0.4", + "com.unity.package-manager-ui": "2.2.0", "com.unity.postprocessing": "2.1.7", "com.unity.purchasing": "2.0.6", - "com.unity.render-pipelines.core": "5.7.2", - "com.unity.render-pipelines.lightweight": "5.7.2", + "com.unity.render-pipelines.core": "6.9.1", + "com.unity.render-pipelines.lightweight": "6.9.1", + "com.unity.test-framework": "1.0.18", "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.0.2", + "com.unity.timeline": "1.1.0", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.0.6", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3a9ec21..b18f4e3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 16 + serializedVersion: 18 productGUID: 17406f3e7ee404c0d84f085d39d47282 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,8 +52,8 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -65,6 +65,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -79,6 +80,7 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games @@ -148,6 +150,9 @@ PlayerSettings: oculus: sharedDepthBuffer: 0 dashSupport: 0 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 protectGraphicsMemory: 0 @@ -267,6 +272,8 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] @@ -284,10 +291,10 @@ PlayerSettings: m_Devices: - Oculus - OpenVR - m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 + vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -505,6 +512,7 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -536,8 +544,10 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 93895bd..3e24348 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.1.10f1 -m_EditorVersionWithRevision: 2019.1.10f1 (f007ed779b7a) +m_EditorVersion: 2019.2.8f1 +m_EditorVersionWithRevision: 2019.2.8f1 (ff5b465c8d13)