Skip to content

Improved trackers #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Improved trackers #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e72c5
added tracker update types
mwarb Nov 11, 2020
76ac6ec
throw error if multiple trackers have same dataName
mwarb Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions Assets/UXF/Examples/4_CorsiBlock/CorsiBlockExample.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,6 +2348,11 @@ PrefabInstance:
propertyPath: settingsToLog.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: trackedObjects.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: onSessionBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
Expand Down Expand Up @@ -2593,6 +2598,11 @@ PrefabInstance:
propertyPath: storeSessionSettings
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: trackedObjects.Array.data[0]
value:
objectReference: {fileID: 0}
- target: {fileID: 203569540471596912, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: m_Value
Expand Down Expand Up @@ -2856,7 +2866,7 @@ PrefabInstance:
- target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 2080
value: 4225
objectReference: {fileID: 0}
- target: {fileID: 2896031059644693069, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
Expand Down Expand Up @@ -2946,7 +2956,7 @@ PrefabInstance:
- target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3840
value: 7800
objectReference: {fileID: 0}
- target: {fileID: 4298776666381973480, guid: 0a3b6392f04558844bd340e68ced1ff9,
type: 3}
Expand Down Expand Up @@ -4836,6 +4846,7 @@ GameObject:
m_Component:
- component: {fileID: 1513556399}
- component: {fileID: 1513556400}
- component: {fileID: 1513556401}
m_Layer: 0
m_Name: CorsiBlockTask
m_TagString: Untagged
Expand Down Expand Up @@ -4898,6 +4909,27 @@ MonoBehaviour:
- {fileID: 1622668012}
randomOffsetMax: {x: 0.5, y: 0.5}
feedback: {fileID: 448119297}
--- !u!114 &1513556401
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513556398}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7e116bc94825b784182983179cfbb420, type: 3}
m_Name:
m_EditorClassIdentifier:
objectName: corsiblocktask
measurementDescriptor: mouse_position
customHeader:
- pos_x
- pos_y
- pos_z
updateType: 0
distanceFromCamera: 25
mainCamera: {fileID: 33142922}
--- !u!1 &1574932393
GameObject:
m_ObjectHideFlags: 0
Expand Down
68 changes: 34 additions & 34 deletions Assets/UXF/Prefabs/[UXF_Rig].prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 80835919952702251}
m_Father: {fileID: 1726072748377084723}
m_Father: {fileID: 1577028961808161241}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
Expand Down Expand Up @@ -1037,7 +1037,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 330023be939756b41b52054a3d796152, type: 3}
m_Name:
m_EditorClassIdentifier:
inputField: {fileID: 1726072748377084773}
inputField: {fileID: 1615748934895259183}
--- !u!1 &1171537770349854272
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1572,10 +1572,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2897568975779925135}
- {fileID: 4835438972542875703}
- {fileID: 1726072748377084700}
- {fileID: 7877310278013525285}
- {fileID: 3110759810348992417}
- {fileID: 4612929069887686480}
- {fileID: 1507222259595111547}
- {fileID: 7948667913022628418}
m_Father: {fileID: 4979987231477995344}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -2727,13 +2727,13 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2897568975779925080}
m_GameObject: {fileID: 2896031059644693069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 348b50adaf435754aa3adb61b9d1155d, type: 3}
m_Name:
m_EditorClassIdentifier:
dropdown: {fileID: 2897568975779925216}
dropdown: {fileID: 6789253931344208075}
--- !u!1 &2901584607484809767
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5283,13 +5283,13 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4835438972542875814}
m_GameObject: {fileID: 4834968701760316578}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5747e520a80c72849886c32bbce2b181, type: 3}
m_Name:
m_EditorClassIdentifier:
inputField: {fileID: 4835438972542875771}
inputField: {fileID: 1941970266495124426}
--- !u!1 &4921505235379613987
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6322,7 +6322,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6783585386340811927}
m_Father: {fileID: 4835438972542875672}
m_Father: {fileID: 4687239340321207026}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
Expand Down Expand Up @@ -8372,7 +8372,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7936957113956597187}
- {fileID: 6495799047135181285}
m_Father: {fileID: 6431357393539466631}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -8449,7 +8449,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 793044841086912741}
m_Father: {fileID: 2897568975779925182}
m_Father: {fileID: 4280540402044010303}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
Expand Down Expand Up @@ -9231,10 +9231,10 @@ MonoBehaviour:
tsAndCsInitialState: 0
instructionsContentTransform: {fileID: 4267567203292169432}
sidebarContentTransform: {fileID: 2834388984357925155}
settingsElement: {fileID: 2897568975779925216}
localFilePathElement: {fileID: 4835438972542875771}
ppidElement: {fileID: 1726072748377084752}
sessionNumElement: {fileID: 7877310278013525353}
settingsElement: {fileID: 6789253931344208075}
localFilePathElement: {fileID: 1941970266495124426}
ppidElement: {fileID: 5628817354739738849}
sessionNumElement: {fileID: 3798925361076037336}
tsAndCsToggle: {fileID: 3684702312775877842}
textPrefab: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand Down Expand Up @@ -9426,7 +9426,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
--- !u!114 &1726072748377084773 stripped
--- !u!114 &1615748934895259183 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114970555796053392, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand All @@ -9438,13 +9438,13 @@ MonoBehaviour:
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &1726072748377084723 stripped
--- !u!224 &1577028961808161241 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
m_PrefabInstance: {fileID: 1726072748377084863}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1726072748377084752 stripped
--- !u!114 &5628817354739738849 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand All @@ -9456,7 +9456,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &1726072748377084700 stripped
--- !u!224 &1507222259595111547 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand Down Expand Up @@ -9625,31 +9625,31 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9e81924d28cd0d849a13e5abce816d3a, type: 3}
--- !u!224 &2897568975779925135 stripped
--- !u!224 &3110759810348992417 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224502893949471668, guid: 9e81924d28cd0d849a13e5abce816d3a,
type: 3}
m_PrefabInstance: {fileID: 2897568975779925013}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2897568975779925216 stripped
--- !u!114 &6789253931344208075 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8506875127483083998, guid: 9e81924d28cd0d849a13e5abce816d3a,
type: 3}
m_PrefabInstance: {fileID: 2897568975779925013}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2897568975779925080}
m_GameObject: {fileID: 2896031059644693069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2897568975779925080 stripped
--- !u!1 &2896031059644693069 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1969525990930008, guid: 9e81924d28cd0d849a13e5abce816d3a,
type: 3}
m_PrefabInstance: {fileID: 2897568975779925013}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2897568975779925182 stripped
--- !u!224 &4280540402044010303 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1392091059206779690, guid: 9e81924d28cd0d849a13e5abce816d3a,
type: 3}
Expand Down Expand Up @@ -9782,31 +9782,31 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
--- !u!224 &4835438972542875703 stripped
--- !u!224 &4612929069887686480 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
m_PrefabInstance: {fileID: 4835438972542875796}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4835438972542875814 stripped
--- !u!1 &4834968701760316578 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1033861776628790, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
m_PrefabInstance: {fileID: 4835438972542875796}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4835438972542875672 stripped
--- !u!224 &4687239340321207026 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 150454391267887718, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
m_PrefabInstance: {fileID: 4835438972542875796}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4835438972542875771 stripped
--- !u!114 &1941970266495124426 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
m_PrefabInstance: {fileID: 4835438972542875796}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4835438972542875814}
m_GameObject: {fileID: 4834968701760316578}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
Expand Down Expand Up @@ -9970,7 +9970,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15c278d5156bae1489e9a38ad279bee2, type: 3}
--- !u!114 &7877310278013525353 stripped
--- !u!114 &3798925361076037336 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6478900352697465694, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand All @@ -9982,7 +9982,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e62d33c83c20a154a95029aefc30368d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &7877310278013525285 stripped
--- !u!224 &7948667913022628418 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224762906418741188, guid: 15c278d5156bae1489e9a38ad279bee2,
type: 3}
Expand Down Expand Up @@ -10107,7 +10107,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72, type: 3}
--- !u!224 &7936957113956597187 stripped
--- !u!224 &6495799047135181285 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3747006573595346056, guid: 7c12eedbd5f4e9742aecfaac8b2f1d72,
type: 3}
Expand Down
Loading