Skip to content

Commit b10ee57

Browse files
authored
Merge pull request #337 from PlayEveryWare/release-2.3.3
Release 2.3.3
2 parents c74373e + 432d2d5 commit b10ee57

33 files changed

+916
-1928
lines changed

Assets/Materials/PerformanceStressTestMaterials/BaseObject.mat

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: BaseObject
24-
m_Shader: {fileID: -6465566751694194690, guid: 5cb306dad1168d348818eb5d01e4f94a,
25-
type: 3}
24+
m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
2625
m_ValidKeywords: []
2726
m_InvalidKeywords: []
2827
m_LightmapFlags: 4
2928
m_EnableInstancingVariants: 0
30-
m_DoubleSidedGI: 0
29+
m_DoubleSidedGI: 1
3130
m_CustomRenderQueue: -1
3231
stringTagMap: {}
3332
disabledShaderPasses: []
@@ -70,6 +69,10 @@ Material:
7069
m_Texture: {fileID: 0}
7170
m_Scale: {x: 1, y: 1}
7271
m_Offset: {x: 0, y: 0}
72+
- _SpecGlossMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
7376
m_Ints: []
7477
m_Floats:
7578
- _BUILTIN_QueueControl: 0
@@ -93,4 +96,5 @@ Material:
9396
m_Colors:
9497
- _Color: {r: 1, g: 0.039215688, b: 0.45882356, a: 1}
9598
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
99+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
96100
m_BuildTextureStacks: []

Assets/Materials/PerformanceStressTestMaterials/GraphicsTestSphereMat.mat

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: GraphicsTestSphereMat
11-
m_Shader: {fileID: -6465566751694194690, guid: 5cb306dad1168d348818eb5d01e4f94a,
12-
type: 3}
13-
m_ValidKeywords: []
14-
m_InvalidKeywords:
11+
m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ValidKeywords:
1513
- _DETAIL_MULX2
1614
- _NORMALMAP
15+
m_InvalidKeywords: []
1716
m_LightmapFlags: 4
1817
m_EnableInstancingVariants: 0
19-
m_DoubleSidedGI: 0
18+
m_DoubleSidedGI: 1
2019
m_CustomRenderQueue: -1
2120
stringTagMap: {}
2221
disabledShaderPasses: []
@@ -59,6 +58,10 @@ Material:
5958
m_Texture: {fileID: 0}
6059
m_Scale: {x: 1, y: 1}
6160
m_Offset: {x: 0, y: 0}
61+
- _SpecGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
6265
m_Ints: []
6366
m_Floats:
6467
- _BUILTIN_QueueControl: 0
@@ -82,6 +85,7 @@ Material:
8285
m_Colors:
8386
- _Color: {r: 1, g: 1, b: 1, a: 1}
8487
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
88+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
8589
m_BuildTextureStacks: []
8690
--- !u!114 &5865323441971905698
8791
MonoBehaviour:

Assets/Materials/PerformanceStressTestMaterials/PerformanceLightingSettings.lighting

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ LightingSettings:
99
m_Name: PerformanceLightingSettings
1010
serializedVersion: 4
1111
m_GIWorkflowMode: 0
12-
m_EnableBakedLightmaps: 1
13-
m_EnableRealtimeLightmaps: 0
12+
m_EnableBakedLightmaps: 0
13+
m_EnableRealtimeLightmaps: 1
1414
m_RealtimeEnvironmentLighting: 1
1515
m_BounceScale: 1
1616
m_AlbedoBoost: 1
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Skybox
11+
m_Shader: {fileID: 108, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ValidKeywords: []
13+
m_InvalidKeywords:
14+
- _MAPPING_LATITUDE_LONGITUDE_LAYOUT
15+
- _SUNDISK_HIGH_QUALITY
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 1
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_SavedProperties:
23+
serializedVersion: 3
24+
m_TexEnvs:
25+
- _BumpMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailAlbedoMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailMask:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailNormalMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _EmissionMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MainTex:
46+
m_Texture: {fileID: 2800000, guid: 5c6f26400cfc55c49bc6177063379693, type: 3}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _MetallicGlossMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _OcclusionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _ParallaxMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
m_Ints: []
62+
m_Floats:
63+
- _AtmosphereThickness: 1
64+
- _BumpScale: 1
65+
- _Cutoff: 0.5
66+
- _DetailNormalMapScale: 1
67+
- _DstBlend: 0
68+
- _Exposure: 1.3
69+
- _GlossMapScale: 1
70+
- _Glossiness: 0.5
71+
- _GlossyReflections: 1
72+
- _ImageType: 0
73+
- _Layout: 0
74+
- _Mapping: 1
75+
- _Metallic: 0
76+
- _MirrorOnBack: 0
77+
- _Mode: 0
78+
- _OcclusionStrength: 1
79+
- _Parallax: 0.02
80+
- _Rotation: 0
81+
- _SmoothnessTextureChannel: 0
82+
- _SpecularHighlights: 1
83+
- _SrcBlend: 1
84+
- _SunDisk: 2
85+
- _SunSize: 0.107
86+
- _SunSizeConvergence: 5
87+
- _UVSec: 0
88+
- _ZWrite: 1
89+
m_Colors:
90+
- _Color: {r: 1, g: 1, b: 1, a: 1}
91+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
92+
- _GroundColor: {r: 0.369, g: 0.349, b: 0.341, a: 1}
93+
- _SkyTint: {r: 0.5, g: 0.5, b: 0.5, a: 1}
94+
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
95+
m_BuildTextureStacks: []

Assets/Materials/PerformanceStressTestMaterials/Skybox.mat.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)