Key Counter #31

huoyaoyuan · 2016-09-23T11:30:22Z

An implementation for #29 .

Custom features:

Relative text position.
Custom text colors and fadings.

Preconditions:

General fixes osu-framework#81
Key Counter necessary changes/additions osu-framework#82
submodule update

peppy

good structure overall. suggestions attached.

osu.Game/Graphics/UserInterface/Counter.cs

+        private SpriteText countSpriteText;
+
+        public override string Name { get; }
+        public KeyCounter ParentCounter { get; set; }


osu.Game/Graphics/UserInterface/Counter.cs

+
+        public override string Name { get; }
+        public KeyCounter ParentCounter { get; set; }
+        public int Counts { get; private set; }


osu.Game/Graphics/UserInterface/Counter.cs

+
+        private void UpdateGlowSprite()
+        {
+            //can have a FadeTime property or const


osu.Game/Graphics/UserInterface/Counter.cs

+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        glowSprite = new Sprite


osu.Game/Graphics/UserInterface/Counter.cs

+                    Colour = KeyUpTextColor
+                }
+            };
+            glowSprite.Hide();


osu.Game/Graphics/UserInterface/Counter.cs

+            if (IsLit)
+            {
+                glowSprite.Show();
+                countSpriteText.FadeColour(KeyDownTextColor, 0);


osu.Game/Graphics/UserInterface/Counter.cs

+        private void IncreaseCount()
+        {
+            Counts++;
+            countSpriteText.Text = Counts.ToString();


osu.Game/Graphics/UserInterface/KeyCounterCollection.cs

+        }
+
+        private List<KeyCounter> counters = new List<KeyCounter>();
+        //default capacity is 4, and osu! uses 4 keys usually, so it won't trouble


osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -0,0 +1,32 @@
+using System;


osu.Game/Graphics/UserInterface/KeyCounter.cs

+                            Text = Name,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Position = new Vector2(0, -buttonSprite.Height / 4),


osu.Game/Graphics/UserInterface/KeyCounter.cs

+        private Sprite buttonSprite;
+        private Sprite glowSprite;
+        private Container textLayer;
+        private SpriteText keySpriteText;


osu.Game/Graphics/UserInterface/KeyCounter.cs

+            Width = buttonSprite.Width;
+        }
+
+        private void UpdateGlowSprite()


peppy

looks good

huoyaoyuan force-pushed the key-counter branch 2 times, most recently from db32f34 to 9cbe710 Compare September 24, 2016 01:16

peppy requested changes Sep 24, 2016

View reviewed changes

huoyaoyuan force-pushed the key-counter branch 3 times, most recently from 00a0159 to 604d896 Compare September 24, 2016 11:30

huoyaoyuan added 14 commits September 24, 2016 19:46

Implement KeyCounter and base Count class.

55a1a38

Adjust children position of Counter.

e5ef3e1

MouseCount and KeyBoardCount, input handling.

81f269e

Counter animation.

409bb0d

Move IsCounting to KeyCounter.

ba19fe1

IsLit Adjustment.

d8666de

Make counter public.

16f1dff

Visual test for KeyCounter.

4b459b4

Rename counter classes to avoid confusing.

c70bf53

Avoid accessing container in each counter.

0da0d4f

Adjust visual tree of counter.

f4ac1f6

Add FadeTime and allow setting custom styles directly from container.

ed4fae5

Comma seperator in numbers.

ec2bc47

Fix typo and missnaming.

63535df

huoyaoyuan force-pushed the key-counter branch from 604d896 to 63535df Compare September 24, 2016 11:46

peppy reviewed Sep 26, 2016

View reviewed changes

osu.Game/Graphics/UserInterface/KeyCounterCollection.cs

}

private List<KeyCounter> counters = new List<KeyCounter>();

//default capacity is 4, and osu! uses 4 keys usually, so it won't trouble

This comment was marked as off-topic.

Sign in to view

peppy reviewed Sep 26, 2016

View reviewed changes

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -0,0 +1,32 @@

using System;

This comment was marked as off-topic.

Sign in to view

Merge branch 'master' into key-counter

3d23dda

peppy reviewed Sep 26, 2016

View reviewed changes

osu.Game/Graphics/UserInterface/KeyCounter.cs

private Sprite buttonSprite;

private Sprite glowSprite;

private Container textLayer;

private SpriteText keySpriteText;

This comment was marked as off-topic.

Sign in to view

peppy reviewed Sep 26, 2016

View reviewed changes

osu.Game/Graphics/UserInterface/KeyCounter.cs

Width = buttonSprite.Width;

}

private void UpdateGlowSprite()

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

huoyaoyuan added 3 commits September 26, 2016 14:21

Add missing lincense header, remove unnecessary comment and field.

756e7a6

Update private methods implementation.

b4bb3d6

Add ResetCount method for Counter.

bb13da2

Relative size and position for text layer.

25fecfc

peppy approved these changes Sep 28, 2016

View reviewed changes

peppy merged commit cca5de2 into ppy:master Sep 28, 2016

huoyaoyuan deleted the key-counter branch September 28, 2016 06:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Key Counter #31

Key Counter #31

huoyaoyuan commented Sep 23, 2016 •

edited

Loading

peppy left a comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

peppy left a comment

Key Counter #31

Key Counter #31

Conversation

huoyaoyuan commented Sep 23, 2016 • edited Loading

peppy left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

peppy left a comment

Choose a reason for hiding this comment

huoyaoyuan commented Sep 23, 2016 •

edited

Loading