Skip to content

Commit b1c2c06

Browse files
paulrus123paulrus123
committed
Small changes to support release for UityForHumanities prototype submission
1 parent 40d9c25 commit b1c2c06

File tree

5 files changed

+206
-98
lines changed

5 files changed

+206
-98
lines changed

‎UnityProject/Assets/Prefabs/Oculus/OculusGoCosmosGameObjects.prefab‎

Lines changed: 168 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,97 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &120431301
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 120431302}
12+
- component: {fileID: 120431305}
13+
- component: {fileID: 120431304}
14+
- component: {fileID: 120431303}
15+
m_Layer: 5
16+
m_Name: PromptText
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!224 &120431302
23+
RectTransform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 120431301}
29+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
30+
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalScale: {x: 0.14999999, y: 0.14999999, z: 0.14999999}
32+
m_Children: []
33+
m_Father: {fileID: 1095329311379185572}
34+
m_RootOrder: 6
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
m_AnchorMin: {x: 0.5, y: 0.5}
37+
m_AnchorMax: {x: 0.5, y: 0.5}
38+
m_AnchoredPosition: {x: 0, y: 46}
39+
m_SizeDelta: {x: 1288.38, y: 222.94}
40+
m_Pivot: {x: 0.5, y: 0.5}
41+
--- !u!222 &120431305
42+
CanvasRenderer:
43+
m_ObjectHideFlags: 0
44+
m_CorrespondingSourceObject: {fileID: 0}
45+
m_PrefabInstance: {fileID: 0}
46+
m_PrefabAsset: {fileID: 0}
47+
m_GameObject: {fileID: 120431301}
48+
m_CullTransparentMesh: 0
49+
--- !u!114 &120431304
50+
MonoBehaviour:
51+
m_ObjectHideFlags: 0
52+
m_CorrespondingSourceObject: {fileID: 0}
53+
m_PrefabInstance: {fileID: 0}
54+
m_PrefabAsset: {fileID: 0}
55+
m_GameObject: {fileID: 120431301}
56+
m_Enabled: 1
57+
m_EditorHideFlags: 0
58+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
59+
m_Name:
60+
m_EditorClassIdentifier:
61+
m_Material: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
62+
m_Color: {r: 0, g: 0.5009069, b: 0.67058825, a: 1}
63+
m_RaycastTarget: 1
64+
m_OnCullStateChanged:
65+
m_PersistentCalls:
66+
m_Calls: []
67+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
68+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
69+
m_FontData:
70+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
71+
m_FontSize: 90
72+
m_FontStyle: 0
73+
m_BestFit: 1
74+
m_MinSize: 9
75+
m_MaxSize: 90
76+
m_Alignment: 1
77+
m_AlignByGeometry: 0
78+
m_RichText: 1
79+
m_HorizontalOverflow: 0
80+
m_VerticalOverflow: 1
81+
m_LineSpacing: 1
82+
m_Text: New Text
83+
--- !u!114 &120431303
84+
MonoBehaviour:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_GameObject: {fileID: 120431301}
90+
m_Enabled: 1
91+
m_EditorHideFlags: 0
92+
m_Script: {fileID: 11500000, guid: d4c96342b33854f2caf724e6aa338f3b, type: 3}
93+
m_Name:
94+
m_EditorClassIdentifier:
395
--- !u!114 &217876270
496
MonoBehaviour:
597
m_ObjectHideFlags: 0
@@ -134,7 +226,6 @@ MonoBehaviour:
134226
m_Name:
135227
m_EditorClassIdentifier:
136228
vr_camera: {fileID: 1763237047894314699}
137-
JetpackAudio: {fileID: 0}
138229
--- !u!1001 &1763237047894345833
139230
PrefabInstance:
140231
m_ObjectHideFlags: 0
@@ -146,6 +237,76 @@ PrefabInstance:
146237
propertyPath: m_Name
147238
value: OVRCameraRigWithCanvas
148239
objectReference: {fileID: 0}
240+
- target: {fileID: 6913334537348006012, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
241+
type: 3}
242+
propertyPath: m_LocalPosition.z
243+
value: 389
244+
objectReference: {fileID: 0}
245+
- target: {fileID: 6913334537348006012, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
246+
type: 3}
247+
propertyPath: m_AnchoredPosition.y
248+
value: 558
249+
objectReference: {fileID: 0}
250+
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
251+
type: 3}
252+
propertyPath: m_Material
253+
value:
254+
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
255+
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
256+
type: 3}
257+
propertyPath: m_Color.g
258+
value: 0.6698113
259+
objectReference: {fileID: 0}
260+
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
261+
type: 3}
262+
propertyPath: m_Color.b
263+
value: 0.06304106
264+
objectReference: {fileID: 0}
265+
- target: {fileID: 1678473718461872316, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
266+
type: 3}
267+
propertyPath: m_Material
268+
value:
269+
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
270+
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
271+
type: 3}
272+
propertyPath: m_Material
273+
value:
274+
objectReference: {fileID: 2100000, guid: 43fc200f5e2264062951802b315f1354, type: 2}
275+
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
276+
type: 3}
277+
propertyPath: m_Color.g
278+
value: 0.7
279+
objectReference: {fileID: 0}
280+
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
281+
type: 3}
282+
propertyPath: m_Color.b
283+
value: 0
284+
objectReference: {fileID: 0}
285+
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
286+
type: 3}
287+
propertyPath: m_Color.a
288+
value: 0.9019608
289+
objectReference: {fileID: 0}
290+
- target: {fileID: 6626739152825068033, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
291+
type: 3}
292+
propertyPath: m_Material
293+
value:
294+
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
295+
- target: {fileID: 6626739152825068033, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
296+
type: 3}
297+
propertyPath: m_Text
298+
value: "Scale: 450,000 : 1 \nLightYear : Meter"
299+
objectReference: {fileID: 0}
300+
- target: {fileID: 5885711525086557427, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
301+
type: 3}
302+
propertyPath: m_Camera
303+
value:
304+
objectReference: {fileID: 1763237047894678833}
305+
- target: {fileID: 4978133714876794758, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
306+
type: 3}
307+
propertyPath: m_Material
308+
value:
309+
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
149310
- target: {fileID: 400004, guid: 5c3b2e37b7f144abbaa1420218d2cb44, type: 3}
150311
propertyPath: m_LocalPosition.x
151312
value: 0
@@ -206,16 +367,6 @@ PrefabInstance:
206367
propertyPath: m_BackGroundColor.b
207368
value: 0
208369
objectReference: {fileID: 0}
209-
- target: {fileID: 6913334537348006012, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
210-
type: 3}
211-
propertyPath: m_LocalPosition.z
212-
value: 389
213-
objectReference: {fileID: 0}
214-
- target: {fileID: 6913334537348006012, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
215-
type: 3}
216-
propertyPath: m_AnchoredPosition.y
217-
value: 558
218-
objectReference: {fileID: 0}
219370
- target: {fileID: 20000012175207052, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
220371
type: 3}
221372
propertyPath: m_ClearFlags
@@ -256,66 +407,6 @@ PrefabInstance:
256407
propertyPath: m_BackGroundColor.b
257408
value: 0
258409
objectReference: {fileID: 0}
259-
- target: {fileID: 5885711525086557427, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
260-
type: 3}
261-
propertyPath: m_Camera
262-
value:
263-
objectReference: {fileID: 1763237047894678833}
264-
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
265-
type: 3}
266-
propertyPath: m_Material
267-
value:
268-
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
269-
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
270-
type: 3}
271-
propertyPath: m_Color.g
272-
value: 0.6698113
273-
objectReference: {fileID: 0}
274-
- target: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
275-
type: 3}
276-
propertyPath: m_Color.b
277-
value: 0.06304106
278-
objectReference: {fileID: 0}
279-
- target: {fileID: 1678473718461872316, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
280-
type: 3}
281-
propertyPath: m_Material
282-
value:
283-
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
284-
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
285-
type: 3}
286-
propertyPath: m_Material
287-
value:
288-
objectReference: {fileID: 2100000, guid: 43fc200f5e2264062951802b315f1354, type: 2}
289-
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
290-
type: 3}
291-
propertyPath: m_Color.g
292-
value: 0.7
293-
objectReference: {fileID: 0}
294-
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
295-
type: 3}
296-
propertyPath: m_Color.b
297-
value: 0
298-
objectReference: {fileID: 0}
299-
- target: {fileID: 4374616966187974343, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
300-
type: 3}
301-
propertyPath: m_Color.a
302-
value: 0.9019608
303-
objectReference: {fileID: 0}
304-
- target: {fileID: 6626739152825068033, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
305-
type: 3}
306-
propertyPath: m_Material
307-
value:
308-
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
309-
- target: {fileID: 6626739152825068033, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
310-
type: 3}
311-
propertyPath: m_Text
312-
value: "Scale: 450,000 : 1 \nLightYear : Meter"
313-
objectReference: {fileID: 0}
314-
- target: {fileID: 4978133714876794758, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
315-
type: 3}
316-
propertyPath: m_Material
317-
value:
318-
objectReference: {fileID: 2100000, guid: e983cf5d7526c40fcad4334559748528, type: 2}
319410
m_RemovedComponents: []
320411
m_SourcePrefab: {fileID: 100100000, guid: 5c3b2e37b7f144abbaa1420218d2cb44, type: 3}
321412
--- !u!4 &1763237047894217453 stripped
@@ -336,6 +427,12 @@ Camera:
336427
type: 3}
337428
m_PrefabInstance: {fileID: 1763237047894345833}
338429
m_PrefabAsset: {fileID: 0}
430+
--- !u!224 &1095329311379185572 stripped
431+
RectTransform:
432+
m_CorrespondingSourceObject: {fileID: 1678473718874593229, guid: 5c3b2e37b7f144abbaa1420218d2cb44,
433+
type: 3}
434+
m_PrefabInstance: {fileID: 1763237047894345833}
435+
m_PrefabAsset: {fileID: 0}
339436
--- !u!114 &242734814160183054 stripped
340437
MonoBehaviour:
341438
m_CorrespondingSourceObject: {fileID: 1956278334374434663, guid: 5c3b2e37b7f144abbaa1420218d2cb44,

‎UnityProject/Assets/Scenes/Oculus/cosmosLowRes_Oculus.unity‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,6 +1998,22 @@ PrefabInstance:
19981998
propertyPath: m_Name
19991999
value: GameAudio
20002000
objectReference: {fileID: 0}
2001+
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2002+
propertyPath: soundBiteSource
2003+
value:
2004+
objectReference: {fileID: 2042114575495120406}
2005+
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2006+
propertyPath: theUniverse
2007+
value:
2008+
objectReference: {fileID: 8300000, guid: 25dbcfc9a371b436ca409a566c382f15, type: 3}
2009+
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2010+
propertyPath: darkMatter
2011+
value:
2012+
objectReference: {fileID: 8300000, guid: 0c1c1623ae0eb4de2a913d23171d2ad0, type: 3}
2013+
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2014+
propertyPath: stars
2015+
value:
2016+
objectReference: {fileID: 8300000, guid: e18afd67b94cb4509a7b0e6bdfd700fe, type: 3}
20012017
- target: {fileID: 1008820298187534462, guid: 1d24e29a6d53945169e0e5f2247020e1,
20022018
type: 3}
20032019
propertyPath: m_LocalPosition.x
@@ -2053,22 +2069,6 @@ PrefabInstance:
20532069
propertyPath: m_LocalEulerAnglesHint.z
20542070
value: 0
20552071
objectReference: {fileID: 0}
2056-
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2057-
propertyPath: soundBiteSource
2058-
value:
2059-
objectReference: {fileID: 2042114575495120406}
2060-
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2061-
propertyPath: theUniverse
2062-
value:
2063-
objectReference: {fileID: 8300000, guid: 25dbcfc9a371b436ca409a566c382f15, type: 3}
2064-
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2065-
propertyPath: darkMatter
2066-
value:
2067-
objectReference: {fileID: 8300000, guid: 0c1c1623ae0eb4de2a913d23171d2ad0, type: 3}
2068-
- target: {fileID: 2123648237, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
2069-
propertyPath: stars
2070-
value:
2071-
objectReference: {fileID: 8300000, guid: e18afd67b94cb4509a7b0e6bdfd700fe, type: 3}
20722072
m_RemovedComponents: []
20732073
m_SourcePrefab: {fileID: 100100000, guid: 1d24e29a6d53945169e0e5f2247020e1, type: 3}
20742074
--- !u!82 &1008820298340505561 stripped
@@ -2095,6 +2095,11 @@ PrefabInstance:
20952095
propertyPath: m_Name
20962096
value: GameStateManager
20972097
objectReference: {fileID: 0}
2098+
- target: {fileID: 8712749221715294238, guid: 29e1ea2feb6234a20b180d4c5122fa45,
2099+
type: 3}
2100+
propertyPath: m_TagString
2101+
value: GameManager
2102+
objectReference: {fileID: 0}
20982103
- target: {fileID: 1497727604867117132, guid: 29e1ea2feb6234a20b180d4c5122fa45,
20992104
type: 3}
21002105
propertyPath: m_LocalPosition.x

‎UnityProject/Assets/Scripts/Common/FilterChangeController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public void StartTrackingButtonPresses()
3535
{
3636
OculusGoControllerHandler.OnSwipeRight += IncrementState;
3737
OculusGoControllerHandler.OnSwipeLeft += DecrementState;
38-
OculusGoControllerHandler.OnAppClicked += ChangeScene;
38+
//Commented out for now until Scene Change is bug free
39+
//OculusGoControllerHandler.OnAppClicked += ChangeScene;
3940
}
4041
else if (PlatformInUse.CurrentPlatform == PlatformInUse.Platform.VIVE)
4142
{

‎UnityProject/Assets/Scripts/Common/GameStateManager.cs‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ public enum GameStates {START, UNIVERSEISBIG, UNIVERSEFINISHED, STARS, STARSFINI
1414
public PromptTextManager promptTextManager;
1515
public FilterChangeController filterChangeController;
1616

17+
//https://docs.unity3d.com/ScriptReference/Object.DontDestroyOnLoad.html
18+
private void Awake()
19+
{
20+
GameObject[] objs = GameObject.FindGameObjectsWithTag("GameManager");
21+
22+
if (objs.Length > 1)
23+
{
24+
Destroy(this.gameObject);
25+
}
26+
27+
DontDestroyOnLoad(this.gameObject);
28+
}
29+
1730
// Start is called before the first frame update
1831
void Start()
1932
{
@@ -101,7 +114,7 @@ public void ChangeState(GameStates newState)
101114
promptTextManager.setTextVisible();
102115
break;
103116
case GameStates.ALL:
104-
promptTextManager.setTextInivisble();
117+
promptTextManager.SetText("Thanks for trying out CosmosVR!");
105118
filterChangeController.StartTrackingButtonPresses();
106119
break;
107120
default:
@@ -128,15 +141,6 @@ private void IncrementFilter()
128141
break;
129142
default:
130143
break;
131-
//case GameStates.START:
132-
//case GameStates.UNIVERSEISBIG:
133-
//case GameStates.UNIVERSEFINISHED:
134-
//case GameStates.STARS:
135-
//case GameStates.GAS:
136-
//case GameStates.DARKMATTER:
137-
//case GameStates.ALL:
138-
//break;
139-
140144
}
141145
}
142146

0 commit comments

Comments
 (0)