(2402e736e) Tester's build, January 25th 2020

2020-01-25 12:48:13 +02:00
parent 4a58987eae
commit eaa18a20a3
57 changed files with 710 additions and 139 deletions
@@ -746,6 +746,21 @@ namespace Barotrauma.CharacterEditor
            buttonsPanelToggle?.UpdateOpenState((float)deltaTime, new Vector2(-buttonsPanel.Rect.Width - leftArea.RectTransform.AbsoluteOffset.X, 0), buttonsPanel.RectTransform);
        }

+        public CursorState GetMouseCursorState()
+        {
+            foreach (var limb in character.AnimController.Limbs)
+            {
+                if (limb?.ActiveSprite == null) { continue; }
+                if (selectedJoints.Any(j => j.LimbA == limb || j.LimbB == limb)) { continue; }
+                // character limbs
+                if (editLimbs && !spriteSheetRect.Contains(PlayerInput.MousePosition) &&
+                    MathUtils.RectangleContainsPoint(GetLimbPhysicRect(limb), PlayerInput.MousePosition)) { return CursorState.Hand; }
+                // spritesheet
+                if (GetLimbSpritesheetRect(limb).Contains(PlayerInput.MousePosition)) { return CursorState.Hand; }
+            }
+            return CursorState.Default;
+        }
+
        /// <summary>
        /// Fps independent mouse input. The draw method is called multiple times per frame.
        /// </summary>