浏览代码

Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPPCopy

/main
Julien Ignace 6 年前
当前提交
e93b061e
共有 28 个文件被更改,包括 134 次插入103 次删除
  1. 19
      TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Scripts/Editor/HDRP_Tests_Editor.asmdef
  2. 13
      TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Scripts/HDRP_Tests.asmdef
  3. 13
      TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/HDRP_TestRunner.asmdef
  4. 1
      com.unity.render-pipelines.high-definition/CHANGELOG.md
  5. 2
      com.unity.render-pipelines.high-definition/package.json
  6. 1
      com.unity.render-pipelines.lightweight/CHANGELOG.md
  7. 2
      com.unity.render-pipelines.lightweight/package.json
  8. 8
      com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/Unity.RenderPipelines.Core.IncludePaths.asmdef
  9. 16
      com.unity.render-pipelines.core/CoreRP/Editor/Unity.RenderPipelines.Core.Editor.asmdef
  10. 7
      com.unity.render-pipelines.core/CoreRP/Unity.RenderPipelines.Core.Runtime.asmdef
  11. 21
      com.unity.render-pipelines.high-definition/HDRP/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef
  12. 15
      com.unity.render-pipelines.high-definition/HDRP/Unity.RenderPipelines.HighDefinition.Runtime.asmdef
  13. 21
      com.unity.render-pipelines.lightweight/LWRP/Editor/Unity.RenderPipelines.Lightweight.Editor.asmdef
  14. 15
      com.unity.render-pipelines.lightweight/LWRP/Unity.RenderPipelines.Lightweight.Runtime.asmdef
  15. 8
      com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/com.unity.render-pipelines.core.IncludePaths.asmdef
  16. 12
      com.unity.render-pipelines.core/CoreRP/Editor/com.unity.render-pipelines.core.Editor.asmdef
  17. 7
      com.unity.render-pipelines.core/CoreRP/com.unity.render-pipelines.core.Runtime.asmdef
  18. 17
      com.unity.render-pipelines.high-definition/HDRP/Editor/com.unity.render-pipelines.high-definition.Editor.asmdef
  19. 11
      com.unity.render-pipelines.high-definition/HDRP/com.unity.render-pipelines.high-definition.Runtime.asmdef
  20. 17
      com.unity.render-pipelines.lightweight/LWRP/Editor/com.unity.render-pipelines.lightweight.Editor.asmdef
  21. 11
      com.unity.render-pipelines.lightweight/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef
  22. 0
      /com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/Unity.RenderPipelines.Core.IncludePaths.asmdef.meta
  23. 0
      /com.unity.render-pipelines.core/CoreRP/Editor/Unity.RenderPipelines.Core.Editor.asmdef.meta
  24. 0
      /com.unity.render-pipelines.core/CoreRP/Unity.RenderPipelines.Core.Runtime.asmdef.meta
  25. 0
      /com.unity.render-pipelines.high-definition/HDRP/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef.meta
  26. 0
      /com.unity.render-pipelines.high-definition/HDRP/Unity.RenderPipelines.HighDefinition.Runtime.asmdef.meta
  27. 0
      /com.unity.render-pipelines.lightweight/LWRP/Editor/Unity.RenderPipelines.Lightweight.Editor.asmdef.meta
  28. 0
      /com.unity.render-pipelines.lightweight/LWRP/Unity.RenderPipelines.Lightweight.Runtime.asmdef.meta

19
TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Scripts/Editor/HDRP_Tests_Editor.asmdef


{
"name": "HDRP_Tests_Editor",
"references": [
"com.unity.postprocessing.Editor",
"com.unity.render-pipelines.core.Editor",
"com.unity.render-pipelines.high-defintion.Editor",
"Unity.RenderPipelines.Core.Runtime",
"Unity.RenderPipelines.Core.Editor",
"Unity.Postprocessing.Runtime",
"com.unity.postprocessing.Runtime",
"com.unity.render-pipelines.core.IncludePaths",
"com.unity.render-pipelines.core.Runtime",
"com.unity.render-pipelines.high-definition.Runtime"
"Unity.Postprocessing.Editor",
"Unity.RenderPipelines.HighDefinition.Runtime",
"Unity.RenderPipelines.HighDefinition.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [

"allowUnsafeCode": false
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

13
TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Scripts/HDRP_Tests.asmdef


{
"name": "HDRP_Tests",
"references": [
"com.unity.postprocessing.Runtime",
"com.unity.render-pipelines.core.IncludePaths",
"com.unity.render-pipelines.core.Runtime",
"com.unity.render-pipelines.high-definition.Runtime",
"Unity.RenderPipelines.Core.Runtime",
"Unity.Postprocessing.Runtime",
"Unity.RenderPipelines.HighDefinition.Runtime",
"allowUnsafeCode": false
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

13
TestProjects/HDRP_Tests/Assets/GraphicTests/Common/TestRunner/HDRP_TestRunner.asmdef


{
"name": "HDRP_TestRunner",
"references": [
"com.unity.postprocessing.Runtime",
"com.unity.render-pipelines.core.IncludePaths",
"com.unity.render-pipelines.core.Runtime",
"com.unity.render-pipelines.high-definition.Runtime",
"Unity.RenderPipelines.HighDefinition.Runtime",
"Unity.Postprocessing.Runtime",
"Unity.RenderPipelines.Core.Runtime",
"UnityEngine.TestTools.Graphics"
],
"optionalUnityReferences": [

"excludePlatforms": [],
"allowUnsafeCode": false
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

1
com.unity.render-pipelines.high-definition/CHANGELOG.md


### Added
- Added support for RendererPriority on Renderer. This allow to control order of transparent rendering manually. HDRP have now two stage of sorting for transparent in addition to bact to front. Material have a priority then Renderer have a priority.
- Add Coupling of (HD)Camera and HDAdditionalCameraData for reset and remove in inspector contextual menu of Camera
- Update assembly definitions to output assemblies that match Unity naming convention (Unity.*).
### Fixed
- Fixed an issue with distortion that was using previous frame instead of current frame

2
com.unity.render-pipelines.high-definition/package.json


"unity": "2018.2",
"displayName": "HD Render Pipeline",
"dependencies": {
"com.unity.postprocessing": "2.0.7-preview",
"com.unity.postprocessing": "2.0.9-preview",
"com.unity.render-pipelines.core": "3.0.0-preview",
"com.unity.shadergraph": "3.0.0-preview"
}

1
com.unity.render-pipelines.lightweight/CHANGELOG.md


- Removed 7x7 tent filtering when using cascades.
- Screenspace shadow resolve is now only done when rendering shadow cascades.
- Updated the UI for the Lighweight pipeline asset.
- Update assembly definitions to output assemblies that match Unity naming convention (Unity.*).
### Fixed
- Post-processing now works with VR on PC.

2
com.unity.render-pipelines.lightweight/package.json


"unity": "2018.2",
"displayName": "Lightweight Render Pipeline",
"dependencies": {
"com.unity.postprocessing": "2.0.7-preview",
"com.unity.postprocessing": "2.0.9-preview",
"com.unity.render-pipelines.core": "3.0.0-preview",
"com.unity.shadergraph": "3.0.0-preview"
}

8
com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/Unity.RenderPipelines.Core.IncludePaths.asmdef


{
"name": "Unity.RenderPipelines.Core.IncludePaths",
"references": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": []
}

16
com.unity.render-pipelines.core/CoreRP/Editor/Unity.RenderPipelines.Core.Editor.asmdef


{
"name": "Unity.RenderPipelines.Core.Editor",
"references": [
"Unity.RenderPipelines.Core.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

7
com.unity.render-pipelines.core/CoreRP/Unity.RenderPipelines.Core.Runtime.asmdef


{
"name": "Unity.RenderPipelines.Core.Runtime",
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true
}

21
com.unity.render-pipelines.high-definition/HDRP/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef


{
"name": "Unity.RenderPipelines.HighDefinition.Editor",
"references": [
"Unity.RenderPipelines.HighDefinition.Runtime",
"Unity.Postprocessing.Runtime",
"Unity.ShaderGraph.Editor",
"Unity.Postprocessing.Editor",
"Unity.RenderPipelines.Core.Runtime",
"Unity.RenderPipelines.Core.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

15
com.unity.render-pipelines.high-definition/HDRP/Unity.RenderPipelines.HighDefinition.Runtime.asmdef


{
"name": "Unity.RenderPipelines.HighDefinition.Runtime",
"references": [
"Unity.RenderPipelines.Core.Runtime",
"Unity.Postprocessing.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

21
com.unity.render-pipelines.lightweight/LWRP/Editor/Unity.RenderPipelines.Lightweight.Editor.asmdef


{
"name": "Unity.RenderPipelines.Lightweight.Editor",
"references": [
"Unity.RenderPipelines.Lightweight.Runtime",
"Unity.Postprocessing.Runtime",
"Unity.Postprocessing.Editor",
"Unity.RenderPipelines.Core.Runtime",
"Unity.RenderPipelines.Core.Editor",
"Unity.ShaderGraph.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

15
com.unity.render-pipelines.lightweight/LWRP/Unity.RenderPipelines.Lightweight.Runtime.asmdef


{
"name": "Unity.RenderPipelines.Lightweight.Runtime",
"references": [
"Unity.Postprocessing.Runtime",
"Unity.RenderPipelines.Core.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

8
com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/com.unity.render-pipelines.core.IncludePaths.asmdef


{
"name": "com.unity.render-pipelines.core.IncludePaths",
"references": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": []
}

12
com.unity.render-pipelines.core/CoreRP/Editor/com.unity.render-pipelines.core.Editor.asmdef


{
"name": "com.unity.render-pipelines.core.Editor",
"references": [
"com.unity.render-pipelines.core.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true
}

7
com.unity.render-pipelines.core/CoreRP/com.unity.render-pipelines.core.Runtime.asmdef


{
"name": "com.unity.render-pipelines.core.Runtime",
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true
}

17
com.unity.render-pipelines.high-definition/HDRP/Editor/com.unity.render-pipelines.high-definition.Editor.asmdef


{
"name": "com.unity.render-pipelines.high-defintion.Editor",
"references": [
"com.unity.render-pipelines.core.Runtime",
"com.unity.render-pipelines.core.Editor",
"com.unity.render-pipelines.high-definition.Runtime",
"com.unity.postprocessing.Runtime",
"com.unity.postprocessing.Editor",
"Unity.ShaderGraph.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true
}

11
com.unity.render-pipelines.high-definition/HDRP/com.unity.render-pipelines.high-definition.Runtime.asmdef


{
"name": "com.unity.render-pipelines.high-definition.Runtime",
"references": [
"com.unity.render-pipelines.core.Runtime",
"com.unity.postprocessing.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true
}

17
com.unity.render-pipelines.lightweight/LWRP/Editor/com.unity.render-pipelines.lightweight.Editor.asmdef


{
"name": "com.unity.render-pipelines.lightweight.Editor",
"references": [
"com.unity.render-pipelines.core.Runtime",
"com.unity.render-pipelines.core.Editor",
"com.unity.render-pipelines.lightweight.Runtime",
"com.unity.postprocessing.Runtime",
"com.unity.postprocessing.Editor",
"Unity.ShaderGraph.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": true
}

11
com.unity.render-pipelines.lightweight/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef


{
"name": "com.unity.render-pipelines.lightweight.Runtime",
"references": [
"com.unity.render-pipelines.core.Runtime",
"com.unity.postprocessing.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true
}

/com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/com.unity.render-pipelines.core.IncludePaths.asmdef.meta → /com.unity.render-pipelines.core/CoreRP/Editor/IncludePaths/Unity.RenderPipelines.Core.IncludePaths.asmdef.meta

/com.unity.render-pipelines.core/CoreRP/Editor/com.unity.render-pipelines.core.Editor.asmdef.meta → /com.unity.render-pipelines.core/CoreRP/Editor/Unity.RenderPipelines.Core.Editor.asmdef.meta

/com.unity.render-pipelines.core/CoreRP/com.unity.render-pipelines.core.Runtime.asmdef.meta → /com.unity.render-pipelines.core/CoreRP/Unity.RenderPipelines.Core.Runtime.asmdef.meta

/com.unity.render-pipelines.high-definition/HDRP/Editor/com.unity.render-pipelines.high-definition.Editor.asmdef.meta → /com.unity.render-pipelines.high-definition/HDRP/Editor/Unity.RenderPipelines.HighDefinition.Editor.asmdef.meta

/com.unity.render-pipelines.high-definition/HDRP/com.unity.render-pipelines.high-definition.Runtime.asmdef.meta → /com.unity.render-pipelines.high-definition/HDRP/Unity.RenderPipelines.HighDefinition.Runtime.asmdef.meta

/com.unity.render-pipelines.lightweight/LWRP/Editor/com.unity.render-pipelines.lightweight.Editor.asmdef.meta → /com.unity.render-pipelines.lightweight/LWRP/Editor/Unity.RenderPipelines.Lightweight.Editor.asmdef.meta

/com.unity.render-pipelines.lightweight/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef.meta → /com.unity.render-pipelines.lightweight/LWRP/Unity.RenderPipelines.Lightweight.Runtime.asmdef.meta

正在加载...
取消
保存