未验证 提交 d1e30d11 编写于 作者: T Takashi Kannan 提交者: GitHub

chore: Restructure Directory (#241)

* delete no need script
* restructure directory
* fix ci setting path
* update symbolic link
* update shell cmd path
* update document link
* update readme directory structure
上级 d30c0e61
......@@ -23,7 +23,7 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package test --unity-version {{ editor.version }} --package-path Packages/{{ package.packagename }}
- upm-ci package test --unity-version {{ editor.version }} --package-path {{ package.packagename }}
artifacts:
logs:
paths:
......@@ -43,7 +43,7 @@ promote_dry_run:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package promote --dry-run --package-path Packages/{{ package.packagename }}
- upm-ci package promote --dry-run --package-path {{ package.packagename }}
triggers:
tags:
only:
......@@ -70,7 +70,7 @@ promote:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package promote --package-path Packages/{{ package.packagename }}
- upm-ci package promote --package-path {{ package.packagename }}
triggers:
tags:
only:
......
......@@ -15,7 +15,7 @@ publish_github_release:
flavor: b1.large
commands:
- npm install github-release-cli -g
- github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "upm-ci~/packages/com.unity.template.renderstreaming-%GIT_TAG%.tgz"
- github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "upm-ci~/packages/com.unity.template.renderstreaming-hd-%GIT_TAG%.tgz"
- github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "WebApp/bin~/webserver"
- github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "WebApp/bin~/webserver.exe"
triggers:
......
......@@ -14,7 +14,7 @@ pack_{{ package.name }}:
flavor: b1.large
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package pack --package-path Packages/{{ package.packagename }}
- upm-ci package pack --package-path {{ package.packagename }}
artifacts:
{{ package.name }}_package:
paths:
......@@ -30,7 +30,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package test -u {{ editor.version }} --package-path Packages/{{ package.packagename }}
- upm-ci package test -u {{ editor.version }} --package-path {{ package.packagename }}
triggers:
branches:
only:
......@@ -54,7 +54,7 @@ publish_dry_run_{{ package.name }}:
flavor: b1.large
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package publish --dry-run --package-path Packages/{{ package.packagename }}
- upm-ci package publish --dry-run --package-path {{ package.packagename }}
triggers:
tags:
only:
......@@ -79,7 +79,7 @@ publish_{{ package.name }}:
flavor: b1.large
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package publish --package-path Packages/{{ package.packagename }}
- upm-ci package publish --package-path {{ package.packagename }}
triggers:
tags:
only:
......
......@@ -6,11 +6,11 @@ editor_version: 2019.3
samples:
- name: HDRP
project_path: RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x
unitypackage_path: Packages/com.unity.renderstreaming/Samples~/HDRP/Editor/RenderStreamingHDRPSimple.unitypackage
unitypackage_path: com.unity.renderstreaming/Samples~/HDRP/Editor/RenderStreamingHDRPSimple.unitypackage
imported_unitypackage_path: Assets/Samples/HDRP/Editor/RenderStreamingHDRPSimple.unitypackage
- name: URP
project_path: RenderStreamingSampleSrc~/RS_URPSampleSrc
unitypackage_path: Packages/com.unity.renderstreaming/Samples~/URP/Editor/RenderStreamingURPSimple.unitypackage
unitypackage_path: com.unity.renderstreaming/Samples~/URP/Editor/RenderStreamingURPSimple.unitypackage
imported_unitypackage_path: Assets/Samples/URP/Editor/RenderStreamingURPSimple.unitypackage
project_path: EmptyProjectForTest~
......
......@@ -3,7 +3,7 @@
projects:
- name: renderstreaming
packagename: com.unity.template.renderstreaming
packagename: com.unity.template.renderstreaming-hd
---
{% for project in projects %}
pack:
......@@ -14,7 +14,7 @@ pack:
flavor: b1.large
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci template pack
- upm-ci template pack --project-path {{ project.packagename }}
artifacts:
packages:
paths:
......@@ -35,7 +35,7 @@ test_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.vers
image: {{ platform.image }}
flavor: {{ platform.flavor}}
commands:
# - patch -u Packages/manifest.json < BuildScripts~/add_internal_registry_manifest.patch
# - patch -u {{ project.packagename }}/Packages/manifest.json < BuildScripts~/add_internal_registry_manifest.patch
{% if platform.name == "win" %}
- mkdir upm-ci~\templates\ProjectData~\WebApp
- xcopy WebApp upm-ci~\templates\ProjectData~\WebApp /s/e/i
......@@ -43,7 +43,7 @@ test_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.vers
- cp -r WebApp upm-ci~/templates/ProjectData~/
{% endif %}
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci template test -u {{ editor.version }} --platform {{ param.platform }} --backend {{ param.backend }}
- upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }}
artifacts:
logs:
paths:
......@@ -64,7 +64,7 @@ publish:
flavor: b1.large
commands:
- npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci template publish
- upm-ci template publish --project-path {{ project.packagename }}
triggers:
tags:
only:
......
......@@ -5,12 +5,12 @@
**Unity Render Streaming** is a solution that provides Unity's high quality rendering abilities via browser. It's designed to meet the needs of tasks like viewing car configurators or architectural models on mobile devices.
This solution's streaming technology takes advantage of [WebRTC](https://webrtc.org/), and developers can even use the [WebRTC package](https://github.com/Unity-Technologies/com.unity.webrtc) to create their own unique solutions.
<img src="Packages/com.unity.renderstreaming/Documentation~/images/browser_hdrpscene.png" width=500 align=center>
<img src="com.unity.renderstreaming/Documentation~/images/browser_hdrpscene.png" width=500 align=center>
This repository manages 2 packages. Details can be found in the `README.md` for each package.
- [com.unity.template.renderstreaming](Packages/com.unity.template.renderstreaming/README.md)
- [com.unity.renderstreaming](Packages/com.unity.renderstreaming/README.md)
- [com.unity.template.renderstreaming](com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/README.md)
- [com.unity.renderstreaming](com.unity.renderstreaming/README.md)
## Branch
......@@ -48,33 +48,34 @@ Browser support depends on the status of each browser's WebRTC support.
### License
- `com.unity.renderstreaming` - [LICENSE.md](Packages/com.unity.renderstreaming/LICENSE.md)
- `com.unity.renderstreaming` - [LICENSE.md](com.unity.renderstreaming/LICENSE.md)
- `com.unity.template.renderstreaming` - [LICENSE.md](Packages/com.unity.template.renderstreaming/LICENSE.md)
- `com.unity.template.renderstreaming` - [LICENSE.md](com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/LICENSE.md)
## Package Structure
```
<root>
├── Assets
│   ├── Plugins
│   ├── Scenes
│   ├── Scripts
│   └── Tests
├── com.unity.renderstreaming
│ ├── Documentation~
│ ├── Editor
│ └── Samples~
├── com.unity.template.renderstreaming-hd
│ ├── Assets
│ │   ├── Plugins
│ │   ├── Scenes
│ │   ├── Scripts
│ │   └── Tests
│ ├── Packages
│ └── ProjectSettings
├── EmptyProjectForTest~
├── Packages
│   ├── com.unity.renderstreaming
│   └── com.unity.template.renderstreaming
├── ProjectSettings
├── Plugin
│   ├── WebRTCPlugin
│   └── unity
├── RenderStreamingSampleSrc~
│ └── RS_HDRPSampleSrc_1.x
| ├── RS_HDRPSampleSrc_1.x
│ └── RS_URPSampleSrc_1.x
└── WebApp
   ├── public
   ├── src
   └── test
├── public
├── src
└── test
```
## Roadmap
......@@ -82,12 +83,12 @@ Browser support depends on the status of each browser's WebRTC support.
| Version | libwebrtc version | Focus |
| ------- | ---------------------------------------------------------------------------- | --------------------------------------------------- |
| `1.0` |[M72](https://groups.google.com/d/msg/discuss-webrtc/3h4y0fimHwg/j6G4dTVvCAAJ)| - First release |
| `2.0` |[M80](https://groups.google.com/d/msg/discuss-webrtc/Ozvbd0p7Q1Y/M4WN2cRKCwAJ)| - Multi camera <br>- DirectX12 (DXR) Support |
| `2.0` |[M79](https://groups.google.com/d/msg/discuss-webrtc/X8q5Ae9VKco/YYty_HWFAQAJ)| - Multi camera <br>- DirectX12 (DXR) Support |
| `2.1` | | - AMD graphics hw encoder <br>- UWP platform Support |
## FAQ
Read [this page](Packages/com.unity.template.renderstreaming/Documentation~/en/faq.md) and [Unity Forum](https://forum.unity.com/forums/unity-render-streaming.413/)
Read [this page](com.unity.renderstreaming/Documentation~/en/faq.md) and [Unity Forum](https://forum.unity.com/forums/unity-render-streaming.413/)
## Contributors
......
../../../Assets/RenderPipeline
\ No newline at end of file
../../../com.unity.template.renderstreaming-hd/Assets/RenderPipeline
\ No newline at end of file
../../../Assets/Scripts
\ No newline at end of file
../../../com.unity.template.renderstreaming-hd/Assets/Scripts
\ No newline at end of file
......@@ -3,7 +3,7 @@
- [Japanese](./jp/index.md)
This project contains all the assets that are used to create the HDRP sample for
[**com.unity.renderstreaming**](../../../Packages/com.unity.renderstreaming/Documentation~/index.md)
[**com.unity.renderstreaming**](../../../com.unity.renderstreaming/Documentation~/index.md)
package.
Symbolic links are used to share assets between this project and [the main project](../../../Readme.md),
......
......@@ -3,7 +3,7 @@
- [English](../index.md)
このプロジェクトには、
[**com.unity.renderstreaming**](../../../../Packages/com.unity.renderstreaming/Documentation~/index.md) パッケージの HDRP サンプルの作成に使われているすべてのアセットが含まれています。
[**com.unity.renderstreaming**](../../../../com.unity.renderstreaming/Documentation~/index.md) パッケージの HDRP サンプルの作成に使われているすべてのアセットが含まれています。
このプロジェクトと[メインのプロジェクト](../../../../Readme.md)の間でのアセットの共有にはシンボリックリンクを使っています。
Windows をお使いの場合は、以下の手順に従って事前にシンボリックリンクを有効にする必要があります。
......
../../../Assets/Scripts
\ No newline at end of file
../../../com.unity.template.renderstreaming-hd/Assets/Scripts
\ No newline at end of file
(gc $Args[0]).Replace($Args[1], $Args[2]) | Out-String | % { [Text.Encoding]::UTF8.GetBytes($_) } | Set-Content -Path $Args[0] -Encoding Byte
Add-Type -AssemblyName System.Web
(gc $Args[0]) | Out-String | % { [System.Web.HttpUtility]::HtmlDecode($_) } | Set-Content -Path $Args[0]
\ No newline at end of file
......@@ -17,7 +17,7 @@ npm run start
npm run start -- -h
```
オプションの詳細については[ドキュメント](../Packages/com.unity.template.renderstreaming/Documentation~/jp/webserver.md)を参照してください。
オプションの詳細については[ドキュメント](../com.unity.renderstreaming/Documentation~/jp/webapp.md)を参照してください。
また、以下のコマンドで `ts-node` を利用してサーバを起動します。
......@@ -39,4 +39,4 @@ Render Streaming のシグナリングはシンプルな Web API で実現して
Postman で `WebApp/test/renderstreaming.postman_collection.json` をインポートすると、API の一覧を確認することができます。また、Web サーバを起動した状態であれば API の動作テストを行うことができます。
<img src="../Packages/com.unity.template.renderstreaming/Documentation~/images/postman_example.png" width=600 align=center>
<img src="../com.unity.renderstreaming/Documentation~/images/postman_example.png" width=600 align=center>
......@@ -17,7 +17,7 @@ Use this command to display the help guide:
npm run start -- -h
```
See [the documentation](../Packages/com.unity.template.renderstreaming/Documentation~/jp/webserver.md) for details on the options.
See [the documentation](../com.unity.renderstreaming/Documentation~/en/webapp.md) for details on the options.
This command will start the server using `ts-node`:
......@@ -39,4 +39,4 @@ Render Streaming uses a simple web API for signaling. [Postman](https://www.getp
View a summary of the API by importing `WebApp/test/renderstreaming.postman_collection.json` in Postman. Operation tests can also be run on the API while the web server is active.
<img src="../Packages/com.unity.template.renderstreaming/Documentation~/images/postman_example.png" width=600 align=center>
<img src="../com.unity.renderstreaming/Documentation~/images/postman_example.png" width=600 align=center>
@echo off
if not exist depot_tools (
git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
)
set PATH=%cd%\depot_tools;%PATH%
set WEBRTC_VERSION=72
set DEPOT_TOOLS_WIN_TOOLCHAIN=0
set CPPFLAGS=/WX-
set GYP_GENERATORS=ninja,msvs-ninja
set GYP_MSVS_VERSION=2017
set OUTPUT_DIR=out
set ARTIFACTS_DIR=%cd%\artifacts
cmd /k fetch.bat webrtc
cd src
cmd /k git.bat config --system core.longpaths true
cmd /k git.bat branch -r
cmd /k git.bat checkout -b my_branch refs/remotes/branch-heads/%WEBRTC_VERSION%
cd ..
cmd /k gclient.bat sync -f
REM change jsoncpp static library
powershell -File .\ReplaceText.ps1 "src\third_party\jsoncpp\BUILD.gn" "source_set" "static_library"
cmd /k gn.bat gen %OUTPUT_DIR% --root="src" --args="is_debug=false is_clang=false target_cpu=\"x64\" symbol_level=0 enable_iterator_debugging=false"
REM add json.obj in link list of webrtc.ninja
powershell -File .\ReplaceText.ps1 "%OUTPUT_DIR%\obj\webrtc.ninja" "obj/rtc_base/rtc_base/crc32.obj" "obj/rtc_base/rtc_base/crc32.obj obj/rtc_base/rtc_json/json.obj"
type "%OUTPUT_DIR%\obj\webrtc.ninja"
REM update LIB_TO_LICENSES_DICT in generate_licenses.py
powershell -File .\ReplaceText.ps1 "src\tools_webrtc\libs\generate_licenses.py" "'ow2_asm': []," "'ow2_asm': [], 'winsdk_samples': [], 'googletest': ['third_party/googletest/src/LICENSE'], 'nasm': ['third_party/nasm/LICENSE'], "
type "src\tools_webrtc\libs\generate_licenses.py"
ninja.exe -C %OUTPUT_DIR%
REM generate license
call python.bat .\src\tools_webrtc\libs\generate_licenses.py --target //:default %OUTPUT_DIR% %OUTPUT_DIR%
REM unescape license
powershell -File .\Unescape.ps1 %OUTPUT_DIR%\LICENSE.md
REM copy header
xcopy src\*.h %ARTIFACTS_DIR%\include /C /S /I /F /H
REM copy lib
mkdir %ARTIFACTS_DIR%\lib
for %%G in (webrtc.lib audio_decoder_opus.lib webrtc_opus.lib jsoncpp.lib) do forfiles /P "%cd%\%OUTPUT_DIR%" /S /M %%G /C "cmd /c copy @path %ARTIFACTS_DIR%\lib"
REM copy license
copy %OUTPUT_DIR%\LICENSE.md %ARTIFACTS_DIR%
REM create zip
cd %ARTIFACTS_DIR%