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

Make analog sticks emit "fake" digital actions for left/right/up/down… #1746

Closed
wants to merge 9 commits into from
Closed

Make analog sticks emit "fake" digital actions for left/right/up/down… #1746

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c77870
Make analog sticks emit "fake" digital actions for left/right/up/down…
larsiusprime Feb 26, 2016
4d1dd74
quick fix
larsiusprime Feb 26, 2016
3ded9b2
style fixes / cleanup
larsiusprime Feb 26, 2016
f72cace
this needs to be outside the #if flash conditional, that's probably w…
larsiusprime Feb 26, 2016
ffe6838
minor cleanup
larsiusprime Feb 26, 2016
1c9febd
fix crash on legacy
larsiusprime Feb 27, 2016
dc9a674
fix ifs
larsiusprime Feb 27, 2016
08aa03d
better "null" check
larsiusprime Feb 27, 2016
1c9ca2e
d'oh
larsiusprime Feb 27, 2016
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
69 changes: 66 additions & 3 deletions flixel/input/gamepad/FlxGamepad.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,17 @@ class FlxGamepad implements IFlxDestroyable
control = _device.getControlAt(i);

//quick absolute value for analog sticks
var value = Math.abs(control.value);
button = getButton(i);

if (isAxisForAnalogStick(i))
{
handleAxisMove(i, control.value, button.value);
}

button.value = control.value;

var value = Math.abs(control.value);

if (value < deadZone)
{
button.release();
Expand Down Expand Up @@ -261,10 +269,10 @@ class FlxGamepad implements IFlxDestroyable
manager = null;

#if FLX_JOYSTICK_API
hat = FlxDestroyUtil.put(hat);
hat = FlxDestroyUtil.put(hat);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fyi, I'm not a fan of this formatting for vertical alignment. That's just a lot of extra maintenance effort with little benefit.

ball = FlxDestroyUtil.put(ball);

hat = null;
hat = null;
ball = null;
#end
}
Expand Down Expand Up @@ -606,6 +614,61 @@ class FlxGamepad implements IFlxDestroyable
return getAnalogYAxisValue(Stick);
}

@:allow(flixel.input.gamepad.FlxGamepadManager)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessary, the class already has @:allow(flixel.input.gamepad).

private function handleAxisMove(axis:Int, newVal:Float, oldVal:Float)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Abbreviating value to val seems a bit silly, barely saves any chars and definitely doesn't help readability.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

result of a refactor, those were the old variable names, updating now.

{
newVal = applyAxisFlip(newVal, axis);
oldVal = applyAxisFlip(oldVal, axis);

//check to see if we should send digital inputs as well as analog
var stick:FlxGamepadAnalogStick = this.getAnalogStickByAxis(axis);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary this here.

if (stick.mode == ONLY_DIGITAL || stick.mode == BOTH)
{
var neg = stick.digitalThreshold * -1;
var pos = stick.digitalThreshold;
var digitalButton = -1;

trace("axis(" + axis + ") val = " + newVal);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover trace.


//pressed/released for digital LEFT/UP
if (newVal < neg && oldVal >= neg)
{
if (axis == stick.x) digitalButton = stick.rawLeft;
else if (axis == stick.y) digitalButton = stick.rawUp;
var btn = getButton(digitalButton);
if (btn != null) btn.press();
}
else if (newVal >= neg && oldVal < neg)
{
if (axis == stick.x) digitalButton = stick.rawLeft;
else if (axis == stick.y) digitalButton = stick.rawUp;
var btn = getButton(digitalButton);
if (btn != null) btn.release();
}

//pressed/released for digital RIGHT/DOWN
if (newVal > pos && oldVal <= pos)
{
if (axis == stick.x) digitalButton = stick.rawRight;
else if (axis == stick.y) digitalButton = stick.rawDown;
var btn = getButton(digitalButton);
if (btn != null) btn.press();
}
else if (newVal <= pos && oldVal > pos)
{
if (axis == stick.x) digitalButton = stick.rawRight;
else if (axis == stick.y) digitalButton = stick.rawDown;
var btn = getButton(digitalButton);
if (btn != null) btn.release();
}

if (stick.mode == ONLY_DIGITAL)
{
//still haven't figured out how to suppress the analog inputs properly. Oh well.
}
}
}

/**
* Whether any buttons have the specified input state.
*/
Expand Down
6 changes: 3 additions & 3 deletions flixel/input/gamepad/FlxGamepadAnalogStick.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class FlxGamepadAnalogStick
/**
* when analog inputs are received, how to process them digitally
*/
public var mode(default, null):FlxAnalogToDigitalMode = ONLY_ANALOG;
public var mode(default, null):FlxAnalogToDigitalMode = BOTH;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the default here seems like a breaking change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not strictly speaking breaking; previously it was reporting only analog actions, this would make it report both analog and digital. As far as I can tell, the analog-to-digital actions weren't even mapped up correctly and thus weren't being reported.

The only difference users should see is new digital actions being reported, and will only affect things if they choose to poll for them.


public function new(x:Int, y:Int, ?settings:FlxGamepadAnalogStickSettings)
{
Expand All @@ -42,12 +42,12 @@ class FlxGamepadAnalogStick
if (settings == null)
return;

mode = (settings.mode != null) ? settings.mode : ONLY_ANALOG;
mode = (settings.mode != null) ? settings.mode : BOTH;
rawUp = (settings.up != null) ? settings.up : -1;
rawDown = (settings.down != null) ? settings.down : -1;
rawLeft = (settings.left != null) ? settings.left : -1;
rawRight = (settings.right != null) ? settings.right : -1;
digitalThreshold = (settings.threshold != null) ? settings.threshold : -1;
digitalThreshold = (settings.threshold != null) ? settings.threshold : 0.5;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the default here seems like a breaking change

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above note.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify in this situation: since the default setting everywhere was to only report Analog, I'm pretty sure nobody was actually accessing this behavior. Accessing analog-to-digital virtual stick directions was buried in the API, essentially undocumented, and only worked on legacy. This PR is basically the first time the feature's actually been exposed to daylight in any practical sense.

}

public function toString():String
Expand Down
5 changes: 5 additions & 0 deletions flixel/input/gamepad/FlxGamepadButton.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@ class FlxGamepadButton extends FlxInput<Int>
super.press();
}
#end

/**
* Optional analog value, so we can check when the value has changed from the last frame
*/
public var value:Float = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Variables are declared at the top of the class.

}
18 changes: 14 additions & 4 deletions flixel/input/gamepad/FlxGamepadInputID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,24 @@ abstract FlxGamepadInputID(Int) from Int to Int
/**for a mouse-like input such as touch or IR camera. Vertical axis.**/
var POINTER_Y = 29;

var LEFT_STICK_DIGITAL_UP = 30;
var LEFT_STICK_DIGITAL_RIGHT = 31;
var LEFT_STICK_DIGITAL_DOWN = 32;
var LEFT_STICK_DIGITAL_LEFT = 33;

var RIGHT_STICK_DIGITAL_UP = 34;
var RIGHT_STICK_DIGITAL_RIGHT = 35;
var RIGHT_STICK_DIGITAL_DOWN = 36;
var RIGHT_STICK_DIGITAL_LEFT = 37;

/**an extra digital button that doesn't fit cleanly into the universal template**/
var EXTRA_0 = 30;
var EXTRA_0 = 46;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing these IDs is a breaking change because this abstract allows from Int and to Int.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so just move the new ids to the end of the value list?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems sensible.

/**an extra digital button that doesn't fit cleanly into the universal template**/
var EXTRA_1 = 31;
var EXTRA_1 = 47;
/**an extra digital button that doesn't fit cleanly into the universal template**/
var EXTRA_2 = 32;
var EXTRA_2 = 48;
/**an extra digital button that doesn't fit cleanly into the universal template**/
var EXTRA_3 = 33;
var EXTRA_3 = 49;

@:from
public static inline function fromString(s:String)
Expand Down
50 changes: 5 additions & 45 deletions flixel/input/gamepad/FlxGamepadManager.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,58 +453,18 @@ class FlxGamepadManager implements IFlxInputManager
{
var isForStick = gamepad.isAxisForAnalogStick(i);
var isForMotion = gamepad.mapping.isAxisForMotion(i);

if (!isForStick && !isForMotion)
{
// in legacy this returns a (-1, 1) range, but in flash/next it
// returns (0,1) so we normalize to (0, 1) for legacy target only
newAxis[i] = (newAxis[i] + 1) / 2;
}
else if (isForStick)
else if(isForStick)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flixel's code style always has a space after if, switch, while and for.

{
//check to see if we should send digital inputs as well as analog
var stick:FlxGamepadAnalogStick = gamepad.getAnalogStickByAxis(i);
if (stick.mode == ONLY_DIGITAL || stick.mode == BOTH)
{
var newVal = newAxis[i];
var oldVal = oldAxis[i];

var neg = stick.digitalThreshold * -1;
var pos = stick.digitalThreshold;
var digitalButton = -1;

//pressed/released for digital LEFT/UP
if (newVal < neg && oldVal >= neg)
{
if (i == stick.x) digitalButton = stick.rawLeft;
else if (i == stick.y) digitalButton = stick.rawUp;
handleButtonDown(device, digitalButton);
}
else if (newVal >= neg && oldVal < neg)
{
if (i == stick.x) digitalButton = stick.rawLeft;
else if (i == stick.y) digitalButton = stick.rawUp;
handleButtonUp(device, digitalButton);
}

//pressed/released for digital RIGHT/DOWN
if (newVal > pos && oldVal <= pos)
{
if (i == stick.x) digitalButton = stick.rawRight;
else if (i == stick.y) digitalButton = stick.rawDown;
handleButtonDown(device, digitalButton);
}
else if (newVal <= pos && oldVal > pos)
{
if (i == stick.x) digitalButton = stick.rawRight;
else if (i == stick.y) digitalButton = stick.rawDown;
handleButtonUp(device, digitalButton);
}

if (stick.mode == ONLY_DIGITAL)
{
//still haven't figured out how to suppress the analog inputs properly. Oh well.
}
}
var newVal = newAxis[i];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These temp variables seem a little unnecessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cruft from a refactor, removing...

var oldVal = oldAxis[i];
gamepad.handleAxisMove(i, newVal, oldVal);
}
}

Expand Down
9 changes: 4 additions & 5 deletions flixel/input/gamepad/id/LogitechID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ class LogitechID
//TODO: Someone needs to look this up and define it! (NOTE: not all logitech controllers have this)
public static inline var LOGITECH:Int = -1;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3);

#else // native and html5
public static inline var ONE:Int = 0;
public static inline var TWO:Int = 1;
Expand All @@ -55,7 +52,9 @@ class LogitechID
//TODO: Someone needs to look this up and define it! (NOTE: not all logitech controllers have this)
public static inline var LOGITECH:Int = -5;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3);
#end

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1, {up:24, down:25, left:26, right:27});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there no indent here?

public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:28, down:29, left:30, right:31});

}
4 changes: 2 additions & 2 deletions flixel/input/gamepad/id/MFiID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class MFiID
public static inline var DPAD_LEFT:Int = 19;
public static inline var DPAD_RIGHT:Int = 20;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick(0, 1, {up:21, down:22, left:23, right:24});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where do these up / down / left / right IDs come from? Just arbitrary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are "arbitrary" in that they don't match any physical inputs, but are specifically chosen to not conflict with any existing button ID's. They are basically new virtual digital button inputs that represent the analog stick being pushed past the digital threshold in each direction.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, wouldn't it be better if they weren't so close to the actual IDs? Maybe have them all start at 100-something an an indicator that they aren't real IDs?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, that's totally fine, as long as you're okay with these other two considerations:

  • The "FAKE" id's for legacy are adjacent, we'd be departing from that convention
  • These ID's ultimately map to array indeces, so it'd implicitly create a lot of empty space in the underyling array structures

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array indices thing is a good argument against my suggestion. I think we might even have had the exact same conversation about those other fake IDs a while ago.. :D

public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:25, down:26, left:27, right:28});

public static inline var LEFT_TRIGGER:Int = 4;
public static inline var RIGHT_TRIGGER:Int = 5;
Expand Down
20 changes: 10 additions & 10 deletions flixel/input/gamepad/id/MayflashWiiRemoteID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ class MayflashWiiRemoteID

// Yes, the WiiRemote DPAD is treated as ANALOG for some reason...so we have to pass in some "fake" ID's to get simulated digital inputs
public static var REMOTE_DPAD(default, null) = new FlxGamepadAnalogStick(0, 1, {
up: REMOTE_DPAD_UP,
down: REMOTE_DPAD_DOWN,
left: REMOTE_DPAD_LEFT,
up: REMOTE_DPAD_UP,
down: REMOTE_DPAD_DOWN,
left: REMOTE_DPAD_LEFT,
right: REMOTE_DPAD_RIGHT,
threshold: 0.5,
mode: ONLY_DIGITAL
});

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1); //the nunchuk only has the "left" analog stick
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3); //the classic controller has both the "left" and "right" analog sticks
public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1, {up:26, down:27, left:28, right:29}); //the nunchuk only has the "left" analog stick
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:30, down:31, left:32, right:33}); //the classic controller has both the "left" and "right" analog sticks

// these aren't real axes, they're simulated when the right digital buttons are pushed
public static inline var LEFT_TRIGGER_FAKE:Int = 4;
Expand Down Expand Up @@ -166,16 +166,16 @@ class MayflashWiiRemoteID

// Yes, the WiiRemote DPAD is treated as ANALOG for some reason...so we have to pass in some "fake" ID's to get simulated digital inputs
public static var REMOTE_DPAD(default, null) = new FlxGamepadAnalogStick(0, 1, {
up: REMOTE_DPAD_UP,
down: REMOTE_DPAD_DOWN,
left: REMOTE_DPAD_LEFT,
up: REMOTE_DPAD_UP,
down: REMOTE_DPAD_DOWN,
left: REMOTE_DPAD_LEFT,
right: REMOTE_DPAD_RIGHT,
threshold: 0.5,
mode: ONLY_DIGITAL
});

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1); //the nunchuk only has the "left" analog stick
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3); //the classic controller has both the "left" and "right" analog sticks
public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1, {up:26, down:27, left:28, right:29}); //the nunchuk only has the "left" analog stick
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:26, down:27, left:28, right:29}); //the classic controller has both the "left" and "right" analog sticks

// these aren't real axes, they're simulated when the right digital buttons are pushed
public static inline var LEFT_TRIGGER_FAKE:Int = 4;
Expand Down
4 changes: 2 additions & 2 deletions flixel/input/gamepad/id/OUYAID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class OUYAID
public static inline var DPAD_UP:Int = 16;

// If TRIGGER axis returns value > 0 then LT is being pressed, and if it's < 0 then RT is being pressed
public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(11, 14);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick( 0, 1, {up:23, down:24, left:25, right:26});
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(11, 14, {up:27, down:28, left:29, right:30});

public static inline var LEFT_TRIGGER_ANALOG:Int = 17;
public static inline var RIGHT_TRIGGER_ANALOG:Int = 18;
Expand Down
12 changes: 6 additions & 6 deletions flixel/input/gamepad/id/PS4ID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class PS4ID
public static inline var PS:Int = 22;
public static inline var TOUCHPAD_CLICK:Int = 23;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0 , 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 5);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick(0, 1, {up:24, down:25, left:26, right:27});
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 5, {up:28, down:29, left:30, right:31});

public static inline var DPAD_UP:Int = 6;
public static inline var DPAD_DOWN:Int = 7;
Expand All @@ -63,8 +63,8 @@ class PS4ID

public static inline var TOUCHPAD_CLICK:Int = 21;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick(0, 1, {up:22, down:23, left:24, right:25});
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:26, down:27, left:28, right:29});

public static inline var L2:Int = 4;
public static inline var R2:Int = 5;
Expand Down Expand Up @@ -97,8 +97,8 @@ class PS4ID
public static inline var L2:Int = 3;
public static inline var R2:Int = 4;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 5);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick(0, 1, {up:27, down:28, left:29, right:30});
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 5, {up:31, down:32, left:33, right:34});

//"fake" IDs, we manually watch for hat axis changes and then send events using these otherwise unused joystick button codes
public static inline var DPAD_LEFT:Int = 15;
Expand Down
4 changes: 2 additions & 2 deletions flixel/input/gamepad/id/PSVitaID.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ class PSVitaID
public static inline var DPAD_LEFT:Int = 19;
public static inline var DPAD_RIGHT:Int = 20;

public static var LEFT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(0, 1);
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3);
public static var LEFT_ANALOG_STICK (default, null) = new FlxGamepadAnalogStick(0, 1, {up:21, down:22, left:23, right:24});
public static var RIGHT_ANALOG_STICK(default, null) = new FlxGamepadAnalogStick(2, 3, {up:21, down:22, left:23, right:24});
}
Loading