chore: Upgrade package version 2.0.0-preview (#293)

* upgrade package version 2.0.0-preview * [skip ci] upgrade hdrp/urp version
Unity-Technologies · Apr 30, 2020 · bfc693f · bfc693f
1 parent c0b3992
commit bfc693f
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 38 deletions.
diff --git a/EmptyProjectForTest~/Packages/manifest.json b/EmptyProjectForTest~/Packages/manifest.json
@@ -14,7 +14,7 @@
     "com.unity.test-framework": "1.1.9",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "2.0.0-preview.3",
+    "com.unity.webrtc": "2.0.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/README.md b/README.md
@@ -17,13 +17,12 @@ This repository manages 1 package and 2 templates. Details can be found in the `
 
 | Branch                                                                                         | Status         |
 | ---------------------------------------------------------------------------------------------- | -------------- |
-| [release/1.2.3](https://github.com/Unity-Technologies/UnityRenderStreaming/tree/release/1.2.3) | Stable         |
+| [release/2.0.0](https://github.com/Unity-Technologies/UnityRenderStreaming/tree/release/2.0.0) | Stable         |
 | [develop](https://github.com/Unity-Technologies/UnityRenderStreaming/tree/develop)             | In development |
 
 ## Operating Environment
 
 This solution is compatible with `Unity 2019.3`.
-`Unity 2018.3` relies on the [New Input System](https://github.com/Unity-Technologies/InputSystem), so it is incompatible with this solution.
 
 | Platform    | Graphics API | Hardware Encoder                                  | Software Encoder   |
 | ----------- | ------------ | ------------------------------------------------- | ------------------ |
@@ -91,11 +90,13 @@ Browser support depends on the status of each browser's WebRTC support.
 
 ## Roadmap
 
-| Version | libwebrtc version                                                            | Focus                                                |
-| ------- | ---------------------------------------------------------------------------- | ---------------------------------------------------  |
-| `1.0`   |[M72](https://groups.google.com/d/msg/discuss-webrtc/3h4y0fimHwg/j6G4dTVvCAAJ)| - First release                                      |
-| `2.0`   |[M79](https://groups.google.com/d/msg/discuss-webrtc/X8q5Ae9VKco/YYty_HWFAQAJ)| - Multi camera <br>- DirectX12 (DXR) Support         |
-| `2.1`   |                                                                              | - Profiler tool <br>- Bitrate control                |
+| Version | Focus                                               |
+| ------- | --------------------------------------------------- |
+| `1.0`   | - First release                                     |
+| `1.1`   | - Upgrade HDRP version 5.16                         |
+| `1.2`   | - Unity 2019.3 support                              |
+| `2.0`   | - Multi camera <br>- DirectX12 (DXR) Support        |
+| `2.1`   | - Unity 2020.1 support <br>- Bitrate control sample |
 
 ## FAQ
 

diff --git a/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/Packages/manifest.json b/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/Packages/manifest.json
@@ -5,11 +5,11 @@
     "com.unity.ide.rider": "1.1.4",
     "com.unity.ide.vscode": "1.1.4",
     "com.unity.inputsystem": "1.0.0-preview.4",
-    "com.unity.render-pipelines.high-definition": "7.1.8",
+    "com.unity.render-pipelines.high-definition": "7.3.1",
     "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "2.0.0-preview.3",
+    "com.unity.webrtc": "2.0.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/ProjectSettings/HDRPProjectSettings.asset b/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/ProjectSettings/HDRPProjectSettings.asset
@@ -18,5 +18,8 @@ MonoBehaviour:
   m_DefaultDXRScenePrefabSaved: {fileID: 0}
   m_ProjectSettingFolderPath: HDRPDefaultResources
   m_WizardPopupAtStart: 0
+  m_WizardPopupAlreadyShownOnce: 0
   m_WizardActiveTab: 0
-  m_PackageVersionForMaterials: 7.1.8
+  m_WizardNeedRestartAfterChangingToDX12: 0
+  m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
+  m_LastMaterialVersion: 2
diff --git a/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/ProjectSettings/VFXManager.asset b/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/ProjectSettings/VFXManager.asset
@@ -3,5 +3,10 @@
 --- !u!937362698 &1
 VFXManager:
   m_ObjectHideFlags: 0
-  m_IndirectShader: {fileID: 0}
+  m_IndirectShader: {fileID: 7200000, guid: 84a17cfa13e40ae4082ef42714f0a81c, type: 3}
+  m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
+  m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
+  m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
   m_RenderPipeSettingsPath: 
+  m_FixedTimeStep: 0.016666668
+  m_MaxDeltaTime: 0.05
diff --git a/RenderStreamingSampleSrc~/RS_URPSampleSrc/Packages/manifest.json b/RenderStreamingSampleSrc~/RS_URPSampleSrc/Packages/manifest.json
@@ -10,12 +10,12 @@
     "com.unity.inputsystem": "1.0.0-preview.6",
     "com.unity.postprocessing": "2.3.0",
     "com.unity.purchasing": "2.0.6",
-    "com.unity.render-pipelines.universal": "7.1.8",
+    "com.unity.render-pipelines.universal": "7.3.1",
     "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.timeline": "1.2.10",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "2.0.0-preview.3",
+    "com.unity.webrtc": "2.0.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/com.unity.renderstreaming/CHANGELOG.md b/com.unity.renderstreaming/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to com.unity.renderstreaming package will be documented in t
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2020-04-15
+## [2.0.0] - 2020-04-30
 
 - Changed: Upgrading input system to 1.0.0-preview.6
 - Changed: Upgrading WebRTC to 2.0.0-preview

diff --git a/com.unity.renderstreaming/Documentation~/index.md b/com.unity.renderstreaming/Documentation~/index.md
@@ -7,10 +7,6 @@ title: index
 
 This package contains public APIs and project samples that are built on top of our [**Unity Render Streaming**](../../com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/index.md).
 
-> [!WARNING]
-> Because this version is in development, please do not use it. The latest version is `1.2.3`.
-> You can check the version you are using on the Package Manager.
-
 > [!Video https://www.youtube.com/embed/c2pp_T5xzeU]
 
 ## Requirements

diff --git a/com.unity.renderstreaming/Documentation~/jp/index.md b/com.unity.renderstreaming/Documentation~/jp/index.md
@@ -2,13 +2,6 @@
 
 このパッケージには **Unity Render Streaming** の公開 API とサンプルプロジェクトが含まれます。
 
-> [!WARNING]
-> バージョン 2.0 は、開発バージョンのため、利用を控えてください。現在の最新版は `1.2.3` になります。
-> 現在利用しているバージョンはパッケージマネージャで確認することができます。
->
-> 2.0 のリリースは2020年4月末を予定しています。
-
-
 > [!Video https://www.youtube.com/embed/c2pp_T5xzeU]
 
 ## 動作環境

diff --git a/com.unity.renderstreaming/README.md b/com.unity.renderstreaming/README.md
@@ -2,9 +2,6 @@
 
 <img src="https://img.shields.io/badge/unity-2019.3-green.svg?style=flat-square" alt="unity 2019.3">
 
-| :warning: | Because this version is in development, please do not use it. The latest version is `1.2.3`. <br/> You can check the version you are using on the Package Manager. <br/> The release date of 2.0 is planned at the end of April 2020. |
-|---|---|
-
 ## Documentation
 
 - [English](Documentation~/index.md)

diff --git a/com.unity.renderstreaming/package.json b/com.unity.renderstreaming/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.unity.renderstreaming",
   "displayName": "Unity Render Streaming",
-  "version": "2.0.0-preview.4",
+  "version": "2.0.0-preview",
   "unity": "2019.3",
-  "description": "***\nWarning: Because this version is in development, please do not use it. The latest version is 1.2.3.\n***\n\nThis is a package for using Unity Render Streaming technology. It contains two samples to use the technology.",
+  "description": "This is a package for using Unity Render Streaming technology. It contains two samples to use the technology.",
   "dependencies": {
-    "com.unity.webrtc": "2.0.0-preview.3",
+    "com.unity.webrtc": "2.0.0-preview",
     "com.unity.inputsystem": "1.0.0-preview.6"
   },   
  "samples": [ {

diff --git a/....renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md b/....renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md
@@ -4,9 +4,10 @@ All notable changes to the render streaming template package will be documented
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2020-04-15
+## [2.0.0] - 2020-04-30
 
 - Added: Multi camera support
+- Added: Multi controller support
 - Added: Gamepad support
 - Added: Websocket support
 - Changed: Upgrading HDRP to 7.3.1

diff --git a/...y.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json b/...y.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json
@@ -6,7 +6,7 @@
   "unity": "2019.3",
   "description": "This is HDRP sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.",
   "dependencies": {
-    "com.unity.renderstreaming": "2.0.0-preview.4",
+    "com.unity.renderstreaming": "2.0.0-preview",
     "com.unity.render-pipelines.high-definition": "7.3.1"
   }
 }
diff --git a/com.unity.template.renderstreaming-hd/Packages/manifest.json b/com.unity.template.renderstreaming-hd/Packages/manifest.json
@@ -7,7 +7,7 @@
     "com.unity.ide.vscode": "1.1.4",
     "com.unity.inputsystem": "1.0.0-preview.6",
     "com.unity.render-pipelines.high-definition": "7.3.1",
-    "com.unity.renderstreaming": "2.0.0-preview.4",
+    "com.unity.renderstreaming": "2.0.0-preview",
     "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",

diff --git a/...enderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md b/...enderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md
@@ -4,6 +4,6 @@ All notable changes to the render streaming template package will be documented
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2020-04-15
+## [2.0.0] - 2020-04-30
 
 - Initial Release
diff --git a/...template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json b/...template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json
@@ -6,7 +6,7 @@
   "unity": "2019.3",
   "description": "This is HDRP Raytracing sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.",
   "dependencies": {
-    "com.unity.renderstreaming": "2.0.0-preview.4",
+    "com.unity.renderstreaming": "2.0.0-preview",
     "com.unity.render-pipelines.high-definition": "7.3.1"
   }
 }
diff --git a/com.unity.template.renderstreaming-rtx/Packages/manifest.json b/com.unity.template.renderstreaming-rtx/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.inputsystem": "1.0.0-preview.4",
     "com.unity.render-pipelines.high-definition": "7.3.1",
     "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config",
-    "com.unity.renderstreaming": "2.0.0-preview.4",
+    "com.unity.renderstreaming": "2.0.0-preview",
     "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",