Skip to content

Commit 9600f14

Browse files
committed
Update demos.
1 parent f8193fa commit 9600f14

2 files changed

Lines changed: 93 additions & 4 deletions

File tree

OSVR-Unity/Assets/OSVRUnity/Sample/UntrackedVRDisplayDemo.unity

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,47 @@ Prefab:
12011201
m_RootGameObject: {fileID: 955452065}
12021202
m_IsPrefabParent: 0
12031203
m_IsExploded: 1
1204+
--- !u!1 &917069207
1205+
GameObject:
1206+
m_ObjectHideFlags: 0
1207+
m_PrefabParentObject: {fileID: 136198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1208+
m_PrefabInternal: {fileID: 1400362904}
1209+
serializedVersion: 4
1210+
m_Component:
1211+
- 4: {fileID: 917069209}
1212+
- 114: {fileID: 917069208}
1213+
m_Layer: 0
1214+
m_Name: ClientKit
1215+
m_TagString: Untagged
1216+
m_Icon: {fileID: 0}
1217+
m_NavMeshLayer: 0
1218+
m_StaticEditorFlags: 4294967295
1219+
m_IsActive: 1
1220+
--- !u!114 &917069208
1221+
MonoBehaviour:
1222+
m_ObjectHideFlags: 0
1223+
m_PrefabParentObject: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84,
1224+
type: 2}
1225+
m_PrefabInternal: {fileID: 1400362904}
1226+
m_GameObject: {fileID: 917069207}
1227+
m_Enabled: 1
1228+
m_EditorHideFlags: 0
1229+
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
1230+
m_Name:
1231+
m_EditorClassIdentifier:
1232+
AppID: org.opengoggles.osvr-unity.sample.untrackeddisplay
1233+
--- !u!4 &917069209
1234+
Transform:
1235+
m_ObjectHideFlags: 0
1236+
m_PrefabParentObject: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1237+
m_PrefabInternal: {fileID: 1400362904}
1238+
m_GameObject: {fileID: 917069207}
1239+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1240+
m_LocalPosition: {x: 0, y: 0, z: 0}
1241+
m_LocalScale: {x: 1, y: 1, z: 1}
1242+
m_Children: []
1243+
m_Father: {fileID: 0}
1244+
m_RootOrder: 2
12041245
--- !u!1 &955452065
12051246
GameObject:
12061247
m_ObjectHideFlags: 0
@@ -1213,7 +1254,7 @@ GameObject:
12131254
- 81: {fileID: 955452069}
12141255
- 114: {fileID: 955452067}
12151256
m_Layer: 0
1216-
m_Name: UntrackedVRDisplay
1257+
m_Name: VRDisplayUntracked
12171258
m_TagString: Untagged
12181259
m_Icon: {fileID: 0}
12191260
m_NavMeshLayer: 0
@@ -1289,6 +1330,54 @@ AudioListener:
12891330
m_PrefabInternal: {fileID: 803028027}
12901331
m_GameObject: {fileID: 955452065}
12911332
m_Enabled: 1
1333+
--- !u!1001 &1400362904
1334+
Prefab:
1335+
m_ObjectHideFlags: 0
1336+
serializedVersion: 2
1337+
m_Modification:
1338+
m_TransformParent: {fileID: 0}
1339+
m_Modifications:
1340+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1341+
propertyPath: m_LocalPosition.x
1342+
value: 0
1343+
objectReference: {fileID: 0}
1344+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1345+
propertyPath: m_LocalPosition.y
1346+
value: 0
1347+
objectReference: {fileID: 0}
1348+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1349+
propertyPath: m_LocalPosition.z
1350+
value: 0
1351+
objectReference: {fileID: 0}
1352+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1353+
propertyPath: m_LocalRotation.x
1354+
value: 0
1355+
objectReference: {fileID: 0}
1356+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1357+
propertyPath: m_LocalRotation.y
1358+
value: 0
1359+
objectReference: {fileID: 0}
1360+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1361+
propertyPath: m_LocalRotation.z
1362+
value: 0
1363+
objectReference: {fileID: 0}
1364+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1365+
propertyPath: m_LocalRotation.w
1366+
value: 1
1367+
objectReference: {fileID: 0}
1368+
- target: {fileID: 436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1369+
propertyPath: m_RootOrder
1370+
value: 2
1371+
objectReference: {fileID: 0}
1372+
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1373+
propertyPath: AppID
1374+
value: org.opengoggles.osvr-unity.sample.untrackeddisplay
1375+
objectReference: {fileID: 0}
1376+
m_RemovedComponents: []
1377+
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
1378+
m_RootGameObject: {fileID: 917069207}
1379+
m_IsPrefabParent: 0
1380+
m_IsExploded: 1
12921381
--- !u!1 &1468488789
12931382
GameObject:
12941383
m_ObjectHideFlags: 0

OSVR-Unity/Assets/OSVRUnity/Sample/VRDisplayDemo.unity

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GameObject:
8585
- 114: {fileID: 541161353}
8686
m_Layer: 0
8787
m_Name: ClientKit
88-
m_TagString: OSVRClientKit
88+
m_TagString: Untagged
8989
m_Icon: {fileID: 0}
9090
m_NavMeshLayer: 0
9191
m_StaticEditorFlags: 4294967295
@@ -102,7 +102,7 @@ MonoBehaviour:
102102
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
103103
m_Name:
104104
m_EditorClassIdentifier:
105-
AppID: org.opengoggles.osvr-unity.sample.VRDisplayDemo
105+
AppID: org.opengoggles.osvr-unity.sample.trackeddisplay
106106
--- !u!4 &541161354
107107
Transform:
108108
m_ObjectHideFlags: 0
@@ -1431,7 +1431,7 @@ Prefab:
14311431
objectReference: {fileID: 0}
14321432
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
14331433
propertyPath: AppID
1434-
value: org.opengoggles.osvr-unity.sample.VRDisplayDemo
1434+
value: org.opengoggles.osvr-unity.sample.trackeddisplay
14351435
objectReference: {fileID: 0}
14361436
m_RemovedComponents: []
14371437
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}

0 commit comments

Comments
 (0)