Skip to content
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

Jump to bottom

Wim/feature/integration #265

Merged
merged 13 commits into from
Jul 17, 2021
Merged

Wim/feature/integration #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2c13937
Mini Object Manager now scales in both directions
SzalonyNiemiec Jul 11, 2021
2c6d1ad
Add Tracked Objects
SzalonyNiemiec Jul 15, 2021
d4d3a10
fixed logical error in GetMiniObjectTypeIndex
SzalonyNiemiec Jul 15, 2021
3abb491
Added callback mechanism to ResourceManager
danvonk Jul 16, 2021
6cc5403
Minimap automatically spawns items
danvonk Jul 16, 2021
1b7342a
Obj deletion on the minimap
danvonk Jul 16, 2021
a482bfa
Created scale object prefab
danvonk Jul 16, 2021
012e3eb
Clamped min size of minimap + added map legend controller
danvonk Jul 17, 2021
37a9143
Scaling fix
danvonk Jul 17, 2021
4a8d634
scale stick implementation
danvonk Jul 17, 2021
86c6362
Put minimap legend in the upper-right quadrant
danvonk Jul 17, 2021
1b42544
Removed some dead code from MiniObjMgr
danvonk Jul 17, 2021
56c02e8
Update Minimap prefab
danvonk Jul 17, 2021
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
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/MRTK/SDK/StandardAssets.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 71 additions & 67 deletions Frontend/VIAProMa/Assets/Prefabs/Visualizations/Diagrams/Barchart/Barchart.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,18 @@ MonoBehaviour:
manipulationType: 3
twoHandedManipulationType: 7
allowFarManipulation: 1
useForcesForNearManipulation: 0
oneHandRotationModeNear: 1
oneHandRotationModeFar: 1
releaseBehavior: 3
smoothingActive: 1
smoothingFar: 1
smoothingNear: 1
moveLerpTime: 0.001
rotateLerpTime: 0.001
scaleLerpTime: 0.001
enableConstraints: 1
constraintsManager: {fileID: 0}
elasticsManager: {fileID: 0}
onManipulationStarted:
m_PersistentCalls:
m_Calls: []
Expand All @@ -66,7 +71,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b3e6359c9750ad4fb8a05c9b8704d7b, type: 3}
m_Name:
m_EditorClassIdentifier:
targetTransform: {fileID: 2738293818969125528}
handType: 3
proximityType: 3
constraintOnRotation: 5
Expand All @@ -78,75 +82,60 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8451295563011644672, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_Name
value: Barchart
objectReference: {fileID: 0}
- target: {fileID: 208045533994884588, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: ticksInCells
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 701112397120405491, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: ticksInCells
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalPosition.y
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalPosition.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalRotation.x
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalRotation.y
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalRotation.z
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_RootOrder
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 701112397120405491, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: ticksInCells
value: 1
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441190803664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
Expand All @@ -173,99 +162,114 @@ PrefabInstance:
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3940748441166445879, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4461276784175794895, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644672, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.characterCount
propertyPath: m_Name
value: Barchart
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.wordCount
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.lineCount
propertyPath: m_LocalPosition.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1701936207595153664, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.pageCount
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.characterCount
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.spaceCount
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.wordCount
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.lineCount
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8374427255834849170, guid: 72b65a4d45d6e074aa7911739f9a34ef,
- target: {fileID: 8451295563011644673, guid: 72b65a4d45d6e074aa7911739f9a34ef,
type: 3}
propertyPath: m_textInfo.pageCount
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
Expand Down
Loading