Skip to content

Commit

Permalink
Dev/dots instancing urp (#356)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
H3idi-X and Hum9183 authored Apr 19, 2024
1 parent 24d186c commit 686591b
Show file tree
Hide file tree
Showing 3,001 changed files with 542,066 additions and 29 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .yamato/_editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ unity_versions:
- name: 2021.1
- name: 2021.3
- name: 2022.3
- name: 2023.1
- name: 2023.1
- name: 2023.2
- name: 2023.3
---
{% for unity_version in unity_versions %}
editor:priming:{{ unity_version.name }}:macos:
Expand Down
50 changes: 50 additions & 0 deletions .yamato/osx_metal-urp-ecs-2022.3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2022.3
unity_versions:
- name: 2022.3
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
agent:
type: Unity::metal::macmini
model: M1
image: package-ci/macos-12:v0.0.1-1084810
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
- chmod +x TestProjects/{{ test_project.name }}/utr
- 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'"
- command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
retries: 2
- command: scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
retries: 2
- 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'
retries: 2
- command: |5-
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 }}"
UTR_RESULT=$?
mkdir -p TestProjects/{{ test_project.name }}/test-results/
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/
exit $UTR_RESULT
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/{{ test_project.name }}/Logs/*.log"
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
rerun: on-new-revision
{% endfor %}
{% endfor %}
50 changes: 50 additions & 0 deletions .yamato/osx_metal-urp-ecs-2023.2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2023.2
unity_versions:
- name: 2023.2
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
agent:
type: Unity::metal::macmini
model: M1
image: package-ci/macos-12:v0.0.1-1084810
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
- chmod +x TestProjects/{{ test_project.name }}/utr
- 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'"
- command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
retries: 2
- command: scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
retries: 2
- 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'
retries: 2
- command: |5-
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 }}"
UTR_RESULT=$?
mkdir -p TestProjects/{{ test_project.name }}/test-results/
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/
exit $UTR_RESULT
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/{{ test_project.name }}/Logs/*.log"
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
rerun: on-new-revision
{% endfor %}
{% endfor %}
40 changes: 40 additions & 0 deletions .yamato/win_dx11-urp-ECS-2022.3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2022.3
unity_versions:
- name: 2022.3
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
agent:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: gtx1080
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
rerun: on-new-revision
commands:
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
# - 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
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
timeout: 360000
retries: 1
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
{% endfor %}
{% endfor %}
40 changes: 40 additions & 0 deletions .yamato/win_dx11-urp-ECS-2023.2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2023.2
unity_versions:
- name: 2023.2
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
agent:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: gtx1080
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
rerun: on-new-revision
commands:
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
# - 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
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
timeout: 360000
retries: 1
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
{% endfor %}
{% endfor %}
40 changes: 40 additions & 0 deletions .yamato/win_vulkan_urp-ECS-2022.3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2022.3
unity_versions:
- name: 2022.3
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
agent:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: gtx1080
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
rerun: on-new-revision
commands:
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
# - 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
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
timeout: 360000
retries: 1
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
{% endfor %}
{% endfor %}
40 changes: 40 additions & 0 deletions .yamato/win_vulkan_urp-ECS-2023.2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
#
#
test_projects:
- name: UniversalGraphicsTestECS-2023.2
unity_versions:
- name: 2023.2
---
{% for test_project in test_projects %}
{% for unity_version in unity_versions %}
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
agent:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: gtx1080
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
dependencies:
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
rerun: on-new-revision
commands:
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
# - 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
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
timeout: 360000
retries: 1
triggers:
branches:
only:
- "/.*/"
artifacts:
logs:
paths:
- "**/test-results/**"
{% endfor %}
{% endfor %}
55 changes: 55 additions & 0 deletions ECS_ProjectURP/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
**/Library/
**/UserSettings/
**/Temp/
**/obj/

**/.vscode/
**/.vs

**/Assets/Plugins/*
**/Assets/Plugins.meta

*.user
*.idea
*.csproj
*.csproj.user
*.sln
*.suo
*.userprefs
*.app
*.VC.*
.DS_Store
*.swp
*.DotSettings
*.gen.csproj.meta

obj.meta
.vs/
build/*
TwoStickShooter/Pure/Library/AnnotationManager
*.pyc

#generated by performance framework
*/PerformanceTestRunInfo.json
Performance/Assets/StreamingAssets.meta
Performance/Assets/StreamingAssets

StreamingAssets.meta
PerformanceTestRunInfo.json
PerformanceTestRunInfo.json.meta

**/InitTestScene*
**/Logs
**/Assets/StreamingAssets
**/Assets/EntityCache
**/Assets/TypeDependencyCache
**/Assets/SceneDependencyCache/*
**/Assets/SceneDependencyCache.meta
*~master*
*~HEAD*

artifacts

.Editor
.UnityLauncher.Editor

5 changes: 5 additions & 0 deletions ECS_ProjectURP/.multitool
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"tags": [],
"launchArguments": null,
"opened": 1685443555972
}
8 changes: 8 additions & 0 deletions ECS_ProjectURP/Assets/SampleScenes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions ECS_ProjectURP/Assets/SampleScenes/0. Base.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 686591b

Please sign in to comment.