Skip to content

Commit f8cfe42

Browse files
omundyomundy
committed
Adds instructions to UI
1 parent 6f7d472 commit f8cfe42

File tree

8 files changed

+413
-46
lines changed

8 files changed

+413
-46
lines changed

‎Assets/_Project/Scenes/tally-viz.unity‎

Lines changed: 286 additions & 14 deletions
Large diffs are not rendered by default.

‎Assets/_Project/Scripts/Core/KeyCommands.cs‎

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

‎Assets/_Project/Scripts/Data/UI_ShowHide.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class UI_ShowHide : MonoBehaviour {
6+
7+
8+
public GameObject debugParent;
9+
public GameObject instructionsParent;
10+
11+
12+
13+
void Update ()
14+
{
15+
if (Input.GetKeyDown ("escape")) {
16+
Application.Quit ();
17+
} else if (Input.GetKeyDown (KeyCode.D)) {
18+
ShowHide (debugParent);
19+
} else if (Input.GetKeyDown (KeyCode.I)) {
20+
ShowHide (instructionsParent);
21+
}
22+
23+
24+
}
25+
26+
27+
void ShowHide (GameObject obj)
28+
{
29+
if (obj.activeSelf)
30+
obj.SetActive (false);
31+
else
32+
obj.SetActive (true);
33+
34+
}
35+
36+
37+
38+
39+
}

Assets/_Project/Scripts/Core/KeyCommands.cs.meta renamed to Assets/_Project/Scripts/Data/UI_ShowHide.cs.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/_Project/Settings/TMPStyleSheet.asset‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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: ab2114bdc8544297b417dfefe9f1e410, type: 3}
13+
m_Name: TMPStyleSheet
14+
m_EditorClassIdentifier:
15+
m_StyleList:
16+
- m_Name: H1
17+
m_HashCode: 2425
18+
m_OpeningDefinition: <size=1.5em><#fb3f7c>*
19+
m_ClosingDefinition: '*</size></color>'
20+
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000002e00000035000000650000006d0000003e0000003c000000230000006600000062000000330000006600000037000000630000003e0000002a000000
21+
m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
22+
- m_Name: Quote
23+
m_HashCode: 93368250
24+
m_OpeningDefinition: <i><size=75%><margin=10%>
25+
m_ClosingDefinition: </i></size></width></margin>
26+
m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
27+
m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
28+
- m_Name: Link
29+
m_HashCode: 2656128
30+
m_OpeningDefinition: <u><#40a0ff><link="ID_01">
31+
m_ClosingDefinition: </u></color></link>
32+
m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
33+
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
34+
- m_Name: Title
35+
m_HashCode: 97690656
36+
m_OpeningDefinition: <size=125%><b><align=center>
37+
m_ClosingDefinition: </size></b></align>
38+
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000
39+
m_ClosingTagArray: 3c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000610000006c00000069000000670000006e0000003e000000
40+
- m_Name: H2
41+
m_HashCode: 2426
42+
m_OpeningDefinition: <size=1.3em><b><#9156e9>
43+
m_ClosingDefinition: </size></b></color>
44+
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000002e00000033000000650000006d0000003e0000003c000000620000003e0000003c000000230000003900000031000000350000003600000065000000390000003e000000
45+
m_ClosingTagArray: 3c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
46+
- m_Name: H3
47+
m_HashCode: 2427
48+
m_OpeningDefinition: <size=1.15em><b><#9156e9>
49+
m_ClosingDefinition: </size></b></color>
50+
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000002e0000003100000035000000650000006d0000003e0000003c000000620000003e0000003c000000230000003900000031000000350000003600000065000000390000003e000000
51+
m_ClosingTagArray: 3c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
52+
- m_Name: C1
53+
m_HashCode: 2194
54+
m_OpeningDefinition: <color=#ffff40>
55+
m_ClosingDefinition: </color>
56+
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000066000000660000006600000034000000300000003e000000
57+
m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e000000
58+
- m_Name: C2
59+
m_HashCode: 2193
60+
m_OpeningDefinition: <color=#ff40FF><size=125%>
61+
m_ClosingDefinition: </color></size>
62+
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000066000000340000003000000046000000460000003e0000003c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e000000
63+
m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f00000073000000690000007a000000650000003e000000
64+
- m_Name: C3
65+
m_HashCode: 2192
66+
m_OpeningDefinition: <color=#80A0FF><b>
67+
m_ClosingDefinition: </color></b>
68+
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000003800000030000000410000003000000046000000460000003e0000003c000000620000003e000000
69+
m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f000000620000003e000000
70+
- m_Name: Normal
71+
m_HashCode: -1183493901
72+
m_OpeningDefinition:
73+
m_ClosingDefinition:
74+
m_OpeningTagArray:
75+
m_ClosingTagArray:

‎Assets/_Project/Settings/TMPStyleSheet.asset.meta‎

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

‎ProjectSettings/EditorBuildSettings.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ EditorBuildSettings:
66
serializedVersion: 2
77
m_Scenes:
88
- enabled: 1
9-
path: Assets/URP_Example/Scenes/SampleScene.unity
10-
guid: d1c3109bdb54ad54c8a2b2838528e640
9+
path: Assets/_Project/Scenes/tally-viz.unity
10+
guid: 79bed350e4a684951abefde554514984
1111
m_configObjects: {}

‎ProjectSettings/ProjectSettings.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PlayerSettings:
1212
targetDevice: 2
1313
useOnDemandResources: 0
1414
accelerometerFrequency: 60
15-
companyName: DefaultCompany
15+
companyName: SneakawayStudio
1616
productName: tally-ncsu-viz
1717
defaultCursor: {fileID: 0}
1818
cursorHotspot: {x: 0, y: 0}
@@ -82,7 +82,7 @@ PlayerSettings:
8282
bakeCollisionMeshes: 0
8383
forceSingleInstance: 0
8484
useFlipModelSwapchain: 1
85-
resizableWindow: 0
85+
resizableWindow: 1
8686
useMacAppStoreValidation: 0
8787
macAppStoreCategory: public.app-category.games
8888
gpuSkinning: 1

0 commit comments

Comments
 (0)