Skip to content

Commit 7de6b2e

Browse files
DuFF14DuFF14
committed
Removed opengoggles from ClientKit app id in all scenes that still had it.
1 parent 8c93c32 commit 7de6b2e

5 files changed

Lines changed: 102 additions & 14 deletions

File tree

‎OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVRDemo.unity‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2353,7 +2353,7 @@ Prefab:
23532353
objectReference: {fileID: 0}
23542354
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
23552355
propertyPath: AppID
2356-
value: org.opengoggles.osvr-unity.sample.demo
2356+
value: org.osvr-unity.sample.demo
23572357
objectReference: {fileID: 0}
23582358
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
23592359
propertyPath: m_Enabled
@@ -2475,7 +2475,7 @@ MonoBehaviour:
24752475
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
24762476
m_Name:
24772477
m_EditorClassIdentifier:
2478-
AppID: org.opengoggles.osvr-unity.sample.demo
2478+
AppID: org.osvr-unity.sample.demo
24792479
--- !u!1 &1818608091
24802480
GameObject:
24812481
m_ObjectHideFlags: 0
@@ -2592,7 +2592,6 @@ MonoBehaviour:
25922592
m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
25932593
m_Name:
25942594
m_EditorClassIdentifier:
2595-
JsonDescriptorFile: {fileID: 4900000, guid: 903a53a7997a82c42b329c472b623a4e, type: 3}
25962595
--- !u!114 &1818608098
25972596
MonoBehaviour:
25982597
m_ObjectHideFlags: 0

‎OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVRDemo2.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ Prefab:
970970
objectReference: {fileID: 0}
971971
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
972972
propertyPath: AppID
973-
value: org.opengoggles.osvr-unity.sample.demo
973+
value: org.osvr-unity.sample.demo
974974
objectReference: {fileID: 0}
975975
m_RemovedComponents: []
976976
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
@@ -2922,7 +2922,7 @@ MonoBehaviour:
29222922
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
29232923
m_Name:
29242924
m_EditorClassIdentifier:
2925-
AppID: org.opengoggles.osvr-unity.sample.demo
2925+
AppID: org.osvr-unity.sample.demo
29262926
--- !u!4 &2077590280
29272927
Transform:
29282928
m_ObjectHideFlags: 0

‎OSVR-Unity/Assets/OSVRUnity/Sample/TrackerView.unity‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ NavMeshSettings:
7373
minRegionArea: 2
7474
widthInaccuracy: 16.666666
7575
heightInaccuracy: 10
76+
tileSizeHint: 0
7677
m_NavMesh: {fileID: 0}
7778
--- !u!1001 &2184805
7879
Prefab:
@@ -1048,7 +1049,7 @@ Prefab:
10481049
objectReference: {fileID: 0}
10491050
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
10501051
propertyPath: AppID
1051-
value: org.opengoggles.osvr-unity.sample.trackerview
1052+
value: org.osvr-unity.sample.trackerview
10521053
objectReference: {fileID: 0}
10531054
m_RemovedComponents: []
10541055
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
@@ -1254,7 +1255,7 @@ GameObject:
12541255
- 114: {fileID: 1887463597}
12551256
m_Layer: 0
12561257
m_Name: ClientKit
1257-
m_TagString: OSVRClientKit
1258+
m_TagString: Untagged
12581259
m_Icon: {fileID: 0}
12591260
m_NavMeshLayer: 0
12601261
m_StaticEditorFlags: 4294967295
@@ -1271,7 +1272,7 @@ MonoBehaviour:
12711272
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
12721273
m_Name:
12731274
m_EditorClassIdentifier:
1274-
AppID: org.opengoggles.osvr-unity.sample.trackerview
1275+
AppID: org.osvr-unity.sample.trackerview
12751276
--- !u!4 &1887463598
12761277
Transform:
12771278
m_ObjectHideFlags: 0

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

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ NavMeshSettings:
7373
minRegionArea: 2
7474
widthInaccuracy: 16.666666
7575
heightInaccuracy: 10
76+
tileSizeHint: 0
7677
m_NavMesh: {fileID: 0}
7778
--- !u!1 &541161352
7879
GameObject:
@@ -102,7 +103,7 @@ MonoBehaviour:
102103
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
103104
m_Name:
104105
m_EditorClassIdentifier:
105-
AppID: org.opengoggles.osvr-unity.sample.trackeddisplay
106+
AppID: org.osvr-unity.sample.trackeddisplay
106107
--- !u!4 &541161354
107108
Transform:
108109
m_ObjectHideFlags: 0
@@ -1255,6 +1256,7 @@ GameObject:
12551256
- 114: {fileID: 955452067}
12561257
- 114: {fileID: 955452070}
12571258
- 114: {fileID: 955452071}
1259+
- 114: {fileID: 955452072}
12581260
m_Layer: 0
12591261
m_Name: VRDisplayTracked
12601262
m_TagString: Untagged
@@ -1308,7 +1310,7 @@ Camera:
13081310
y: 0
13091311
width: 1
13101312
height: 1
1311-
near clip plane: .300000012
1313+
near clip plane: .00999999978
13121314
far clip plane: 1000
13131315
field of view: 60
13141316
orthographic: 0
@@ -1357,7 +1359,25 @@ MonoBehaviour:
13571359
m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
13581360
m_Name:
13591361
m_EditorClassIdentifier:
1360-
JsonDescriptorFile: {fileID: 4900000, guid: 903a53a7997a82c42b329c472b623a4e, type: 3}
1362+
--- !u!114 &955452072
1363+
MonoBehaviour:
1364+
m_ObjectHideFlags: 0
1365+
m_PrefabParentObject: {fileID: 11417594, guid: bcbb49b5078d05d498ef83a6373ba939,
1366+
type: 2}
1367+
m_PrefabInternal: {fileID: 715470731}
1368+
m_GameObject: {fileID: 955452065}
1369+
m_Enabled: 1
1370+
m_EditorHideFlags: 0
1371+
m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
1372+
m_Name:
1373+
m_EditorClassIdentifier:
1374+
k1Red: 0
1375+
k1Green: 0
1376+
k1Blue: 0
1377+
fullCenter: {x: .5, y: .5}
1378+
leftCenter: {x: .5, y: .5}
1379+
rightCenter: {x: .5, y: .5}
1380+
distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
13611381
--- !u!1 &1468488789
13621382
GameObject:
13631383
m_ObjectHideFlags: 0
@@ -1367,6 +1387,7 @@ GameObject:
13671387
m_Component:
13681388
- 4: {fileID: 1468488791}
13691389
- 114: {fileID: 1468488790}
1390+
- 20: {fileID: 1468488792}
13701391
m_Layer: 0
13711392
m_Name: LeftEye
13721393
m_TagString: Untagged
@@ -1400,6 +1421,39 @@ Transform:
14001421
m_Children: []
14011422
m_Father: {fileID: 955452066}
14021423
m_RootOrder: 0
1424+
--- !u!20 &1468488792
1425+
Camera:
1426+
m_ObjectHideFlags: 0
1427+
m_PrefabParentObject: {fileID: 2017594, guid: bcbb49b5078d05d498ef83a6373ba939,
1428+
type: 2}
1429+
m_PrefabInternal: {fileID: 715470731}
1430+
m_GameObject: {fileID: 1468488789}
1431+
m_Enabled: 1
1432+
serializedVersion: 2
1433+
m_ClearFlags: 1
1434+
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
1435+
m_NormalizedViewPortRect:
1436+
serializedVersion: 2
1437+
x: 0
1438+
y: 0
1439+
width: 1
1440+
height: 1
1441+
near clip plane: .300000012
1442+
far clip plane: 1000
1443+
field of view: 60
1444+
orthographic: 0
1445+
orthographic size: 5
1446+
m_Depth: 0
1447+
m_CullingMask:
1448+
serializedVersion: 2
1449+
m_Bits: 4294967295
1450+
m_RenderingPath: -1
1451+
m_TargetTexture: {fileID: 0}
1452+
m_TargetDisplay: 0
1453+
m_HDR: 0
1454+
m_OcclusionCulling: 1
1455+
m_StereoConvergence: 10
1456+
m_StereoSeparation: .0219999999
14031457
--- !u!1001 &1925542040
14041458
Prefab:
14051459
m_ObjectHideFlags: 0
@@ -1441,7 +1495,7 @@ Prefab:
14411495
objectReference: {fileID: 0}
14421496
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
14431497
propertyPath: AppID
1444-
value: org.opengoggles.osvr-unity.sample.trackeddisplay
1498+
value: org.osvr-unity.sample.trackeddisplay
14451499
objectReference: {fileID: 0}
14461500
m_RemovedComponents: []
14471501
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
@@ -1457,6 +1511,7 @@ GameObject:
14571511
m_Component:
14581512
- 4: {fileID: 2061423056}
14591513
- 114: {fileID: 2061423057}
1514+
- 20: {fileID: 2061423058}
14601515
m_Layer: 0
14611516
m_Name: RightEye
14621517
m_TagString: Untagged
@@ -1490,3 +1545,36 @@ MonoBehaviour:
14901545
m_EditorClassIdentifier:
14911546
eye: 1
14921547
cachedTransform: {fileID: 0}
1548+
--- !u!20 &2061423058
1549+
Camera:
1550+
m_ObjectHideFlags: 0
1551+
m_PrefabParentObject: {fileID: 2017596, guid: bcbb49b5078d05d498ef83a6373ba939,
1552+
type: 2}
1553+
m_PrefabInternal: {fileID: 715470731}
1554+
m_GameObject: {fileID: 2061423055}
1555+
m_Enabled: 1
1556+
serializedVersion: 2
1557+
m_ClearFlags: 1
1558+
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
1559+
m_NormalizedViewPortRect:
1560+
serializedVersion: 2
1561+
x: 0
1562+
y: 0
1563+
width: 1
1564+
height: 1
1565+
near clip plane: .300000012
1566+
far clip plane: 1000
1567+
field of view: 60
1568+
orthographic: 0
1569+
orthographic size: 5
1570+
m_Depth: 0
1571+
m_CullingMask:
1572+
serializedVersion: 2
1573+
m_Bits: 4294967295
1574+
m_RenderingPath: -1
1575+
m_TargetTexture: {fileID: 0}
1576+
m_TargetDisplay: 0
1577+
m_HDR: 0
1578+
m_OcclusionCulling: 1
1579+
m_StereoConvergence: 10
1580+
m_StereoSeparation: .0219999999

‎OSVR-Unity/Assets/OSVRUnity/Sample/minigame.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ MonoBehaviour:
551551
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
552552
m_Name:
553553
m_EditorClassIdentifier:
554-
AppID: org.opengoggles.osvr-unity.sample.minigame
554+
AppID: org.osvr-unity.sample.minigame
555555
--- !u!4 &738728247
556556
Transform:
557557
m_ObjectHideFlags: 0
@@ -728,7 +728,7 @@ Prefab:
728728
objectReference: {fileID: 0}
729729
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
730730
propertyPath: AppID
731-
value: org.opengoggles.osvr-unity.sample.minigame
731+
value: org.osvr-unity.sample.minigame
732732
objectReference: {fileID: 0}
733733
m_RemovedComponents: []
734734
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}

0 commit comments

Comments
 (0)