Skip to content

Commit 686591b

Browse files
H3idi-XHum9183
H3idi-X
and
Hum9183
authored
Dev/dots instancing urp (#356)
* Support DOTS-Instancing (URP Only) (#349) Merged to a brach for this feature. * Dev/dots instancing urp sample (#353) * Added an ecs urp graphics project. * Set toon shader to a material, mat1.mat that is used in RenderMeshUtilityExample. * Added ToonShader_ProjectURP_ECS project and started to convert the project compatible with ECS. * Started to convert a scene, AngelRing. * Made Angel Ring scene compatible with ECS. * Cube_HardEdge scene is compatible with ECS. * MatCapMask scene is also compatible with ECS. * ShaderBall scene is also compatible with ECS. * Normal Map scene is also compatible with ECS. * Sample scene is compatible with ECS. * The project uses ForwardPlus instead of Forward. * SceneLight Hi-CutFileter Test scene is compatible with Entity Graphics. * PointLightTest scene is compatible with ECS graphics. * LightAndShadows scene is compatible with ECS graphics. * LightAndShadowsBakedLight scene is compatible with entity graphics. * EmissiveAnimation scene is compatible with Entity Graphics. * Updated the shader version no to 0.10.0-preview. * Removed samples that utilize skinned mesh animations. * Fixed: an error undeclared identifier '_FOVEATED_RENDERING_NON_UNIFORM_RASTER' * made URP shader ready for soft shadow quality. * Dev/dots instancing urp tests (#354) * Added UniversalGraphicsTestECS * fixed: wrong path in manifest.json. * Added scene to build target. * disabled emission map scroll in the ECS test scene. * Disabled all the things animate in the ECS test project. * added graphics test componet for testing to all the scene camera objects. * set up dx11 graphics tests. * Added mac reference images. * added mac urp-ecs test yml. * renamed the test project. * added new editors to _editor.yml * removed 2023.3 from osx_metal-urp-ecs-2022.3.yml * Added UniversalGraphicsTestECS-2023.2. * Added graphics test reference images for Windows API tests. * added ecs test yml files. dx11 2022.3, 2023.2 and MacOS 2023.2 * Moved Mac Image for 2023.2 from OSXEditor to OSXEditor_AppleSilicon folder. * fixed UniversalGraphicsTestECS-2022.3 windows tests yml file. * added windows vulkan ECS tests. * Dev/dots instancing urp documentation (#355) * Updated the docs . * Updated CHANGELOG.md * Updated TableOfContents.md. * Updated FeatureModels_en.md --------- Co-authored-by: Miyakawa Takeshi <[email protected]>
1 parent 24d186c commit 686591b

File tree

3,001 files changed

+542066
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,001 files changed

+542066
-29
lines changed

‎.yamato/_editor.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ unity_versions:
55
- name: 2021.1
66
- name: 2021.3
77
- name: 2022.3
8-
- name: 2023.1
8+
- name: 2023.1
9+
- name: 2023.2
10+
- name: 2023.3
911
---
1012
{% for unity_version in unity_versions %}
1113
editor:priming:{{ unity_version.name }}:macos:

‎.yamato/osx_metal-urp-ecs-2022.3.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2022.3
6+
unity_versions:
7+
- name: 2022.3
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::metal::macmini
15+
model: M1
16+
image: package-ci/macos-12:v0.0.1-1084810
17+
flavor: b1.large
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
24+
- command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
25+
retries: 2
26+
- command: scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
27+
retries: 2
28+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
29+
retries: 2
30+
- command: |5-
31+
32+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
33+
UTR_RESULT=$?
34+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
35+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
36+
exit $UTR_RESULT
37+
triggers:
38+
branches:
39+
only:
40+
- "/.*/"
41+
artifacts:
42+
logs:
43+
paths:
44+
- "**/test-results/**"
45+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
46+
dependencies:
47+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
48+
rerun: on-new-revision
49+
{% endfor %}
50+
{% endfor %}

‎.yamato/osx_metal-urp-ecs-2023.2.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2023.2
6+
unity_versions:
7+
- name: 2023.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::metal::macmini
15+
model: M1
16+
image: package-ci/macos-12:v0.0.1-1084810
17+
flavor: b1.large
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
24+
- command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
25+
retries: 2
26+
- command: scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
27+
retries: 2
28+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
29+
retries: 2
30+
- command: |5-
31+
32+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
33+
UTR_RESULT=$?
34+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
35+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
36+
exit $UTR_RESULT
37+
triggers:
38+
branches:
39+
only:
40+
- "/.*/"
41+
artifacts:
42+
logs:
43+
paths:
44+
- "**/test-results/**"
45+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
46+
dependencies:
47+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
48+
rerun: on-new-revision
49+
{% endfor %}
50+
{% endfor %}

‎.yamato/win_dx11-urp-ECS-2022.3.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2022.3
6+
unity_versions:
7+
- name: 2022.3
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.large
17+
model: gtx1080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" --zero-tests-are-ok=1
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎.yamato/win_dx11-urp-ECS-2023.2.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2023.2
6+
unity_versions:
7+
- name: 2023.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.large
17+
model: gtx1080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" --zero-tests-are-ok=1
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎.yamato/win_vulkan_urp-ECS-2022.3.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2022.3
6+
unity_versions:
7+
- name: 2022.3
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.large
17+
model: gtx1080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --zero-tests-are-ok=1
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎.yamato/win_vulkan_urp-ECS-2023.2.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTestECS-2023.2
6+
unity_versions:
7+
- name: 2023.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.large
17+
model: gtx1080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --zero-tests-are-ok=1
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎ECS_ProjectURP/.gitignore‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
**/Library/
2+
**/UserSettings/
3+
**/Temp/
4+
**/obj/
5+
6+
**/.vscode/
7+
**/.vs
8+
9+
**/Assets/Plugins/*
10+
**/Assets/Plugins.meta
11+
12+
*.user
13+
*.idea
14+
*.csproj
15+
*.csproj.user
16+
*.sln
17+
*.suo
18+
*.userprefs
19+
*.app
20+
*.VC.*
21+
.DS_Store
22+
*.swp
23+
*.DotSettings
24+
*.gen.csproj.meta
25+
26+
obj.meta
27+
.vs/
28+
build/*
29+
TwoStickShooter/Pure/Library/AnnotationManager
30+
*.pyc
31+
32+
#generated by performance framework
33+
*/PerformanceTestRunInfo.json
34+
Performance/Assets/StreamingAssets.meta
35+
Performance/Assets/StreamingAssets
36+
37+
StreamingAssets.meta
38+
PerformanceTestRunInfo.json
39+
PerformanceTestRunInfo.json.meta
40+
41+
**/InitTestScene*
42+
**/Logs
43+
**/Assets/StreamingAssets
44+
**/Assets/EntityCache
45+
**/Assets/TypeDependencyCache
46+
**/Assets/SceneDependencyCache/*
47+
**/Assets/SceneDependencyCache.meta
48+
*~master*
49+
*~HEAD*
50+
51+
artifacts
52+
53+
.Editor
54+
.UnityLauncher.Editor
55+

‎ECS_ProjectURP/.multitool‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"tags": [],
3+
"launchArguments": null,
4+
"opened": 1685443555972
5+
}

‎ECS_ProjectURP/Assets/SampleScenes.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)