Skip to content

Change UI and GL events execution #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 22, 2021
Merged

Change UI and GL events execution #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
add50d0
Change DebugGL and DebugUI
AlexanderVorobyov Sep 22, 2021
2583023
Add DebugGLComponent
AlexanderVorobyov Sep 22, 2021
074ae57
Add DebugUIComponent
AlexanderVorobyov Sep 22, 2021
cef2fe1
Remove project settings
AlexanderVorobyov Sep 22, 2021
7f67d18
Remove DebugUIEventComponent
AlexanderVorobyov Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 177 additions & 4 deletions Assets/Scenes/Empty.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,179 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &68777780
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 68777783}
- component: {fileID: 68777782}
m_Layer: 0
m_Name: Camera_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!20 &68777782
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 68777780}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 0.25
height: 0.25
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &68777783
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 68777780}
m_LocalRotation: {x: -0.149608, y: 0.8423521, z: -0.29731724, w: -0.4238666}
m_LocalPosition: {x: 4.746426, y: 4.7661033, z: 3.5221124}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &729525157
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 729525158}
- component: {fileID: 729525159}
m_Layer: 0
m_Name: DebugGL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &729525158
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 729525157}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &729525159
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 729525157}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f703d31518bf42139c3e84790d308364, type: 3}
m_Name:
m_EditorClassIdentifier:
m_enable: 1
m_defaultMaterial: {fileID: 0}
m_shapes: []
--- !u!1 &770230239
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 770230240}
- component: {fileID: 770230241}
m_Layer: 0
m_Name: DebugUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &770230240
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 770230239}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &770230241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 770230239}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cc789d3dfe8e4c90ae18d29e6a687166, type: 3}
m_Name:
m_EditorClassIdentifier:
m_enable: 1
m_scale: 2
m_skin: {fileID: 11400000, guid: 4346a5dd01e15a745b7d3df2ba5ab6d3, type: 2}
m_drawers:
- m_guid: f856bfcfa6327534fbdcfb32e09bad6f
m_asset: {fileID: 11400000, guid: f856bfcfa6327534fbdcfb32e09bad6f, type: 2}
- m_guid: e22946bc75712b245899bc6dfb0c8498
m_asset: {fileID: 11400000, guid: e22946bc75712b245899bc6dfb0c8498, type: 2}
- m_guid: 2c3a2510c22cba645ac071cc0c57d937
m_asset: {fileID: 11400000, guid: 2c3a2510c22cba645ac071cc0c57d937, type: 2}
--- !u!1 &1188849071
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -203,7 +376,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1507539452
GameObject:
Expand Down Expand Up @@ -320,7 +493,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1572831520
GameObject:
Expand Down Expand Up @@ -402,7 +575,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1823135811
GameObject:
Expand Down Expand Up @@ -433,7 +606,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1823135813
MonoBehaviour:
Expand Down
8 changes: 0 additions & 8 deletions Assets/Settings.meta
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Settings/Resources.meta
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Settings/Resources/UGF.DebugTools.meta
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions Assets/Settings/Resources/UGF.DebugTools/DebugGLSettings.asset
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Settings/Resources/UGF.DebugTools/DebugGLSettings.asset.meta
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions Assets/Settings/Resources/UGF.DebugTools/DebugUISettings.asset
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Settings/Resources/UGF.DebugTools/DebugUISettings.asset.meta
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ools/Editor/DebugGLSettingsAssetEditor.cs → ...bugTools/Editor/DebugGLComponentEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

namespace UGF.DebugTools.Editor
{
[CustomEditor(typeof(DebugGLSettingsAsset), true)]
internal class DebugGLSettingsAssetEditor : UnityEditor.Editor
[CustomEditor(typeof(DebugGLComponent), true)]
internal class DebugGLComponentEditor : UnityEditor.Editor
{
private SerializedProperty m_propertyEnable;
private SerializedProperty m_propertyDefaultMaterial;
Expand Down
3 changes: 3 additions & 0 deletions Packages/UGF.DebugTools/Editor/DebugGLComponentEditor.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Packages/UGF.DebugTools/Editor/DebugGLSettingsAssetEditor.cs.meta
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions Packages/UGF.DebugTools/Editor/DebugGLSettingsProvider.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Packages/UGF.DebugTools/Editor/DebugGLSettingsProvider.cs.meta
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ools/Editor/DebugUISettingsAssetEditor.cs → ...bugTools/Editor/DebugUIComponentEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

namespace UGF.DebugTools.Editor
{
[CustomEditor(typeof(DebugUISettingsAsset), true)]
internal class DebugUISettingsAssetEditor : UnityEditor.Editor
[CustomEditor(typeof(DebugUIComponent), true)]
internal class DebugUIComponentEditor : UnityEditor.Editor
{
private SerializedProperty m_propertyEnable;
private SerializedProperty m_propertyScale;
Expand Down
3 changes: 3 additions & 0 deletions Packages/UGF.DebugTools/Editor/DebugUIComponentEditor.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Packages/UGF.DebugTools/Editor/DebugUISettingsAssetEditor.cs.meta
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions Packages/UGF.DebugTools/Editor/DebugUISettingsProvider.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Packages/UGF.DebugTools/Editor/DebugUISettingsProvider.cs.meta
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Packages/UGF.DebugTools/Editor/UGF.DebugTools.Editor.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"rootNamespace": "UGF.DebugTools.Editor",
"references": [
"GUID:37dddc4e4de3de84f81310a1d1cd5e2c",
"GUID:ff62901452104d14cae29322ac133c05",
"GUID:4806a292f99efd44aba38aea20847e17",
"GUID:abdd615e45137c74ca2ce9c636c78c15"
],
"includePlatforms": [
Expand Down
Loading