Skip to content

Commit c15ae9a

Browse files
BrianWill-UnityBrianWill-Unity
committed
update Entities samples for 1.2
1 parent 7d85edb commit c15ae9a

File tree

1,360 files changed

+194463
-6200
lines changed

Some content is hidden

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

1,360 files changed

+194463
-6200
lines changed

‎.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* text=auto
1+
* text=auto eol=lf
22

33
*.compute text
44
*.cs diff=csharp text
@@ -14,3 +14,4 @@
1414

1515
# the ms t4 processor requires crlf
1616
*.tt eol=crlf text
17+

‎EntitiesSamples/Assets/Baking/AutoAuthoring/AutoAuthoring.unity

+15-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028305, g: 0.22571313, b: 0.3069213, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -152,15 +152,15 @@ MonoBehaviour:
152152
m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3}
153153
m_Name:
154154
m_EditorClassIdentifier:
155-
_SceneAsset: {fileID: 102900000, guid: d8b057cbf46b742b593f446133c6da9b, type: 3}
155+
_SceneAsset: {fileID: 102900000, guid: 590fc2f9a1b024a71a648bc16c92872e, type: 3}
156156
_HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
157157
AutoLoadScene: 1
158158
_SceneGUID:
159159
Value:
160-
x: 3161787277
161-
y: 2991044175
162-
z: 373617557
163-
w: 3115150387
160+
x: 2670522517
161+
y: 2051148570
162+
z: 481838753
163+
w: 3799525830
164164
--- !u!4 &306593708
165165
Transform:
166166
m_ObjectHideFlags: 0
@@ -283,7 +283,7 @@ MonoBehaviour:
283283
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
284284
m_Name:
285285
m_EditorClassIdentifier:
286-
m_Version: 2
286+
m_Version: 3
287287
m_UsePipelineSettings: 1
288288
m_AdditionalLightsShadowResolutionTier: 2
289289
m_LightLayerMask: 1
@@ -293,7 +293,7 @@ MonoBehaviour:
293293
m_ShadowRenderingLayers: 1
294294
m_LightCookieSize: {x: 1, y: 1}
295295
m_LightCookieOffset: {x: 0, y: 0}
296-
m_SoftShadowQuality: 1
296+
m_SoftShadowQuality: 2
297297
--- !u!1 &1626755723
298298
GameObject:
299299
m_ObjectHideFlags: 0
@@ -423,3 +423,10 @@ MonoBehaviour:
423423
m_RequiresDepthTexture: 0
424424
m_RequiresColorTexture: 0
425425
m_Version: 2
426+
m_TaaSettings:
427+
quality: 3
428+
frameInfluence: 0.1
429+
jitterScale: 1
430+
mipBias: 0
431+
varianceClampScale: 0.9
432+
contrastAdaptiveSharpening: 0

‎EntitiesSamples/Assets/Baking/AutoAuthoring/AutoAuthoring.unity.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EntitiesSamples/Assets/Baking/AutoAuthoring/BakingTypeAutoAuthoring/BakingTypeAutoAuthoring.cs.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EntitiesSamples/Assets/Baking/AutoAuthoring/BakingTypeAutoAuthoring/RuntimeRefactoring.unity

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028305, g: 0.22571313, b: 0.3069213, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -152,15 +152,15 @@ MonoBehaviour:
152152
m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3}
153153
m_Name:
154154
m_EditorClassIdentifier:
155-
_SceneAsset: {fileID: 102900000, guid: ebc7a868a28994e71a6aed764fa63853, type: 3}
155+
_SceneAsset: {fileID: 102900000, guid: 4c1360ac2ee2044ae9af06ccec8328bf, type: 3}
156156
_HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
157157
AutoLoadScene: 1
158158
_SceneGUID:
159159
Value:
160-
x: 2257222846
161-
y: 2118752298
162-
z: 1742644897
163-
w: 897805044
160+
x: 3389403588
161+
y: 2755669730
162+
z: 3428907678
163+
w: 4219615438
164164
--- !u!4 &1234012107
165165
Transform:
166166
m_ObjectHideFlags: 0
@@ -283,7 +283,7 @@ MonoBehaviour:
283283
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
284284
m_Name:
285285
m_EditorClassIdentifier:
286-
m_Version: 2
286+
m_Version: 3
287287
m_UsePipelineSettings: 1
288288
m_AdditionalLightsShadowResolutionTier: 2
289289
m_LightLayerMask: 1
@@ -293,7 +293,7 @@ MonoBehaviour:
293293
m_ShadowRenderingLayers: 1
294294
m_LightCookieSize: {x: 1, y: 1}
295295
m_LightCookieOffset: {x: 0, y: 0}
296-
m_SoftShadowQuality: 1
296+
m_SoftShadowQuality: 2
297297
--- !u!1 &1851059234
298298
GameObject:
299299
m_ObjectHideFlags: 0

‎EntitiesSamples/Assets/Baking/AutoAuthoring/BakingTypeAutoAuthoring/RuntimeRefactoring.unity.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7626342127535445799
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 7
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: Blue
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords: []
28+
m_InvalidKeywords: []
29+
m_LightmapFlags: 4
30+
m_EnableInstancingVariants: 0
31+
m_DoubleSidedGI: 0
32+
m_CustomRenderQueue: -1
33+
stringTagMap:
34+
RenderType: Opaque
35+
disabledShaderPasses: []
36+
m_LockedProperties:
37+
m_SavedProperties:
38+
serializedVersion: 3
39+
m_TexEnvs:
40+
- _BaseMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _BumpMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailAlbedoMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailMask:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _DetailNormalMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _EmissionMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MainTex:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _MetallicGlossMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _OcclusionMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _ParallaxMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- _SpecGlossMap:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_Lightmaps:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_LightmapsInd:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- unity_ShadowMasks:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
96+
m_Ints: []
97+
m_Floats:
98+
- _AlphaClip: 0
99+
- _AlphaToMask: 0
100+
- _Blend: 0
101+
- _BlendModePreserveSpecular: 1
102+
- _BumpScale: 1
103+
- _ClearCoatMask: 0
104+
- _ClearCoatSmoothness: 0
105+
- _Cull: 2
106+
- _Cutoff: 0.5
107+
- _DetailAlbedoMapScale: 1
108+
- _DetailNormalMapScale: 1
109+
- _DstBlend: 0
110+
- _DstBlendAlpha: 0
111+
- _EnvironmentReflections: 1
112+
- _GlossMapScale: 0
113+
- _Glossiness: 0
114+
- _GlossyReflections: 0
115+
- _Metallic: 0
116+
- _OcclusionStrength: 1
117+
- _Parallax: 0.005
118+
- _QueueOffset: 0
119+
- _ReceiveShadows: 1
120+
- _Smoothness: 0.5
121+
- _SmoothnessTextureChannel: 0
122+
- _SpecularHighlights: 1
123+
- _SrcBlend: 1
124+
- _SrcBlendAlpha: 1
125+
- _Surface: 0
126+
- _WorkflowMode: 1
127+
- _ZWrite: 1
128+
m_Colors:
129+
- _BaseColor: {r: 0.12549017, g: 0.43264806, b: 0.90588236, a: 1}
130+
- _Color: {r: 0.12549013, g: 0.43264803, b: 0.90588236, a: 1}
131+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133+
m_BuildTextureStacks: []

‎EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)