Skip to content

Commit 62b85f6

Browse files
committed
Upgrade to Unity 6 Preview - Support WebGPU
1 parent 1f6a4c4 commit 62b85f6

File tree

402 files changed

+48969
-20470
lines changed

Some content is hidden

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

402 files changed

+48969
-20470
lines changed

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2180264
44
Material:
5-
serializedVersion: 8
5+
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: LiberationSans SDF Material
1111
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
12-
m_Parent: {fileID: 0}
13-
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
15-
m_InvalidKeywords: []
12+
m_ShaderKeywords:
1613
m_LightmapFlags: 1
1714
m_EnableInstancingVariants: 0
1815
m_DoubleSidedGI: 0
1916
m_CustomRenderQueue: -1
2017
stringTagMap: {}
2118
disabledShaderPasses: []
22-
m_LockedProperties:
2319
m_SavedProperties:
2420
serializedVersion: 3
2521
m_TexEnvs:
@@ -71,7 +67,6 @@ Material:
7167
m_Texture: {fileID: 0}
7268
m_Scale: {x: 1, y: 1}
7369
m_Offset: {x: 0, y: 0}
74-
m_Ints: []
7570
m_Floats:
7671
- _Ambient: 0.5
7772
- _Bevel: 0.5
@@ -112,9 +107,9 @@ Material:
112107
- _Parallax: 0.02
113108
- _PerspectiveFilter: 0.875
114109
- _Reflectivity: 10
115-
- _ScaleRatioA: 0.9
110+
- _ScaleRatioA: 0.90909094
116111
- _ScaleRatioB: 0.73125
117-
- _ScaleRatioC: 0.73125
112+
- _ScaleRatioC: 0.7386364
118113
- _ScaleX: 1
119114
- _ScaleY: 1
120115
- _ShaderFlags: 0
@@ -153,7 +148,6 @@ Material:
153148
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
154149
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
155150
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
156-
m_BuildTextureStacks: []
157151
--- !u!114 &11400000
158152
MonoBehaviour:
159153
m_ObjectHideFlags: 0
@@ -166,21 +160,18 @@ MonoBehaviour:
166160
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
167161
m_Name: LiberationSans SDF - Fallback
168162
m_EditorClassIdentifier:
169-
hashCode: -1699145518
170-
material: {fileID: 2180264}
171-
materialHashCode: 462855346
172163
m_Version: 1.1.0
164+
m_Material: {fileID: 2180264}
173165
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
174-
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
175166
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
176167
m_AtlasPopulationMode: 1
168+
InternalDynamicOS: 0
177169
m_FaceInfo:
178170
m_FaceIndex: 0
179171
m_FamilyName: Liberation Sans
180172
m_StyleName: Regular
181173
m_PointSize: 86
182174
m_Scale: 1
183-
m_UnitsPerEM: 0
184175
m_LineHeight: 98.8916
185176
m_AscentLine: 77.853516
186177
m_CapLine: 59
@@ -201,7 +192,7 @@ MonoBehaviour:
201192
m_AtlasTextures:
202193
- {fileID: 28268798066460806}
203194
m_AtlasTextureIndex: 0
204-
m_IsMultiAtlasTexturesEnabled: 0
195+
m_IsMultiAtlasTexturesEnabled: 1
205196
m_ClearDynamicDataOnBuild: 1
206197
m_UsedGlyphRects: []
207198
m_FreeGlyphRects:
@@ -240,15 +231,21 @@ MonoBehaviour:
240231
m_KerningTable:
241232
kerningPairs: []
242233
m_FontFeatureTable:
234+
m_MultipleSubstitutionRecords: []
235+
m_LigatureSubstitutionRecords: []
243236
m_GlyphPairAdjustmentRecords: []
237+
m_MarkToBaseAdjustmentRecords: []
238+
m_MarkToMarkAdjustmentRecords: []
244239
fallbackFontAssets: []
245240
m_FallbackFontAssetTable: []
246241
m_CreationSettings:
247242
sourceFontFileName:
248243
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
244+
faceIndex: 0
249245
pointSizeSamplingMode: 0
250246
pointSize: 86
251247
padding: 9
248+
paddingMode: 0
252249
packingMode: 4
253250
atlasWidth: 512
254251
atlasHeight: 512
@@ -320,21 +317,15 @@ Texture2D:
320317
Hash: 00000000000000000000000000000000
321318
m_ForcedFallbackFormat: 4
322319
m_DownscaleFallback: 0
323-
m_IsAlphaChannelOptional: 0
324320
serializedVersion: 2
325321
m_Width: 0
326322
m_Height: 0
327323
m_CompleteImageSize: 0
328-
m_MipsStripped: 0
329324
m_TextureFormat: 1
330325
m_MipCount: 1
331326
m_IsReadable: 1
332-
m_IsPreProcessed: 0
333-
m_IgnoreMipmapLimit: 0
334-
m_MipmapLimitGroupName:
335327
m_StreamingMipmaps: 0
336328
m_StreamingMipmapsPriority: 0
337-
m_VTOnly: 0
338329
m_AlphaIsTransparency: 0
339330
m_ImageCount: 1
340331
m_TextureDimension: 2
@@ -348,11 +339,9 @@ Texture2D:
348339
m_WrapW: 0
349340
m_LightmapFormat: 0
350341
m_ColorSpace: 0
351-
m_PlatformBlob:
352342
image data: 0
353343
_typelessdata:
354344
m_StreamData:
355-
serializedVersion: 2
356345
offset: 0
357346
size: 0
358347
path:

Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,48 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0
1112
m_Script: {fileID: 11500000, guid: ab2114bdc8544297b417dfefe9f1e410, type: 3}
1213
m_Name: Default Style Sheet
1314
m_EditorClassIdentifier:
1415
m_StyleList:
16+
- m_Name: Normal
17+
m_HashCode: -1183493901
18+
m_OpeningDefinition:
19+
m_ClosingDefinition:
20+
m_OpeningTagArray:
21+
m_ClosingTagArray:
1522
- m_Name: H1
1623
m_HashCode: 2425
1724
m_OpeningDefinition: <size=2em><b><#40ff80>*
1825
m_ClosingDefinition: '*</size></b></color>'
1926
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d00000032000000650000006d0000003e0000003c000000620000003e0000003c000000230000003400000030000000660000006600000038000000300000003e0000002a000000
2027
m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
2128
- m_Name: Quote
22-
m_HashCode: 92254330
29+
m_HashCode: 93368250
2330
m_OpeningDefinition: <i><size=75%><margin=10%>
2431
m_ClosingDefinition: </i></size></width></margin>
2532
m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
2633
m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
34+
- m_Name: A
35+
m_HashCode: 65
36+
m_OpeningDefinition: <color=#40a0ff><u>
37+
m_ClosingDefinition: </u></color>
38+
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000003400000030000000610000003000000066000000660000003e0000003c000000750000003e000000
39+
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
2740
- m_Name: Link
28-
m_HashCode: 2687968
41+
m_HashCode: 2656128
2942
m_OpeningDefinition: <u><#40a0ff><link="ID_01">
3043
m_ClosingDefinition: </u></color></link>
3144
m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
3245
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
3346
- m_Name: Title
34-
m_HashCode: 98732960
47+
m_HashCode: 97690656
3548
m_OpeningDefinition: <size=125%><b><align=center>
3649
m_ClosingDefinition: </size></b></align>
3750
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000

Assets/TextMesh Pro/Resources/TMP Settings.asset

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 2705215ac5b84b70bacc50632be6e391, type: 3}
1313
m_Name: TMP Settings
1414
m_EditorClassIdentifier:
15-
m_enableWordWrapping: 1
15+
assetVersion: 2
16+
m_TextWrappingMode: 1
1617
m_enableKerning: 1
18+
m_ActiveFontFeatures: 00000000
1719
m_enableExtraPadding: 0
1820
m_enableTintAllSprites: 0
1921
m_enableParseEscapeCharacters: 1
2022
m_EnableRaycastTarget: 1
2123
m_GetFontFeaturesAtRuntime: 1
2224
m_missingGlyphCharacter: 0
25+
m_ClearDynamicDataOnBuild: 1
2326
m_warningsDisabled: 0
2427
m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
2528
m_defaultFontAssetPath: Fonts & Materials/
@@ -29,18 +32,18 @@ MonoBehaviour:
2932
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
3033
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
3134
m_autoSizeTextContainer: 0
35+
m_IsTextObjectScaleStatic: 0
3236
m_fallbackFontAssets: []
3337
m_matchMaterialPreset: 1
34-
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
35-
type: 2}
38+
m_HideSubTextObjects: 1
39+
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
3640
m_defaultSpriteAssetPath: Sprite Assets/
3741
m_enableEmojiSupport: 1
3842
m_MissingCharacterSpriteUnicode: 0
43+
m_EmojiFallbackTextAssets: []
3944
m_defaultColorGradientPresetsPath: Color Gradient Presets/
40-
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
41-
type: 2}
45+
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
4246
m_StyleSheetsResourcePath:
4347
m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
44-
m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
45-
type: 3}
48+
m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
4649
m_UseModernHangulLineBreakingRules: 0

0 commit comments

Comments
 (0)