Skip to content

Commit 3279dbb

Browse files
committed
add the option to choose the max number of detection and rename ZEDSkeletonTrackingManager to ZEDBodyTrackingManager
1 parent 26e9243 commit 3279dbb

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

ZEDUnityLivelink/Assets/ZEDFusion/Scripts/SkeletonHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,16 +1121,16 @@ public void SetControlWithJointPosition(Vector3[] jointsPosition, Quaternion[] j
11211121
currentJoints = jointsPosition;
11221122

11231123
humanoid.SetActive(useAvatar);
1124-
skeleton.SetActive(!useAvatar || ZEDSkeletonTrackingManager.EnableSDKSkeleton);
1124+
skeleton.SetActive(!useAvatar || ZEDBodyTrackingManager.EnableSDKSkeleton);
11251125
usingAvatar = useAvatar;
11261126

11271127
if (useAvatar)
11281128
{
11291129
SetHumanPoseControl(jointsPosition[0], rootRotation, jointsRotation, _mirrorOnYAxis);
11301130

1131-
if (ZEDSkeletonTrackingManager.EnableSDKSkeleton)
1131+
if (ZEDBodyTrackingManager.EnableSDKSkeleton)
11321132
{
1133-
UpdateSkeleton(ZEDSkeletonTrackingManager.OffsetSDKSkeleton);
1133+
UpdateSkeleton(ZEDBodyTrackingManager.OffsetSDKSkeleton);
11341134
}
11351135
}
11361136
else

ZEDUnityLivelink/Assets/ZEDFusion/Scripts/ZEDSkeletonTrackingManager.cs renamed to ZEDUnityLivelink/Assets/ZEDFusion/Scripts/ZEDBodyTrackingManager.cs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
///
88
/// </summary>
99
[DisallowMultipleComponent]
10-
public class ZEDSkeletonTrackingManager : MonoBehaviour
10+
public class ZEDBodyTrackingManager : MonoBehaviour
1111
{
1212
#region vars
1313
/// <summary>
@@ -19,6 +19,13 @@ public class ZEDSkeletonTrackingManager : MonoBehaviour
1919
/// </summary>
2020
[Tooltip("Display 3D avatar. If set to false, only display bones and joint")]
2121
public bool enableAvatar = true;
22+
23+
/// <summary>
24+
/// Maximum number of detection displayed in the scene.
25+
/// </summary>
26+
[Tooltip("Maximum number of detections spawnable in the scene")]
27+
public int maximumNumberOfDetections = 75;
28+
2229
/// <summary>
2330
/// Avatar game objects
2431
/// </summary>
@@ -105,12 +112,15 @@ private void UpdateSkeletonData(sl.Bodies bodies)
105112
}
106113
else
107114
{
108-
SkeletonHandler handler = ScriptableObject.CreateInstance<SkeletonHandler>();
109-
Vector3 spawnPosition = bodyData.position;
110-
handler.Create(avatars[Random.Range(0,avatars.Length)], bodies.body_format);
111-
handler.InitSkeleton(person_id, new Material(skeletonBaseMaterial));
112-
avatarControlList.Add(person_id, handler);
113-
UpdateAvatarControl(handler, bodyData);
115+
if (avatarControlList.Count < maximumNumberOfDetections)
116+
{
117+
SkeletonHandler handler = ScriptableObject.CreateInstance<SkeletonHandler>();
118+
Vector3 spawnPosition = bodyData.position;
119+
handler.Create(avatars[Random.Range(0, avatars.Length)], bodies.body_format);
120+
handler.InitSkeleton(person_id, new Material(skeletonBaseMaterial));
121+
avatarControlList.Add(person_id, handler);
122+
UpdateAvatarControl(handler, bodyData);
123+
}
114124
}
115125
}
116126
}

ZEDUnityLivelink/Assets/ZEDFusion/Scripts/ZEDSkeletonTrackingManager.cs.meta renamed to ZEDUnityLivelink/Assets/ZEDFusion/Scripts/ZEDBodyTrackingManager.cs.meta

File renamed without changes.

ZEDUnityLivelink/Assets/ZEDFusion/Scripts/ZEDSkeletonAnimator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class ZEDSkeletonAnimator : MonoBehaviour
3636
public Transform LeftFootTransform = null;
3737
public Transform RightFootTransform = null;
3838
public Vector3 ankleHeightOffset = new Vector3(0, 0.102f, 0);
39-
public ZEDSkeletonTrackingManager bodyTrackingManager;
39+
public ZEDBodyTrackingManager bodyTrackingManager;
4040

4141
[Header("Keyboard controls")]
4242
public KeyCode toggleFootIK = KeyCode.I;
@@ -112,7 +112,7 @@ public class ZEDSkeletonAnimator : MonoBehaviour
112112

113113
private void Awake()
114114
{
115-
bodyTrackingManager = (ZEDSkeletonTrackingManager)FindObjectOfType(typeof(ZEDSkeletonTrackingManager));
115+
bodyTrackingManager = (ZEDBodyTrackingManager)FindObjectOfType(typeof(ZEDBodyTrackingManager));
116116
if (bodyTrackingManager == null)
117117
{
118118
Debug.LogError("ZEDManagerIK: No body tracking manager loaded!");
@@ -125,8 +125,8 @@ void Start()
125125
animator = GetComponent<Animator>();
126126
currentGroundedPosL = LeftFootTransform.position;
127127
currentGroundedPosR = RightFootTransform.position;
128-
bodyTrackingFrequency = ZEDSkeletonTrackingManager.BodyTrackingFrequency;
129-
smoothingFactor = ZEDSkeletonTrackingManager.SmoothingFactor;
128+
bodyTrackingFrequency = ZEDBodyTrackingManager.BodyTrackingFrequency;
129+
smoothingFactor = ZEDBodyTrackingManager.SmoothingFactor;
130130
}
131131

132132
/// <summary>
@@ -406,8 +406,8 @@ private void ManageHeightOffset()
406406

407407
private void Update()
408408
{
409-
bodyTrackingFrequency = ZEDSkeletonTrackingManager.BodyTrackingFrequency;
410-
smoothingFactor = ZEDSkeletonTrackingManager.SmoothingFactor;
409+
bodyTrackingFrequency = ZEDBodyTrackingManager.BodyTrackingFrequency;
410+
smoothingFactor = ZEDBodyTrackingManager.SmoothingFactor;
411411

412412
/// KEY INPUTS
413413
if (Input.GetKeyDown(toggleFootIK))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.21f1
2-
m_EditorVersionWithRevision: 2021.3.21f1 (1b156197d683)
1+
m_EditorVersion: 2021.3.22f1
2+
m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)

0 commit comments

Comments
 (0)