Skip to content

Commit 20f597c

Browse files
committed
Adds DataDisplay and some tests for buffer
1 parent 4fbf638 commit 20f597c

File tree

6 files changed

+428
-27
lines changed

6 files changed

+428
-27
lines changed

Assets/_Project/Scenes/tally-viz.unity

Lines changed: 188 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ GameObject:
414414
m_Component:
415415
- component: {fileID: 481131867}
416416
- component: {fileID: 481131868}
417+
- component: {fileID: 481131869}
417418
m_Layer: 0
418419
m_Name: DataManager
419420
m_TagString: Untagged
@@ -451,6 +452,19 @@ MonoBehaviour:
451452
chosenEndpoint: 4
452453
host:
453454
endpoint:
455+
--- !u!114 &481131869
456+
MonoBehaviour:
457+
m_ObjectHideFlags: 0
458+
m_CorrespondingSourceObject: {fileID: 0}
459+
m_PrefabInstance: {fileID: 0}
460+
m_PrefabAsset: {fileID: 0}
461+
m_GameObject: {fileID: 481131866}
462+
m_Enabled: 1
463+
m_EditorHideFlags: 0
464+
m_Script: {fileID: 11500000, guid: 06783d402d76b44c4a244694cb9e2c3e, type: 3}
465+
m_Name:
466+
m_EditorClassIdentifier:
467+
TmText: {fileID: 2073581459}
454468
--- !u!1 &747424205
455469
GameObject:
456470
m_ObjectHideFlags: 0
@@ -720,12 +734,12 @@ RectTransform:
720734
m_PrefabInstance: {fileID: 0}
721735
m_PrefabAsset: {fileID: 0}
722736
m_GameObject: {fileID: 1177221776}
723-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
737+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
724738
m_LocalPosition: {x: 0, y: 0, z: 0}
725739
m_LocalScale: {x: 1, y: 1, z: 1}
726740
m_Children:
727741
- {fileID: 1213503736}
728-
m_Father: {fileID: 2050371060}
742+
m_Father: {fileID: 1867324003}
729743
m_RootOrder: 0
730744
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
731745
m_AnchorMin: {x: 0, y: 1}
@@ -1339,6 +1353,42 @@ PrefabInstance:
13391353
objectReference: {fileID: 0}
13401354
m_RemovedComponents: []
13411355
m_SourcePrefab: {fileID: 100100000, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
1356+
--- !u!1 &1867324002
1357+
GameObject:
1358+
m_ObjectHideFlags: 0
1359+
m_CorrespondingSourceObject: {fileID: 0}
1360+
m_PrefabInstance: {fileID: 0}
1361+
m_PrefabAsset: {fileID: 0}
1362+
serializedVersion: 6
1363+
m_Component:
1364+
- component: {fileID: 1867324003}
1365+
m_Layer: 5
1366+
m_Name: Buttons
1367+
m_TagString: Untagged
1368+
m_Icon: {fileID: 0}
1369+
m_NavMeshLayer: 0
1370+
m_StaticEditorFlags: 0
1371+
m_IsActive: 1
1372+
--- !u!224 &1867324003
1373+
RectTransform:
1374+
m_ObjectHideFlags: 0
1375+
m_CorrespondingSourceObject: {fileID: 0}
1376+
m_PrefabInstance: {fileID: 0}
1377+
m_PrefabAsset: {fileID: 0}
1378+
m_GameObject: {fileID: 1867324002}
1379+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1380+
m_LocalPosition: {x: 0, y: 0, z: 0}
1381+
m_LocalScale: {x: 1, y: 1, z: 1}
1382+
m_Children:
1383+
- {fileID: 1177221777}
1384+
m_Father: {fileID: 2050371060}
1385+
m_RootOrder: 1
1386+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1387+
m_AnchorMin: {x: 0, y: 0}
1388+
m_AnchorMax: {x: 1, y: 1}
1389+
m_AnchoredPosition: {x: 0, y: 0}
1390+
m_SizeDelta: {x: 0, y: 0}
1391+
m_Pivot: {x: 0.5, y: 0.5}
13421392
--- !u!1 &1954837381
13431393
GameObject:
13441394
m_ObjectHideFlags: 0
@@ -1555,7 +1605,8 @@ RectTransform:
15551605
m_LocalPosition: {x: 0, y: 0, z: 0}
15561606
m_LocalScale: {x: 1, y: 1, z: 1}
15571607
m_Children:
1558-
- {fileID: 1177221777}
1608+
- {fileID: 2073581458}
1609+
- {fileID: 1867324003}
15591610
m_Father: {fileID: 832129571}
15601611
m_RootOrder: 0
15611612
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1637,6 +1688,140 @@ Transform:
16371688
m_Father: {fileID: 0}
16381689
m_RootOrder: 1
16391690
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1691+
--- !u!1 &2073581457
1692+
GameObject:
1693+
m_ObjectHideFlags: 0
1694+
m_CorrespondingSourceObject: {fileID: 0}
1695+
m_PrefabInstance: {fileID: 0}
1696+
m_PrefabAsset: {fileID: 0}
1697+
serializedVersion: 6
1698+
m_Component:
1699+
- component: {fileID: 2073581458}
1700+
- component: {fileID: 2073581460}
1701+
- component: {fileID: 2073581459}
1702+
m_Layer: 5
1703+
m_Name: EventCountText
1704+
m_TagString: Untagged
1705+
m_Icon: {fileID: 0}
1706+
m_NavMeshLayer: 0
1707+
m_StaticEditorFlags: 0
1708+
m_IsActive: 1
1709+
--- !u!224 &2073581458
1710+
RectTransform:
1711+
m_ObjectHideFlags: 0
1712+
m_CorrespondingSourceObject: {fileID: 0}
1713+
m_PrefabInstance: {fileID: 0}
1714+
m_PrefabAsset: {fileID: 0}
1715+
m_GameObject: {fileID: 2073581457}
1716+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1717+
m_LocalPosition: {x: 0, y: 0, z: 0}
1718+
m_LocalScale: {x: 1, y: 1, z: 1}
1719+
m_Children: []
1720+
m_Father: {fileID: 2050371060}
1721+
m_RootOrder: 0
1722+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1723+
m_AnchorMin: {x: 0, y: 1}
1724+
m_AnchorMax: {x: 0, y: 1}
1725+
m_AnchoredPosition: {x: 193.5, y: -12.500008}
1726+
m_SizeDelta: {x: 207.00714, y: 25}
1727+
m_Pivot: {x: 0.5, y: 0.5}
1728+
--- !u!114 &2073581459
1729+
MonoBehaviour:
1730+
m_ObjectHideFlags: 0
1731+
m_CorrespondingSourceObject: {fileID: 0}
1732+
m_PrefabInstance: {fileID: 0}
1733+
m_PrefabAsset: {fileID: 0}
1734+
m_GameObject: {fileID: 2073581457}
1735+
m_Enabled: 1
1736+
m_EditorHideFlags: 0
1737+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
1738+
m_Name:
1739+
m_EditorClassIdentifier:
1740+
m_Material: {fileID: 0}
1741+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1742+
m_RaycastTarget: 1
1743+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
1744+
m_Maskable: 1
1745+
m_OnCullStateChanged:
1746+
m_PersistentCalls:
1747+
m_Calls: []
1748+
m_text: event count...
1749+
m_isRightToLeft: 0
1750+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1751+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1752+
m_fontSharedMaterials: []
1753+
m_fontMaterial: {fileID: 0}
1754+
m_fontMaterials: []
1755+
m_fontColor32:
1756+
serializedVersion: 2
1757+
rgba: 4294967295
1758+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
1759+
m_enableVertexGradient: 0
1760+
m_colorMode: 3
1761+
m_fontColorGradient:
1762+
topLeft: {r: 1, g: 1, b: 1, a: 1}
1763+
topRight: {r: 1, g: 1, b: 1, a: 1}
1764+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
1765+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
1766+
m_fontColorGradientPreset: {fileID: 0}
1767+
m_spriteAsset: {fileID: 0}
1768+
m_tintAllSprites: 0
1769+
m_StyleSheet: {fileID: 0}
1770+
m_TextStyleHashCode: -1183493901
1771+
m_overrideHtmlColors: 0
1772+
m_faceColor:
1773+
serializedVersion: 2
1774+
rgba: 4294967295
1775+
m_fontSize: 10
1776+
m_fontSizeBase: 10
1777+
m_fontWeight: 400
1778+
m_enableAutoSizing: 0
1779+
m_fontSizeMin: 18
1780+
m_fontSizeMax: 72
1781+
m_fontStyle: 0
1782+
m_HorizontalAlignment: 1
1783+
m_VerticalAlignment: 512
1784+
m_textAlignment: 65535
1785+
m_characterSpacing: 0
1786+
m_wordSpacing: 0
1787+
m_lineSpacing: 0
1788+
m_lineSpacingMax: 0
1789+
m_paragraphSpacing: 0
1790+
m_charWidthMaxAdj: 0
1791+
m_enableWordWrapping: 1
1792+
m_wordWrappingRatios: 0.4
1793+
m_overflowMode: 0
1794+
m_linkedTextComponent: {fileID: 0}
1795+
parentLinkedComponent: {fileID: 0}
1796+
m_enableKerning: 1
1797+
m_enableExtraPadding: 0
1798+
checkPaddingRequired: 0
1799+
m_isRichText: 1
1800+
m_parseCtrlCharacters: 1
1801+
m_isOrthographic: 1
1802+
m_isCullingEnabled: 0
1803+
m_horizontalMapping: 0
1804+
m_verticalMapping: 0
1805+
m_uvLineOffset: 0
1806+
m_geometrySortingOrder: 0
1807+
m_IsTextObjectScaleStatic: 0
1808+
m_VertexBufferAutoSizeReduction: 1
1809+
m_useMaxVisibleDescender: 1
1810+
m_pageToDisplay: 1
1811+
m_margin: {x: 5, y: 5, z: 5, w: 5}
1812+
m_isUsingLegacyAnimationComponent: 0
1813+
m_isVolumetricText: 0
1814+
m_hasFontAssetChanged: 0
1815+
m_baseMaterial: {fileID: 0}
1816+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
1817+
--- !u!222 &2073581460
1818+
CanvasRenderer:
1819+
m_ObjectHideFlags: 0
1820+
m_CorrespondingSourceObject: {fileID: 0}
1821+
m_PrefabInstance: {fileID: 0}
1822+
m_PrefabAsset: {fileID: 0}
1823+
m_GameObject: {fileID: 2073581457}
1824+
m_CullTransparentMesh: 0
16401825
--- !u!1 &2123156134
16411826
GameObject:
16421827
m_ObjectHideFlags: 0
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using TMPro;
5+
6+
public class DataDisplay : MonoBehaviour {
7+
public TMP_Text TmText;
8+
9+
10+
11+
// listeners
12+
void OnEnable ()
13+
{
14+
EventManager.StartListening ("DataUpdated", UpdateDisplay);
15+
}
16+
void OnDisable ()
17+
{
18+
EventManager.StopListening ("DataUpdated", UpdateDisplay);
19+
}
20+
21+
22+
// update text
23+
public void UpdateDisplay ()
24+
{
25+
// handled inside Timeline class
26+
TmText.text = DataManager.dataCount.ToString ();
27+
}
28+
29+
30+
31+
32+
33+
34+
}

Assets/_Project/Scripts/Data/DataDisplay.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)