Skip to content

Commit 40163ad

Browse files
Add new sample cubemap node with world space direction (#2311)
* Add a new Sample Cubemap node * Add new cubemap sample node to input test * fix issue in test * update reference screenshots * Edited Sample Cubemap Node page * adress PR feedback on doc Co-authored-by: Sharlene Tan <[email protected]>
1 parent d3d3608 commit 40163ad

File tree

19 files changed

+1041
-62
lines changed

19 files changed

+1041
-62
lines changed
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

TestProjects/ShaderGraph/Assets/Scenes/InputNodes.unity

Lines changed: 120 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Transform:
251251
m_LocalScale: {x: 1, y: 1, z: 1}
252252
m_Children: []
253253
m_Father: {fileID: 596523079}
254-
m_RootOrder: 13
254+
m_RootOrder: 14
255255
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
256256
--- !u!23 &1221711
257257
MeshRenderer:
@@ -816,13 +816,13 @@ Transform:
816816
m_PrefabInstance: {fileID: 0}
817817
m_PrefabAsset: {fileID: 0}
818818
m_GameObject: {fileID: 97661562}
819-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
819+
m_LocalRotation: {x: -0.0000015744266, y: -0.00095836265, z: -0.00018746467, w: 0.9999995}
820820
m_LocalPosition: {x: -1, y: 0, z: 1}
821821
m_LocalScale: {x: 1, y: 1, z: 1}
822822
m_Children: []
823823
m_Father: {fileID: 242909117}
824824
m_RootOrder: 26
825-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
825+
m_LocalEulerAnglesHint: {x: 0, y: -0.11, z: -0.021}
826826
--- !u!23 &97661564
827827
MeshRenderer:
828828
m_ObjectHideFlags: 0
@@ -2179,10 +2179,15 @@ MonoBehaviour:
21792179
TargetWidth: 1800
21802180
TargetHeight: 960
21812181
PerPixelCorrectnessThreshold: 0.00075
2182+
PerPixelGammaThreshold: 0.003921569
2183+
PerPixelAlphaThreshold: 0.003921569
21822184
AverageCorrectnessThreshold: 0.0001
2185+
IncorrectPixelsThreshold: 0.0000038146973
21832186
UseHDR: 0
21842187
UseBackBuffer: 0
21852188
ImageResolution: 0
2189+
ActiveImageTests: 1
2190+
ActivePixelTests: 7
21862191
WaitFrames: 2
21872192
--- !u!114 &366199733
21882193
MonoBehaviour:
@@ -2388,7 +2393,7 @@ Transform:
23882393
m_LocalScale: {x: 1, y: 1, z: 1}
23892394
m_Children: []
23902395
m_Father: {fileID: 596523079}
2391-
m_RootOrder: 5
2396+
m_RootOrder: 6
23922397
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
23932398
--- !u!23 &414293741
23942399
MeshRenderer:
@@ -2863,7 +2868,7 @@ Transform:
28632868
m_LocalScale: {x: 1, y: 1, z: 1}
28642869
m_Children: []
28652870
m_Father: {fileID: 596523079}
2866-
m_RootOrder: 10
2871+
m_RootOrder: 11
28672872
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
28682873
--- !u!23 &485539995
28692874
MeshRenderer:
@@ -3287,7 +3292,7 @@ Transform:
32873292
m_LocalScale: {x: 1, y: 1, z: 1}
32883293
m_Children: []
32893294
m_Father: {fileID: 596523079}
3290-
m_RootOrder: 6
3295+
m_RootOrder: 7
32913296
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
32923297
--- !u!23 &524449749
32933298
MeshRenderer:
@@ -3759,6 +3764,7 @@ Transform:
37593764
m_LocalScale: {x: 1, y: 1, z: 1}
37603765
m_Children:
37613766
- {fileID: 840653958}
3767+
- {fileID: 978955574}
37623768
- {fileID: 853683121}
37633769
- {fileID: 1050940235}
37643770
- {fileID: 804860713}
@@ -4094,7 +4100,7 @@ Transform:
40944100
m_LocalScale: {x: 1, y: 1, z: 1}
40954101
m_Children: []
40964102
m_Father: {fileID: 596523079}
4097-
m_RootOrder: 16
4103+
m_RootOrder: 17
40984104
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
40994105
--- !u!23 &697337479
41004106
MeshRenderer:
@@ -4664,7 +4670,7 @@ Transform:
46644670
m_LocalScale: {x: 1, y: 1, z: 1}
46654671
m_Children: []
46664672
m_Father: {fileID: 596523079}
4667-
m_RootOrder: 3
4673+
m_RootOrder: 4
46684674
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
46694675
--- !u!23 &804860714
46704676
MeshRenderer:
@@ -5026,7 +5032,7 @@ GameObject:
50265032
- component: {fileID: 853683123}
50275033
- component: {fileID: 853683122}
50285034
m_Layer: 0
5029-
m_Name: SampleCubemapProperty
5035+
m_Name: SampleReflectedCubemapProperty
50305036
m_TagString: Untagged
50315037
m_Icon: {fileID: 0}
50325038
m_NavMeshLayer: 0
@@ -5044,7 +5050,7 @@ Transform:
50445050
m_LocalScale: {x: 1, y: 1, z: 1}
50455051
m_Children: []
50465052
m_Father: {fileID: 596523079}
5047-
m_RootOrder: 1
5053+
m_RootOrder: 2
50485054
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
50495055
--- !u!23 &853683122
50505056
MeshRenderer:
@@ -5393,6 +5399,101 @@ MeshFilter:
53935399
m_PrefabAsset: {fileID: 0}
53945400
m_GameObject: {fileID: 925157434}
53955401
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
5402+
--- !u!1 &978955573
5403+
GameObject:
5404+
m_ObjectHideFlags: 0
5405+
m_CorrespondingSourceObject: {fileID: 0}
5406+
m_PrefabInstance: {fileID: 0}
5407+
m_PrefabAsset: {fileID: 0}
5408+
serializedVersion: 6
5409+
m_Component:
5410+
- component: {fileID: 978955574}
5411+
- component: {fileID: 978955577}
5412+
- component: {fileID: 978955576}
5413+
- component: {fileID: 978955575}
5414+
m_Layer: 0
5415+
m_Name: SampleCubemapProperty
5416+
m_TagString: Untagged
5417+
m_Icon: {fileID: 0}
5418+
m_NavMeshLayer: 0
5419+
m_StaticEditorFlags: 0
5420+
m_IsActive: 1
5421+
--- !u!4 &978955574
5422+
Transform:
5423+
m_ObjectHideFlags: 0
5424+
m_CorrespondingSourceObject: {fileID: 0}
5425+
m_PrefabInstance: {fileID: 0}
5426+
m_PrefabAsset: {fileID: 0}
5427+
m_GameObject: {fileID: 978955573}
5428+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
5429+
m_LocalPosition: {x: 3.01, y: 0, z: -2.02}
5430+
m_LocalScale: {x: 1, y: 1, z: 1}
5431+
m_Children: []
5432+
m_Father: {fileID: 596523079}
5433+
m_RootOrder: 1
5434+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5435+
--- !u!23 &978955575
5436+
MeshRenderer:
5437+
m_ObjectHideFlags: 0
5438+
m_CorrespondingSourceObject: {fileID: 0}
5439+
m_PrefabInstance: {fileID: 0}
5440+
m_PrefabAsset: {fileID: 0}
5441+
m_GameObject: {fileID: 978955573}
5442+
m_Enabled: 1
5443+
m_CastShadows: 1
5444+
m_ReceiveShadows: 1
5445+
m_DynamicOccludee: 1
5446+
m_MotionVectors: 1
5447+
m_LightProbeUsage: 1
5448+
m_ReflectionProbeUsage: 1
5449+
m_RayTracingMode: 2
5450+
m_RayTraceProcedural: 0
5451+
m_RenderingLayerMask: 1
5452+
m_RendererPriority: 0
5453+
m_Materials:
5454+
- {fileID: 2100000, guid: a221d79ca52eaf2418a0cc1726451402, type: 2}
5455+
m_StaticBatchInfo:
5456+
firstSubMesh: 0
5457+
subMeshCount: 0
5458+
m_StaticBatchRoot: {fileID: 0}
5459+
m_ProbeAnchor: {fileID: 0}
5460+
m_LightProbeVolumeOverride: {fileID: 0}
5461+
m_ScaleInLightmap: 1
5462+
m_ReceiveGI: 1
5463+
m_PreserveUVs: 1
5464+
m_IgnoreNormalsForChartDetection: 0
5465+
m_ImportantGI: 0
5466+
m_StitchLightmapSeams: 1
5467+
m_SelectedEditorRenderState: 3
5468+
m_MinimumChartSize: 4
5469+
m_AutoUVMaxDistance: 0.5
5470+
m_AutoUVMaxAngle: 89
5471+
m_LightmapParameters: {fileID: 0}
5472+
m_SortingLayerID: 0
5473+
m_SortingLayer: 0
5474+
m_SortingOrder: 0
5475+
m_AdditionalVertexStreams: {fileID: 0}
5476+
--- !u!135 &978955576
5477+
SphereCollider:
5478+
m_ObjectHideFlags: 0
5479+
m_CorrespondingSourceObject: {fileID: 0}
5480+
m_PrefabInstance: {fileID: 0}
5481+
m_PrefabAsset: {fileID: 0}
5482+
m_GameObject: {fileID: 978955573}
5483+
m_Material: {fileID: 0}
5484+
m_IsTrigger: 0
5485+
m_Enabled: 1
5486+
serializedVersion: 2
5487+
m_Radius: 0.5
5488+
m_Center: {x: 0, y: 0, z: 0}
5489+
--- !u!33 &978955577
5490+
MeshFilter:
5491+
m_ObjectHideFlags: 0
5492+
m_CorrespondingSourceObject: {fileID: 0}
5493+
m_PrefabInstance: {fileID: 0}
5494+
m_PrefabAsset: {fileID: 0}
5495+
m_GameObject: {fileID: 978955573}
5496+
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
53965497
--- !u!1 &991341882
53975498
GameObject:
53985499
m_ObjectHideFlags: 0
@@ -5709,7 +5810,7 @@ Transform:
57095810
m_LocalScale: {x: 1, y: 1, z: 1}
57105811
m_Children: []
57115812
m_Father: {fileID: 596523079}
5712-
m_RootOrder: 2
5813+
m_RootOrder: 3
57135814
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
57145815
--- !u!23 &1050940236
57155816
MeshRenderer:
@@ -7324,7 +7425,7 @@ Transform:
73247425
m_LocalScale: {x: 1, y: 1, z: 1}
73257426
m_Children: []
73267427
m_Father: {fileID: 596523079}
7327-
m_RootOrder: 9
7428+
m_RootOrder: 10
73287429
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
73297430
--- !u!23 &1343815777
73307431
MeshRenderer:
@@ -7739,7 +7840,7 @@ Transform:
77397840
m_LocalScale: {x: 1, y: 1, z: 1}
77407841
m_Children: []
77417842
m_Father: {fileID: 596523079}
7742-
m_RootOrder: 4
7843+
m_RootOrder: 5
77437844
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 179.99998}
77447845
--- !u!23 &1462505746
77457846
MeshRenderer:
@@ -8820,7 +8921,7 @@ Transform:
88208921
m_LocalScale: {x: 1, y: 1, z: 1}
88218922
m_Children: []
88228923
m_Father: {fileID: 596523079}
8823-
m_RootOrder: 12
8924+
m_RootOrder: 13
88248925
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
88258926
--- !u!23 &1701306556
88268927
MeshRenderer:
@@ -8915,7 +9016,7 @@ Transform:
89159016
m_LocalScale: {x: 1, y: 1, z: 1}
89169017
m_Children: []
89179018
m_Father: {fileID: 596523079}
8918-
m_RootOrder: 14
9019+
m_RootOrder: 15
89199020
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
89209021
--- !u!23 &1704958865
89219022
MeshRenderer:
@@ -9549,7 +9650,7 @@ Transform:
95499650
m_LocalScale: {x: 1, y: 1, z: 1}
95509651
m_Children: []
95519652
m_Father: {fileID: 596523079}
9552-
m_RootOrder: 8
9653+
m_RootOrder: 9
95539654
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
95549655
--- !u!23 &1785428292
95559656
MeshRenderer:
@@ -10879,7 +10980,7 @@ Transform:
1087910980
m_LocalScale: {x: 1, y: 1, z: 1}
1088010981
m_Children: []
1088110982
m_Father: {fileID: 596523079}
10882-
m_RootOrder: 7
10983+
m_RootOrder: 8
1088310984
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1088410985
--- !u!23 &1926593706
1088510986
MeshRenderer:
@@ -11110,7 +11211,7 @@ Transform:
1111011211
m_LocalScale: {x: 1, y: 1, z: 1}
1111111212
m_Children: []
1111211213
m_Father: {fileID: 596523079}
11113-
m_RootOrder: 15
11214+
m_RootOrder: 16
1111411215
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1111511216
--- !u!23 &1976893046
1111611217
MeshRenderer:
@@ -11965,7 +12066,7 @@ Transform:
1196512066
m_LocalScale: {x: 1, y: 1, z: 1}
1196612067
m_Children: []
1196712068
m_Father: {fileID: 596523079}
11968-
m_RootOrder: 11
12069+
m_RootOrder: 12
1196912070
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1197012071
--- !u!23 &2140997634
1197112072
MeshRenderer:

TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapProperty.mat

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: SampleCubemapProperty
11-
m_Shader: {fileID: -6465566751694194690, guid: b0e726e44403d2346bc0efbac129f619,
11+
m_Shader: {fileID: -6465566751694194690, guid: b2c278bedc246644ea7502aa5201f71a,
1212
type: 3}
1313
m_ShaderKeywords:
1414
m_LightmapFlags: 4
@@ -24,5 +24,18 @@ Material:
2424
m_Texture: {fileID: 8900000, guid: f7111c407ddfe4109af9703cb740eaf9, type: 3}
2525
m_Scale: {x: 1, y: 1}
2626
m_Offset: {x: 0, y: 0}
27+
- unity_Lightmaps:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- unity_LightmapsInd:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- unity_ShadowMasks:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
2739
m_Floats: []
2840
m_Colors: []
41+
m_BuildTextureStacks: []

TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapProperty.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)