Skip to content

Commit a18e1e5

Browse files
BrianWill-UnityBrianWill-Unity
committed
update graphics projects to 1.2
1 parent c15ae9a commit a18e1e5

File tree

54 files changed

+327
-244
lines changed

Some content is hidden

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

54 files changed

+327
-244
lines changed

‎GraphicsSamples/HDRPSamples/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
obj.meta
2727
.vs/
2828
build/*
29-
TwoStickShooter/Pure/Library/AnnotationManager
3029
*.pyc
3130

3231
#generated by performance framework

‎GraphicsSamples/HDRPSamples/.multitool

-5
This file was deleted.

‎GraphicsSamples/HDRPSamples/.vsconfig

-6
This file was deleted.

‎GraphicsSamples/HDRPSamples/Assets/SampleScenes/3. Hybrid Components/TriggerParticles/SceneAssets/ImpactCubes_VFX.vfx

+13-8
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ MonoBehaviour:
4646
m_UIInfos: {fileID: 114340500867371532}
4747
m_ParameterInfo: []
4848
m_ImportDependencies: []
49-
m_GraphVersion: 11
49+
m_GraphVersion: 12
5050
m_ResourceVersion: 1
5151
m_SubgraphDependencies: []
5252
m_CategoryPath:
@@ -460,7 +460,7 @@ MonoBehaviour:
460460
m_Name:
461461
m_EditorClassIdentifier:
462462
m_UIIgnoredErrors: []
463-
m_Parent: {fileID: 114350483966674976}
463+
m_Parent: {fileID: 0}
464464
m_Children: []
465465
m_UIPosition: {x: 0, y: 0}
466466
m_UICollapsed: 1
@@ -993,7 +993,7 @@ MonoBehaviour:
993993
m_Name:
994994
m_EditorClassIdentifier:
995995
m_UIIgnoredErrors: []
996-
m_Parent: {fileID: 114350483966674976}
996+
m_Parent: {fileID: 0}
997997
m_Children: []
998998
m_UIPosition: {x: 0, y: 0}
999999
m_UICollapsed: 1
@@ -1033,17 +1033,18 @@ MonoBehaviour:
10331033
m_OutputFlowSlot:
10341034
- link: []
10351035
blendMode: 3
1036+
cullMode: 0
1037+
zWriteMode: 0
1038+
zTestMode: 0
10361039
useAlphaClipping: 0
10371040
generateMotionVector: 0
10381041
excludeFromTAA: 0
10391042
sortingPriority: 0
10401043
m_SubOutputs:
10411044
- {fileID: 8926484042661614605}
1042-
cullMode: 0
1043-
zWriteMode: 0
1044-
zTestMode: 0
10451045
colorMapping: 0
10461046
uvMode: 0
1047+
flipbookLayout: 0
10471048
useSoftParticle: 0
10481049
vfxSystemSortPriority: 0
10491050
sort: 0
@@ -1054,7 +1055,6 @@ MonoBehaviour:
10541055
frustumCulling: 0
10551056
castShadows: 0
10561057
useExposureWeight: 0
1057-
flipbookLayout: 0
10581058
needsOwnSort: 0
10591059
shaderGraph: {fileID: 0}
10601060
materialSettings:
@@ -1073,7 +1073,12 @@ MonoBehaviour:
10731073
doubleSided: 0
10741074
preserveSpecularLighting: 0
10751075
enableSpecular: 1
1076-
smokeEmissiveMode: 0
1076+
lightmapRemapMode: 0
1077+
lightmapRemapRanges: 0
1078+
useAlphaRemap: 0
1079+
emissiveMode: 0
1080+
useEmissiveChannelScale: 0
1081+
useColorAbsorption: 1
10771082
receiveShadows: 1
10781083
enableCookie: 1
10791084
enableEnvLight: 1

‎GraphicsSamples/HDRPSamples/Assets/SampleScenes/5. Deformation/CommonAssets/Scripts/SimpleAnimationSystem/Hybrid/SimpleAnimationBakingSystem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected override void OnUpdate()
9393
// Override the material color of the deformation materials
9494
foreach (var rendererEntity in additionalEntities.AsNativeArray())
9595
{
96-
if (EntityManager.HasComponent<RenderMesh>(rendererEntity.Value))
96+
if (EntityManager.HasComponent<RenderMeshUnmanaged>(rendererEntity.Value))
9797
{
9898
ecb.AddComponent(rendererEntity.Value, new HDRPMaterialPropertyBaseColor { Value = deformColor.Value });
9999
}

‎GraphicsSamples/HDRPSamples/Packages/manifest.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
2-
"disableProjectUpdate": true,
32
"dependencies": {
4-
"com.unity.coding": "0.1.0-preview.24",
5-
"com.unity.entities.graphics": "1.0.10",
3+
"com.unity.entities.graphics": "1.2.3",
64
"com.unity.ext.nunit": "2.0.3",
7-
"com.unity.ide.rider": "3.0.22",
8-
"com.unity.ide.visualstudio": "2.0.18",
9-
"com.unity.render-pipelines.high-definition": "14.0.7",
10-
"com.unity.timeline": "1.7.1",
5+
"com.unity.ide.rider": "3.0.31",
6+
"com.unity.ide.visualstudio": "2.0.22",
7+
"com.unity.render-pipelines.high-definition": "14.0.11",
8+
"com.unity.timeline": "1.7.6",
119
"com.unity.ugui": "1.0.0",
1210
"com.unity.modules.ai": "1.0.0",
1311
"com.unity.modules.androidjni": "1.0.0",
@@ -40,6 +38,5 @@
4038
"com.unity.modules.vr": "1.0.0",
4139
"com.unity.modules.wind": "1.0.0",
4240
"com.unity.modules.xr": "1.0.0"
43-
},
44-
"enableLockFile": false
41+
}
4542
}

‎GraphicsSamples/HDRPSamples/ProjectSettings/EditorBuildSettings.asset

+36-75
Original file line numberDiff line numberDiff line change
@@ -6,105 +6,66 @@ EditorBuildSettings:
66
serializedVersion: 2
77
m_Scenes:
88
- enabled: 1
9-
path: Assets/CommonAssets/Base.unity
9+
path: Assets/SampleScenes/0. Base/Base.unity
1010
guid: c05a49aaa15fd4753ba02ed9c36efd26
1111
- enabled: 1
12-
path: Assets/SampleScenes/RenderMeshUtilityExample/AddComponentsExample.unity
13-
guid: cc7a16adfd7754cdabcbb8094f36e409
14-
- enabled: 1
15-
path: Assets/SampleScenes/AmbientAndBlendProbes/AmbientAndBlendProbes.unity
12+
path: Assets/SampleScenes/1. Lighting/AmbientAndBlendProbes/AmbientAndBlendProbes.unity
1613
guid: c96ec6c590cbe004697bc0e5a8da2a23
1714
- enabled: 1
18-
path: Assets/SampleScenes/Benchmark/Benchmark.unity
19-
guid: 8249cb48e5da63241b280faa15067577
20-
- enabled: 1
21-
path: Assets/SampleScenes/BuiltinProperties/BuiltinProperties.unity
22-
guid: 91e6f83f2ef325942a9bda99b9791a26
23-
- enabled: 1
24-
path: Assets/SampleScenes/DisabledEntities/DisabledEntities.unity
25-
guid: 0d42fec96863c8641ad13402217d4a52
26-
- enabled: 1
27-
path: Assets/SampleScenes/ShadergraphProperties/ShaderGraphProperties.unity
28-
guid: fb61bee47c7ebd24490c934b3c20e07d
15+
path: Assets/SampleScenes/1. Lighting/Lightmaps/Lightmaps.unity
16+
guid: 71dae98101bb3a94e963b9e63998dcc8
2917
- enabled: 1
30-
path: Assets/SampleScenes/MeshDeformations/MeshDeformations.unity
31-
guid: cebdbb653ba903446b04fb776a6d0cc1
18+
path: Assets/SampleScenes/1. Lighting/Lightprobes/Lightprobes.unity
19+
guid: 91aff1ffd2741584da6453f59b3b33a3
3220
- enabled: 1
33-
path: Assets/SampleScenes/MaterialOverridesSample/MaterialOverridesSample.unity
34-
guid: f2263964646c0084eb91f387233a3d2b
21+
path: Assets/SampleScenes/2. MaterialProperties/BuiltInMaterialSHProperties/BuiltInMaterialSHProperties.unity
22+
guid: 91e6f83f2ef325942a9bda99b9791a26
3523
- enabled: 1
36-
path: Assets/SampleScenes/HDRPLitProperties/HDRPLitProperties.unity
24+
path: Assets/SampleScenes/2. MaterialProperties/HDRPLitProperties/HDRPLitProperties.unity
3725
guid: a2cac163dced9ff449791e3f3d7d9786
3826
- enabled: 1
39-
path: Assets/SampleScenes/HDRPShaders/HDRPShaders.unity
27+
path: Assets/SampleScenes/2. MaterialProperties/HDRPShaders/HDRPShaders.unity
4028
guid: 87b610885718a824ca486ef0ab428ef2
4129
- enabled: 1
42-
path: Assets/SampleScenes/HybridEntitiesConversion/HybridEntitiesConversion.unity
43-
guid: 548edb55914bbb741bb3d7eba5f9c041
44-
- enabled: 1
45-
path: Assets/SampleScenes/SkinnedCharacter/SkinnedCharacter.unity
46-
guid: cdcad41096f0ea140959c574590b1327
30+
path: Assets/SampleScenes/2. MaterialProperties/MaterialOverridesSample/MaterialOverridesSample.unity
31+
guid: f2263964646c0084eb91f387233a3d2b
4732
- enabled: 1
48-
path: Assets/SampleScenes/Submesh/Submesh.unity
49-
guid: bf476c9e35512fe4abfa98d42c3f8c94
33+
path: Assets/SampleScenes/2. MaterialProperties/ShadergraphProperties/ShaderGraphProperties.unity
34+
guid: fb61bee47c7ebd24490c934b3c20e07d
5035
- enabled: 1
51-
path: Assets/SampleScenes/TransparencyOrdering/TransparencyOrdering.unity
52-
guid: bf20dff90b072a847b7205b01db9a272
36+
path: Assets/SampleScenes/3. Hybrid Components/HybridEntitiesConversion/HybridEntitiesConversion.unity
37+
guid: 548edb55914bbb741bb3d7eba5f9c041
5338
- enabled: 1
54-
path: Assets/SampleScenes/TriggerParticles/TriggerParticles.unity
39+
path: Assets/SampleScenes/3. Hybrid Components/TriggerParticles/TriggerParticles.unity
5540
guid: b79a5cb2b822716499b67183b5b6673c
5641
- enabled: 1
57-
path: Assets/SampleScenes/Lightmaps/Lightmaps.unity
58-
guid: 71dae98101bb3a94e963b9e63998dcc8
59-
- enabled: 1
60-
path: Assets/SampleScenes/Lightprobes/Lightprobes.unity
61-
guid: 91aff1ffd2741584da6453f59b3b33a3
62-
- enabled: 1
63-
path: Assets/SampleScenes/LODs/LODs.unity
64-
guid: 2e2857f0448a4584db8a173b9711d18d
65-
- enabled: 1
66-
path: Assets/SampleScenes/LODsStatic/LODsStatic.unity
67-
guid: 0f2badf9c7af9554fb14970fb936acd8
68-
- enabled: 1
69-
path: Assets/SampleScenes/MaterialMeshChange/MaterialMeshChange.unity
70-
guid: b56226e0e52319442a1b1287933d2010
71-
- enabled: 1
72-
path: Assets/SampleScenes/MatrixPrevious/MatrixPrevious.unity
73-
guid: 8ee73dd4cf8cf8840be0e22af3a3fd26
74-
- enabled: 1
75-
path: Assets/SampleScenes/NegativeScale/NegativeScale.unity
76-
guid: 2db6bc194a94076478b12bc2cbb6d2ad
77-
- enabled: 1
78-
path: Assets/SampleScenes/EntityCreationAPI/EntityCreationAPI.unity
42+
path: Assets/SampleScenes/4. API Examples/EntityCreation/EntityCreation.unity
7943
guid: 494ca42abdc621849ab405eca1c8e43c
8044
- enabled: 1
81-
path: Assets/SampleScenes/GlobalIndirectSpecular/GlobalIndirectSpecular.unity
82-
guid: 92f34e4b0efff5e4e847a4823c19f81c
83-
- enabled: 1
84-
path: Assets/Tests/GraphicsTest/LayerParams/LayerParams.unity
85-
guid: ccc6574d127601342bc2c74c39694b04
45+
path: Assets/SampleScenes/4. API Examples/MaterialMeshChange/MaterialMeshChange.unity
46+
guid: b56226e0e52319442a1b1287933d2010
8647
- enabled: 1
87-
path: Assets/Tests/GraphicsTest/DuplicateProperties/DuplicateProperties.unity
88-
guid: 00c0785ee6fc77e408a9e64af713877f
48+
path: Assets/SampleScenes/4. API Examples/RenderMeshUtilityExample/RenderMeshUtilityExample.unity
49+
guid: cc7a16adfd7754cdabcbb8094f36e409
8950
- enabled: 1
90-
path: Assets/Tests/GraphicsTest/FarAwayFromOrigin/FarAwayFromOrigin.unity
91-
guid: be33bfd947e7f4743af7dbab5c4992dc
51+
path: Assets/SampleScenes/5. Deformation/MeshDeformations/MeshDeformations.unity
52+
guid: cebdbb653ba903446b04fb776a6d0cc1
9253
- enabled: 1
93-
path: Assets/Tests/GraphicsTest/BakedLightFullyBaked/BakedLightFullyBaked.unity
94-
guid: 0606f529676c202439da78ecbce9cf77
54+
path: Assets/SampleScenes/5. Deformation/SkinnedCharacter/SkinnedCharacter.unity
55+
guid: cdcad41096f0ea140959c574590b1327
9556
- enabled: 1
96-
path: Assets/StressTestScenes/BigBatches/StressTestHybrid.unity
97-
guid: 91c6bd0eb9c10634a9e19714d1bf7e20
57+
path: Assets/SampleScenes/6. Misc/DisabledEntities/DisabledEntities.unity
58+
guid: 0d42fec96863c8641ad13402217d4a52
9859
- enabled: 1
99-
path: Assets/StressTestScenes/BigBatches/StressTestHybridLODs.unity
100-
guid: 41c015bb34a67dc4083a5618a947791b
60+
path: Assets/SampleScenes/6. Misc/LODs/LODs.unity
61+
guid: 2e2857f0448a4584db8a173b9711d18d
10162
- enabled: 1
102-
path: Assets/StressTestScenes/BigBatches/StressTestHybridWithDisabledRendering.unity
103-
guid: ad050540b81b3be488c9c3f3b13871e7
63+
path: Assets/SampleScenes/6. Misc/MatrixPrevious/MatrixPrevious.unity
64+
guid: 8ee73dd4cf8cf8840be0e22af3a3fd26
10465
- enabled: 1
105-
path: Assets/StressTestScenes/BatchingBenchmark/BatchingBenchmark.unity
106-
guid: 28040c8581794f14fa6217f915862acc
66+
path: Assets/SampleScenes/6. Misc/Submesh/Submesh.unity
67+
guid: bf476c9e35512fe4abfa98d42c3f8c94
10768
- enabled: 1
108-
path: Assets/Tests/GraphicsTest/GraphicsTest_001/GraphicsTest_001.unity
109-
guid: 7ce3382c6711a3645b60276558dbc257
69+
path: Assets/SampleScenes/6. Misc/TransparencyOrdering/TransparencyOrdering.unity
70+
guid: bf20dff90b072a847b7205b01db9a272
11071
m_configObjects: {}

‎GraphicsSamples/HDRPSamples/ProjectSettings/PackageManagerSettings.asset

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ MonoBehaviour:
3131
m_RegistryInfoDraft:
3232
m_Modified: 0
3333
m_ErrorMessage:
34-
m_UserModificationsInstanceId: -834
35-
m_OriginalInstanceId: -836
34+
m_UserModificationsInstanceId: -830
35+
m_OriginalInstanceId: -832
3636
m_LoadAssets: 0

0 commit comments

Comments
 (0)