Skip to content

Commit 632732d

Browse files
committed
Backport of #2726
1 parent dcbe5e5 commit 632732d

File tree

2 files changed

+125
-3
lines changed

2 files changed

+125
-3
lines changed

TestProjects/UniversalGraphicsTest/Assets/Scenes/119_CameraToRTWithViewportRect.unity

Lines changed: 124 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,10 +1368,15 @@ MonoBehaviour:
13681368
TargetWidth: 640
13691369
TargetHeight: 360
13701370
PerPixelCorrectnessThreshold: 0.005
1371+
PerPixelGammaThreshold: 0.003921569
1372+
PerPixelAlphaThreshold: 0.003921569
13711373
AverageCorrectnessThreshold: 0.002
1374+
IncorrectPixelsThreshold: 0.0000038146973
13721375
UseHDR: 0
13731376
UseBackBuffer: 1
13741377
ImageResolution: 4
1378+
ActiveImageTests: 1
1379+
ActivePixelTests: 7
13751380
WaitFrames: 2
13761381
XRCompatible: 1
13771382
--- !u!114 &393419561
@@ -3058,7 +3063,7 @@ Transform:
30583063
m_LocalScale: {x: 1, y: 1, z: 1}
30593064
m_Children: []
30603065
m_Father: {fileID: 1722798363}
3061-
m_RootOrder: 1
3066+
m_RootOrder: 2
30623067
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
30633068
--- !u!124 &1162497543
30643069
Behaviour:
@@ -3096,7 +3101,7 @@ Camera:
30963101
field of view: 20
30973102
orthographic: 0
30983103
orthographic size: 5
3099-
m_Depth: 0
3104+
m_Depth: 1
31003105
m_CullingMask:
31013106
serializedVersion: 2
31023107
m_Bits: 4294967295
@@ -3143,6 +3148,122 @@ MonoBehaviour:
31433148
m_RequiresDepthTexture: 0
31443149
m_RequiresColorTexture: 0
31453150
m_Version: 2
3151+
--- !u!1 &1181393623
3152+
GameObject:
3153+
m_ObjectHideFlags: 0
3154+
m_CorrespondingSourceObject: {fileID: 0}
3155+
m_PrefabInstance: {fileID: 0}
3156+
m_PrefabAsset: {fileID: 0}
3157+
serializedVersion: 6
3158+
m_Component:
3159+
- component: {fileID: 1181393624}
3160+
- component: {fileID: 1181393627}
3161+
- component: {fileID: 1181393626}
3162+
- component: {fileID: 1181393625}
3163+
m_Layer: 0
3164+
m_Name: MapCamRT_ClearTex
3165+
m_TagString: MainCamera
3166+
m_Icon: {fileID: 0}
3167+
m_NavMeshLayer: 0
3168+
m_StaticEditorFlags: 0
3169+
m_IsActive: 1
3170+
--- !u!4 &1181393624
3171+
Transform:
3172+
m_ObjectHideFlags: 0
3173+
m_CorrespondingSourceObject: {fileID: 0}
3174+
m_PrefabInstance: {fileID: 0}
3175+
m_PrefabAsset: {fileID: 0}
3176+
m_GameObject: {fileID: 1181393623}
3177+
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
3178+
m_LocalPosition: {x: 0, y: 46.1, z: 0}
3179+
m_LocalScale: {x: 1, y: 1, z: 1}
3180+
m_Children: []
3181+
m_Father: {fileID: 1722798363}
3182+
m_RootOrder: 1
3183+
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
3184+
--- !u!114 &1181393625
3185+
MonoBehaviour:
3186+
m_ObjectHideFlags: 0
3187+
m_CorrespondingSourceObject: {fileID: 0}
3188+
m_PrefabInstance: {fileID: 0}
3189+
m_PrefabAsset: {fileID: 0}
3190+
m_GameObject: {fileID: 1181393623}
3191+
m_Enabled: 1
3192+
m_EditorHideFlags: 0
3193+
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
3194+
m_Name:
3195+
m_EditorClassIdentifier:
3196+
m_RenderShadows: 1
3197+
m_RequiresDepthTextureOption: 2
3198+
m_RequiresOpaqueTextureOption: 2
3199+
m_CameraType: 0
3200+
m_Cameras: []
3201+
m_RendererIndex: -1
3202+
m_VolumeLayerMask:
3203+
serializedVersion: 2
3204+
m_Bits: 1
3205+
m_VolumeTrigger: {fileID: 0}
3206+
m_RenderPostProcessing: 0
3207+
m_Antialiasing: 0
3208+
m_AntialiasingQuality: 2
3209+
m_StopNaN: 0
3210+
m_Dithering: 0
3211+
m_ClearDepth: 1
3212+
m_AllowXRRendering: 1
3213+
m_RequiresDepthTexture: 0
3214+
m_RequiresColorTexture: 0
3215+
m_Version: 2
3216+
--- !u!124 &1181393626
3217+
Behaviour:
3218+
m_ObjectHideFlags: 0
3219+
m_CorrespondingSourceObject: {fileID: 0}
3220+
m_PrefabInstance: {fileID: 0}
3221+
m_PrefabAsset: {fileID: 0}
3222+
m_GameObject: {fileID: 1181393623}
3223+
m_Enabled: 1
3224+
--- !u!20 &1181393627
3225+
Camera:
3226+
m_ObjectHideFlags: 0
3227+
m_CorrespondingSourceObject: {fileID: 0}
3228+
m_PrefabInstance: {fileID: 0}
3229+
m_PrefabAsset: {fileID: 0}
3230+
m_GameObject: {fileID: 1181393623}
3231+
m_Enabled: 1
3232+
serializedVersion: 2
3233+
m_ClearFlags: 2
3234+
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
3235+
m_projectionMatrixMode: 1
3236+
m_GateFitMode: 2
3237+
m_FOVAxisMode: 0
3238+
m_SensorSize: {x: 36, y: 24}
3239+
m_LensShift: {x: 0, y: 0}
3240+
m_FocalLength: 50
3241+
m_NormalizedViewPortRect:
3242+
serializedVersion: 2
3243+
x: 0
3244+
y: 0
3245+
width: 1
3246+
height: 1
3247+
near clip plane: 0.3
3248+
far clip plane: 1000
3249+
field of view: 20
3250+
orthographic: 0
3251+
orthographic size: 5
3252+
m_Depth: 0
3253+
m_CullingMask:
3254+
serializedVersion: 2
3255+
m_Bits: 0
3256+
m_RenderingPath: -1
3257+
m_TargetTexture: {fileID: 8400000, guid: 0cb5eda82b7636a4891199a3082f6c18, type: 2}
3258+
m_TargetDisplay: 0
3259+
m_TargetEye: 3
3260+
m_HDR: 0
3261+
m_AllowMSAA: 0
3262+
m_AllowDynamicResolution: 0
3263+
m_ForceIntoRT: 0
3264+
m_OcclusionCulling: 1
3265+
m_StereoConvergence: 10
3266+
m_StereoSeparation: 0.022
31463267
--- !u!1 &1189044691
31473268
GameObject:
31483269
m_ObjectHideFlags: 0
@@ -4433,6 +4554,7 @@ Transform:
44334554
m_LocalScale: {x: 1, y: 1, z: 1}
44344555
m_Children:
44354556
- {fileID: 393419556}
4557+
- {fileID: 1181393624}
44364558
- {fileID: 1162497541}
44374559
m_Father: {fileID: 0}
44384560
m_RootOrder: 2

TestProjects/UniversalGraphicsTest/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RenderTexture:
1818
m_Height: 64
1919
m_AntiAliasing: 1
2020
m_MipCount: -1
21-
m_DepthFormat: 2
21+
m_DepthFormat: 0
2222
m_ColorFormat: 8
2323
m_MipMap: 0
2424
m_GenerateMips: 1

0 commit comments

Comments
 (0)