Skip to content

Commit 688281a

Browse files
Merge pull request #30 from unity-game-framework/issue-26-add-ui-toolkit-support
Add UI Toolkit support
2 parents eaf7565 + 9f3c8b2 commit 688281a

File tree

381 files changed

+1134
-11018
lines changed

Some content is hidden

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

381 files changed

+1134
-11018
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ crashlytics-build.properties
6969

7070
# Temporary auto-generated Android Assets
7171
/[Aa]ssets/[Ss]treamingAssets/aa.meta
72-
/[Aa]ssets/[Ss]treamingAssets/aa/*
72+
/[Aa]ssets/[Ss]treamingAssets/aa/*
73+
/UIElementsSchema

Assets/Scenes/Empty.unity

Lines changed: 60 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -320,7 +319,7 @@ GameObject:
320319
m_Icon: {fileID: 0}
321320
m_NavMeshLayer: 0
322321
m_StaticEditorFlags: 0
323-
m_IsActive: 1
322+
m_IsActive: 0
324323
--- !u!4 &729525158
325324
Transform:
326325
m_ObjectHideFlags: 0
@@ -394,6 +393,57 @@ MonoBehaviour:
394393
m_Name:
395394
m_EditorClassIdentifier:
396395
m_provider: {fileID: 11400000, guid: 86583775dadcab140bb014903c0da5e9, type: 2}
396+
--- !u!1 &961721283
397+
GameObject:
398+
m_ObjectHideFlags: 0
399+
m_CorrespondingSourceObject: {fileID: 0}
400+
m_PrefabInstance: {fileID: 0}
401+
m_PrefabAsset: {fileID: 0}
402+
serializedVersion: 6
403+
m_Component:
404+
- component: {fileID: 961721285}
405+
- component: {fileID: 961721284}
406+
m_Layer: 5
407+
m_Name: UIDocument
408+
m_TagString: Untagged
409+
m_Icon: {fileID: 0}
410+
m_NavMeshLayer: 0
411+
m_StaticEditorFlags: 0
412+
m_IsActive: 0
413+
--- !u!114 &961721284
414+
MonoBehaviour:
415+
m_ObjectHideFlags: 0
416+
m_CorrespondingSourceObject: {fileID: 0}
417+
m_PrefabInstance: {fileID: 0}
418+
m_PrefabAsset: {fileID: 0}
419+
m_GameObject: {fileID: 961721283}
420+
m_Enabled: 1
421+
m_EditorHideFlags: 0
422+
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
423+
m_Name:
424+
m_EditorClassIdentifier:
425+
m_PanelSettings: {fileID: 11400000, guid: aea7462e536e7fd4aa01dcd8a1b99f73, type: 2}
426+
m_ParentUI: {fileID: 0}
427+
sourceAsset: {fileID: 9197481963319205126, guid: 6af43bb856d25b746b93d4d3cccb6f12, type: 3}
428+
m_SortingOrder: 0
429+
m_WorldSpaceSizeMode: 1
430+
m_WorldSpaceWidth: 1920
431+
m_WorldSpaceHeight: 1080
432+
--- !u!4 &961721285
433+
Transform:
434+
m_ObjectHideFlags: 0
435+
m_CorrespondingSourceObject: {fileID: 0}
436+
m_PrefabInstance: {fileID: 0}
437+
m_PrefabAsset: {fileID: 0}
438+
m_GameObject: {fileID: 961721283}
439+
serializedVersion: 2
440+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
441+
m_LocalPosition: {x: 0, y: 0, z: 0}
442+
m_LocalScale: {x: 1, y: 1, z: 1}
443+
m_ConstrainProportionsScale: 0
444+
m_Children: []
445+
m_Father: {fileID: 0}
446+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
397447
--- !u!1 &1090728033
398448
GameObject:
399449
m_ObjectHideFlags: 0
@@ -439,7 +489,7 @@ MonoBehaviour:
439489
m_PrefabInstance: {fileID: 0}
440490
m_PrefabAsset: {fileID: 0}
441491
m_GameObject: {fileID: 1090728033}
442-
m_Enabled: 0
492+
m_Enabled: 1
443493
m_EditorHideFlags: 0
444494
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
445495
m_Name:
@@ -499,6 +549,7 @@ MeshRenderer:
499549
m_RayTraceProcedural: 0
500550
m_RayTracingAccelStructBuildFlagsOverride: 0
501551
m_RayTracingAccelStructBuildFlags: 1
552+
m_SmallMeshCulling: 1
502553
m_RenderingLayerMask: 1
503554
m_RendererPriority: 0
504555
m_Materials:
@@ -639,26 +690,13 @@ GameObject:
639690
serializedVersion: 6
640691
m_Component:
641692
- component: {fileID: 1531290048}
642-
- component: {fileID: 1531290047}
643693
m_Layer: 0
644694
m_Name: TestDebugUIDrawer
645695
m_TagString: Untagged
646696
m_Icon: {fileID: 7866945982896999795, guid: 0000000000000000d000000000000000, type: 0}
647697
m_NavMeshLayer: 0
648698
m_StaticEditorFlags: 0
649699
m_IsActive: 0
650-
--- !u!114 &1531290047
651-
MonoBehaviour:
652-
m_ObjectHideFlags: 0
653-
m_CorrespondingSourceObject: {fileID: 0}
654-
m_PrefabInstance: {fileID: 0}
655-
m_PrefabAsset: {fileID: 0}
656-
m_GameObject: {fileID: 1531290046}
657-
m_Enabled: 1
658-
m_EditorHideFlags: 0
659-
m_Script: {fileID: 11500000, guid: 4dd617f7d3454e03879cc0640c87aafb, type: 3}
660-
m_Name:
661-
m_EditorClassIdentifier:
662700
--- !u!4 &1531290048
663701
Transform:
664702
m_ObjectHideFlags: 0
@@ -711,6 +749,7 @@ MeshRenderer:
711749
m_RayTraceProcedural: 0
712750
m_RayTracingAccelStructBuildFlagsOverride: 0
713751
m_RayTracingAccelStructBuildFlags: 1
752+
m_SmallMeshCulling: 1
714753
m_RenderingLayerMask: 1
715754
m_RendererPriority: 0
716755
m_Materials:
@@ -835,8 +874,12 @@ Light:
835874
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
836875
m_UseBoundingSphereOverride: 0
837876
m_UseViewFrustumForShadowCasterCull: 1
877+
m_ForceVisible: 0
838878
m_ShadowRadius: 0
839879
m_ShadowAngle: 0
880+
m_LightUnit: 1
881+
m_LuxAtDistance: 1
882+
m_EnableSpotReflector: 1
840883
--- !u!4 &1733260603
841884
Transform:
842885
m_ObjectHideFlags: 0
@@ -1031,3 +1074,4 @@ SceneRoots:
10311074
- {fileID: 1733260603}
10321075
- {fileID: 1090728036}
10331076
- {fileID: 52357922}
1077+
- {fileID: 961721285}

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIFunctionDrawer.asset

Lines changed: 0 additions & 18 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionLog.asset renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUILogElement.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: bdf8e83e97a14be588149809fd72be07, type: 3}
13-
m_Name: DebugUISectionLog
12+
m_Script: {fileID: 11500000, guid: 86371c13b4a04a5582c694488523a568, type: 3}
13+
m_Name: DebugUILogElement
1414
m_EditorClassIdentifier:

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIPanelDrawer.asset.meta renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUILogElement.asset.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.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
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: ab278e66c6444b67b2ad2cec1ec398f1, type: 3}
13+
m_Name: DebugUIMenuElement
14+
m_EditorClassIdentifier:
15+
m_displayName: Debug Menu
16+
m_menu:
17+
- m_name: Log
18+
m_element: {fileID: 11400000, guid: 0fa65e93e3ad3684183f9a1f295f2f61, type: 2}
19+
- m_name: Test 1
20+
m_element: {fileID: 11400000, guid: f86c269d4588ce7458554c74e06f9b54, type: 2}
21+
- m_name: Test 2
22+
m_element: {fileID: 11400000, guid: e2589b9ae1a2a1b43b869efdfc789269, type: 2}

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugGLOptionsSection.asset.meta renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIMenuElement.asset.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.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIProvider.asset

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 2d0fa9b121f64e1f83b28ca10e31f731, type: 3}
1313
m_Name: DebugUIProvider
1414
m_EditorClassIdentifier:
15-
m_enable: 1
16-
m_scale: 1.5
17-
m_skin: {fileID: 11400000, guid: 4346a5dd01e15a745b7d3df2ba5ab6d3, type: 2}
18-
m_drawers:
15+
m_documentGameObjectName: DebugUIDocument
16+
m_panelSettings: {fileID: 11400000, guid: aea7462e536e7fd4aa01dcd8a1b99f73, type: 2}
17+
m_elements:
1918
- m_guid:
20-
m_first: 15250463461747492690
21-
m_second: 6755841746922121752
22-
m_asset: {fileID: 11400000, guid: d188875287b7d3a4182a0c5c4692c15d, type: 2}
19+
serializedVersion: 2
20+
Hash: be2fef809798e9846a58212d1aad47d0
21+
m_asset: {fileID: 11400000, guid: be2fef809798e9846a58212d1aad47d0, type: 2}
2322
- m_guid:
24-
m_first: 4504984439284446958
25-
m_second: 5024863672204210491
26-
m_asset: {fileID: 11400000, guid: a63636eeeb7a3e843b317f12e3e6bb45, type: 2}
27-
- m_guid:
28-
m_first: 18425378906131320046
29-
m_second: 8196283146458756153
30-
m_asset: {fileID: 11400000, guid: 47eeccee187effb439f4318f180cbf71, type: 2}
23+
serializedVersion: 2
24+
Hash: 60cd3c2b48853f54da28610dd4153c79
25+
m_asset: {fileID: 11400000, guid: 60cd3c2b48853f54da28610dd4153c79, type: 2}

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionDrawer.asset

Lines changed: 0 additions & 42 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionLog.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionOptions.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionSkins.asset

Lines changed: 0 additions & 17 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionSkins.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionStats.asset

Lines changed: 0 additions & 19 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionStats.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionOptions.asset renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIStatsElement.asset

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb5e8f967784494581466902f18adcb3, type: 3}
13-
m_Name: DebugUISectionOptions
12+
m_Script: {fileID: 11500000, guid: 92f97b728620455aa83259a9993e5890, type: 3}
13+
m_Name: DebugUIStatsElement
1414
m_EditorClassIdentifier:
15+
m_updateInterval: 10000000

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUISectionDrawer.asset.meta renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIStatsElement.asset.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.

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugGLOptionsSection.asset renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/TestDebugUIElement_1.asset

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 2fa68432b86f4196b9ae14b28fa6c4fc, type: 3}
13-
m_Name: DebugGLOptionsSection
12+
m_Script: {fileID: 11500000, guid: 607e2991dddb456a895c7ff4cab0cfd9, type: 3}
13+
m_Name: TestDebugUIElement_1
1414
m_EditorClassIdentifier:
15+
m_message: Test 1

Assets/UGF.DebugTools.Runtime.Tests/Resources/DebugUIFunctionDrawer.asset.meta renamed to Assets/UGF.DebugTools.Runtime.Tests/Resources/TestDebugUIElement_1.asset.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)