Skip to content

Commit f6b11b4

Browse files
KrasnovPavelKrasnovPavel
committed
WIP: refactoring
1 parent 47449a0 commit f6b11b4

33 files changed

+395
-204
lines changed

‎Assets/Prefabs/UI/Windows/Clustering Window.prefab‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ MonoBehaviour:
7474
m_fontMaterials: []
7575
m_fontColor32:
7676
serializedVersion: 2
77-
rgba: 4294967295
77+
rgba: 4281479730
7878
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
7979
m_enableVertexGradient: 0
8080
m_colorMode: 3
@@ -87,7 +87,7 @@ MonoBehaviour:
8787
m_spriteAsset: {fileID: 0}
8888
m_tintAllSprites: 0
8989
m_StyleSheet: {fileID: 0}
90-
m_TextStyleHashCode: 0
90+
m_TextStyleHashCode: -1183493901
9191
m_overrideHtmlColors: 0
9292
m_faceColor:
9393
serializedVersion: 2
@@ -404,7 +404,7 @@ RectTransform:
404404
m_RootOrder: 0
405405
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
406406
m_AnchorMin: {x: 0, y: 0}
407-
m_AnchorMax: {x: 1, y: 0.2}
407+
m_AnchorMax: {x: 1, y: 1}
408408
m_AnchoredPosition: {x: 0, y: 0}
409409
m_SizeDelta: {x: 20, y: 20}
410410
m_Pivot: {x: 0.5, y: 0.5}
@@ -1223,7 +1223,7 @@ MonoBehaviour:
12231223
m_HandleRect: {fileID: 5739924621932026147}
12241224
m_Direction: 2
12251225
m_Value: 0
1226-
m_Size: 0.2
1226+
m_Size: 1
12271227
m_NumberOfSteps: 0
12281228
m_OnValueChanged:
12291229
m_PersistentCalls:
@@ -1378,82 +1378,6 @@ MonoBehaviour:
13781378
m_FillOrigin: 0
13791379
m_UseSpriteMesh: 0
13801380
m_PixelsPerUnitMultiplier: 1
1381-
--- !u!33 &1280483637688000510
1382-
MeshFilter:
1383-
m_ObjectHideFlags: 0
1384-
m_CorrespondingSourceObject: {fileID: 0}
1385-
m_PrefabInstance: {fileID: 0}
1386-
m_PrefabAsset: {fileID: 0}
1387-
m_GameObject: {fileID: 5732609150508574287}
1388-
m_Mesh: {fileID: 0}
1389-
--- !u!23 &4140992965858989577
1390-
MeshRenderer:
1391-
m_ObjectHideFlags: 0
1392-
m_CorrespondingSourceObject: {fileID: 0}
1393-
m_PrefabInstance: {fileID: 0}
1394-
m_PrefabAsset: {fileID: 0}
1395-
m_GameObject: {fileID: 5732609150508574287}
1396-
m_Enabled: 1
1397-
m_CastShadows: 1
1398-
m_ReceiveShadows: 1
1399-
m_DynamicOccludee: 1
1400-
m_StaticShadowCaster: 0
1401-
m_MotionVectors: 1
1402-
m_LightProbeUsage: 1
1403-
m_ReflectionProbeUsage: 1
1404-
m_RayTracingMode: 2
1405-
m_RayTraceProcedural: 0
1406-
m_RenderingLayerMask: 257
1407-
m_RendererPriority: 0
1408-
m_Materials:
1409-
- {fileID: 0}
1410-
m_StaticBatchInfo:
1411-
firstSubMesh: 0
1412-
subMeshCount: 0
1413-
m_StaticBatchRoot: {fileID: 0}
1414-
m_ProbeAnchor: {fileID: 0}
1415-
m_LightProbeVolumeOverride: {fileID: 0}
1416-
m_ScaleInLightmap: 1
1417-
m_ReceiveGI: 1
1418-
m_PreserveUVs: 0
1419-
m_IgnoreNormalsForChartDetection: 0
1420-
m_ImportantGI: 0
1421-
m_StitchLightmapSeams: 1
1422-
m_SelectedEditorRenderState: 3
1423-
m_MinimumChartSize: 4
1424-
m_AutoUVMaxDistance: 0.5
1425-
m_AutoUVMaxAngle: 89
1426-
m_LightmapParameters: {fileID: 0}
1427-
m_SortingLayerID: 0
1428-
m_SortingLayer: 0
1429-
m_SortingOrder: 0
1430-
m_AdditionalVertexStreams: {fileID: 0}
1431-
--- !u!114 &1018849407423057080
1432-
MonoBehaviour:
1433-
m_ObjectHideFlags: 0
1434-
m_CorrespondingSourceObject: {fileID: 0}
1435-
m_PrefabInstance: {fileID: 0}
1436-
m_PrefabAsset: {fileID: 0}
1437-
m_GameObject: {fileID: 5732609151159976090}
1438-
m_Enabled: 1
1439-
m_EditorHideFlags: 0
1440-
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
1441-
m_Name:
1442-
m_EditorClassIdentifier:
1443-
m_Padding:
1444-
m_Left: 0
1445-
m_Right: 0
1446-
m_Top: 0
1447-
m_Bottom: 0
1448-
m_ChildAlignment: 0
1449-
m_Spacing: 0
1450-
m_ChildForceExpandWidth: 1
1451-
m_ChildForceExpandHeight: 1
1452-
m_ChildControlWidth: 1
1453-
m_ChildControlHeight: 1
1454-
m_ChildScaleWidth: 0
1455-
m_ChildScaleHeight: 0
1456-
m_ReverseArrangement: 0
14571381
--- !u!1 &7302663267268433908
14581382
GameObject:
14591383
m_ObjectHideFlags: 0
@@ -1915,7 +1839,7 @@ RectTransform:
19151839
m_AnchorMin: {x: 0, y: 0}
19161840
m_AnchorMax: {x: 1, y: 1}
19171841
m_AnchoredPosition: {x: 0, y: 0}
1918-
m_SizeDelta: {x: -18, y: 0}
1842+
m_SizeDelta: {x: -17, y: 0}
19191843
m_Pivot: {x: 0, y: 1}
19201844
--- !u!114 &1996629949111575227
19211845
MonoBehaviour:
@@ -2183,7 +2107,7 @@ PrefabInstance:
21832107
objectReference: {fileID: 0}
21842108
- target: {fileID: 1633165848068722919, guid: 4aaa8c9507bf76e4b8a56af4a2aa0178, type: 3}
21852109
propertyPath: m_Name
2186-
value: Clusterizing Window
2110+
value: Clustering Window
21872111
objectReference: {fileID: 0}
21882112
- target: {fileID: 1633165848068722919, guid: 4aaa8c9507bf76e4b8a56af4a2aa0178, type: 3}
21892113
propertyPath: m_IsActive
@@ -2397,3 +2321,79 @@ GameObject:
23972321
m_CorrespondingSourceObject: {fileID: 1633165848068722919, guid: 4aaa8c9507bf76e4b8a56af4a2aa0178, type: 3}
23982322
m_PrefabInstance: {fileID: 6423393151055574696}
23992323
m_PrefabAsset: {fileID: 0}
2324+
--- !u!33 &1280483637688000510
2325+
MeshFilter:
2326+
m_ObjectHideFlags: 0
2327+
m_CorrespondingSourceObject: {fileID: 0}
2328+
m_PrefabInstance: {fileID: 0}
2329+
m_PrefabAsset: {fileID: 0}
2330+
m_GameObject: {fileID: 5732609150508574287}
2331+
m_Mesh: {fileID: 0}
2332+
--- !u!23 &4140992965858989577
2333+
MeshRenderer:
2334+
m_ObjectHideFlags: 0
2335+
m_CorrespondingSourceObject: {fileID: 0}
2336+
m_PrefabInstance: {fileID: 0}
2337+
m_PrefabAsset: {fileID: 0}
2338+
m_GameObject: {fileID: 5732609150508574287}
2339+
m_Enabled: 1
2340+
m_CastShadows: 1
2341+
m_ReceiveShadows: 1
2342+
m_DynamicOccludee: 1
2343+
m_StaticShadowCaster: 0
2344+
m_MotionVectors: 1
2345+
m_LightProbeUsage: 1
2346+
m_ReflectionProbeUsage: 1
2347+
m_RayTracingMode: 2
2348+
m_RayTraceProcedural: 0
2349+
m_RenderingLayerMask: 257
2350+
m_RendererPriority: 0
2351+
m_Materials:
2352+
- {fileID: 0}
2353+
m_StaticBatchInfo:
2354+
firstSubMesh: 0
2355+
subMeshCount: 0
2356+
m_StaticBatchRoot: {fileID: 0}
2357+
m_ProbeAnchor: {fileID: 0}
2358+
m_LightProbeVolumeOverride: {fileID: 0}
2359+
m_ScaleInLightmap: 1
2360+
m_ReceiveGI: 1
2361+
m_PreserveUVs: 0
2362+
m_IgnoreNormalsForChartDetection: 0
2363+
m_ImportantGI: 0
2364+
m_StitchLightmapSeams: 1
2365+
m_SelectedEditorRenderState: 3
2366+
m_MinimumChartSize: 4
2367+
m_AutoUVMaxDistance: 0.5
2368+
m_AutoUVMaxAngle: 89
2369+
m_LightmapParameters: {fileID: 0}
2370+
m_SortingLayerID: 0
2371+
m_SortingLayer: 0
2372+
m_SortingOrder: 0
2373+
m_AdditionalVertexStreams: {fileID: 0}
2374+
--- !u!114 &1018849407423057080
2375+
MonoBehaviour:
2376+
m_ObjectHideFlags: 0
2377+
m_CorrespondingSourceObject: {fileID: 0}
2378+
m_PrefabInstance: {fileID: 0}
2379+
m_PrefabAsset: {fileID: 0}
2380+
m_GameObject: {fileID: 5732609151159976090}
2381+
m_Enabled: 1
2382+
m_EditorHideFlags: 0
2383+
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
2384+
m_Name:
2385+
m_EditorClassIdentifier:
2386+
m_Padding:
2387+
m_Left: 0
2388+
m_Right: 0
2389+
m_Top: 0
2390+
m_Bottom: 0
2391+
m_ChildAlignment: 0
2392+
m_Spacing: 0
2393+
m_ChildForceExpandWidth: 1
2394+
m_ChildForceExpandHeight: 1
2395+
m_ChildControlWidth: 1
2396+
m_ChildControlHeight: 1
2397+
m_ChildScaleWidth: 0
2398+
m_ChildScaleHeight: 0
2399+
m_ReverseArrangement: 0

‎Assets/Prefabs/UI/Windows/Language Window.prefab‎

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,7 @@ GameObject:
11981198
- component: {fileID: 5632405267057503108}
11991199
- component: {fileID: 5204134415322837456}
12001200
- component: {fileID: 617263988201873550}
1201+
- component: {fileID: 8875962527395043161}
12011202
m_Layer: 0
12021203
m_Name: Dropdown
12031204
m_TagString: Untagged
@@ -1318,7 +1319,7 @@ MonoBehaviour:
13181319
m_OnValueChanged:
13191320
m_PersistentCalls:
13201321
m_Calls:
1321-
- m_Target: {fileID: 1854391496159527706}
1322+
- m_Target: {fileID: 0}
13221323
m_TargetAssemblyTypeName: Elektronik.UI.Localization.LocaleSelector, Elektronik.Scripts
13231324
m_MethodName: OnLocaleSelected
13241325
m_Mode: 0
@@ -1331,13 +1332,13 @@ MonoBehaviour:
13311332
m_BoolArgument: 0
13321333
m_CallState: 2
13331334
m_AlphaFadeSpeed: 0.15
1334-
--- !u!114 &1854391496159527706
1335+
--- !u!114 &8875962527395043161
13351336
MonoBehaviour:
13361337
m_ObjectHideFlags: 0
13371338
m_CorrespondingSourceObject: {fileID: 0}
13381339
m_PrefabInstance: {fileID: 0}
13391340
m_PrefabAsset: {fileID: 0}
1340-
m_GameObject: {fileID: 7523100099146224611}
1341+
m_GameObject: {fileID: 8923468218167100060}
13411342
m_Enabled: 1
13421343
m_EditorHideFlags: 0
13431344
m_Script: {fileID: 11500000, guid: b8f964b7b7bd4acf97c84971f7eca09b, type: 3}
@@ -1347,42 +1348,6 @@ MonoBehaviour:
13471348
Locales:
13481349
- {fileID: 11400000, guid: 346e0f77df180f54f8438c88b8841518, type: 2}
13491350
- {fileID: 11400000, guid: c3c376ba6adc42443bbb7885c7dae594, type: 2}
1350-
--- !u!114 &7040772497964553305
1351-
MonoBehaviour:
1352-
m_ObjectHideFlags: 0
1353-
m_CorrespondingSourceObject: {fileID: 0}
1354-
m_PrefabInstance: {fileID: 0}
1355-
m_PrefabAsset: {fileID: 0}
1356-
m_GameObject: {fileID: 7523100098841876369}
1357-
m_Enabled: 1
1358-
m_EditorHideFlags: 0
1359-
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
1360-
m_Name:
1361-
m_EditorClassIdentifier:
1362-
m_StringReference:
1363-
m_TableReference:
1364-
m_TableCollectionName: GUID:4b44fd5b774b9f3428cbd7c8bd7d2e11
1365-
m_TableEntryReference:
1366-
m_KeyId: 55930117183578112
1367-
m_Key:
1368-
m_FallbackState: 0
1369-
m_WaitForCompletion: 1
1370-
m_FormatArguments: []
1371-
m_UpdateString:
1372-
m_PersistentCalls:
1373-
m_Calls:
1374-
- m_Target: {fileID: 7523100098841876383}
1375-
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
1376-
m_MethodName: set_text
1377-
m_Mode: 0
1378-
m_Arguments:
1379-
m_ObjectArgument: {fileID: 0}
1380-
m_ObjectArgumentAssemblyTypeName:
1381-
m_IntArgument: 0
1382-
m_FloatArgument: 0
1383-
m_StringArgument:
1384-
m_BoolArgument: 0
1385-
m_CallState: 1
13861351
--- !u!1 &9200008625872750418
13871352
GameObject:
13881353
m_ObjectHideFlags: 0
@@ -1725,8 +1690,39 @@ GameObject:
17251690
m_CorrespondingSourceObject: {fileID: 1633165847827813525, guid: 4aaa8c9507bf76e4b8a56af4a2aa0178, type: 3}
17261691
m_PrefabInstance: {fileID: 9137029595302626052}
17271692
m_PrefabAsset: {fileID: 0}
1728-
--- !u!1 &7523100099146224611 stripped
1729-
GameObject:
1730-
m_CorrespondingSourceObject: {fileID: 1633165848068722919, guid: 4aaa8c9507bf76e4b8a56af4a2aa0178, type: 3}
1731-
m_PrefabInstance: {fileID: 9137029595302626052}
1693+
--- !u!114 &7040772497964553305
1694+
MonoBehaviour:
1695+
m_ObjectHideFlags: 0
1696+
m_CorrespondingSourceObject: {fileID: 0}
1697+
m_PrefabInstance: {fileID: 0}
17321698
m_PrefabAsset: {fileID: 0}
1699+
m_GameObject: {fileID: 7523100098841876369}
1700+
m_Enabled: 1
1701+
m_EditorHideFlags: 0
1702+
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
1703+
m_Name:
1704+
m_EditorClassIdentifier:
1705+
m_StringReference:
1706+
m_TableReference:
1707+
m_TableCollectionName: GUID:4b44fd5b774b9f3428cbd7c8bd7d2e11
1708+
m_TableEntryReference:
1709+
m_KeyId: 55930117183578112
1710+
m_Key:
1711+
m_FallbackState: 0
1712+
m_WaitForCompletion: 1
1713+
m_FormatArguments: []
1714+
m_UpdateString:
1715+
m_PersistentCalls:
1716+
m_Calls:
1717+
- m_Target: {fileID: 7523100098841876383}
1718+
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
1719+
m_MethodName: set_text
1720+
m_Mode: 0
1721+
m_Arguments:
1722+
m_ObjectArgument: {fileID: 0}
1723+
m_ObjectArgumentAssemblyTypeName:
1724+
m_IntArgument: 0
1725+
m_FloatArgument: 0
1726+
m_StringArgument:
1727+
m_BoolArgument: 0
1728+
m_CallState: 1

‎Assets/Scripts/DataConsumers/CloudRenderers/Renderers/GPU/Blocks/CloudBlock.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ internal abstract class CloudBlock<TGpuItem> : ICloudBlock<TGpuItem>
1313
/// <inheritdoc />
1414
public float Scale { get; set; }
1515

16-
protected CloudBlock(float scale)
17-
{
18-
Scale = scale;
19-
}
20-
2116
/// <inheritdoc />
2217
public virtual void UpdateDataOnGpu()
2318
{
@@ -38,6 +33,11 @@ public virtual void RenderData()
3833

3934
#region Protected
4035

36+
protected CloudBlock(float scale)
37+
{
38+
Scale = scale;
39+
}
40+
4141
/// <summary> Material that renders this block. </summary>
4242
[CanBeNull] protected Material RenderMaterial;
4343

‎Assets/Scripts/DataSources/Containers/ConnectableObjectsCloudContainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Elektronik.DataSources.Containers
1212
{
13-
/// <summary> Container for </summary>
13+
/// <summary> Container for objects that can have connections between each other. </summary>
1414
/// <typeparam name="TCloudItem"></typeparam>
1515
public class ConnectableObjectsCloudContainer<TCloudItem> : IConnectableObjectsCloudContainer<TCloudItem>,
1616
ILookableDataSource, IVisibleDataSource

‎Assets/Scripts/DataSources/SpecialInterfaces/IVisibleDataSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Elektronik.DataSources.SpecialInterfaces
44
{
5-
// TODO: May be rename somehow. All data sources are visible, this interface means that it can be hidden, but I don't like name Hideable.
5+
// TODO: May be rename somehow. All data sources are visible, this interface means that it can be hidden, but I don't like name "Hideable".
66

77
/// <summary> Marks that data source can be hidden. </summary>
88
public interface IVisibleDataSource : IDataSource

0 commit comments

Comments
 (0)