From 3bec2d6e65e350422939d757c3a2a0441bb33905 Mon Sep 17 00:00:00 2001 From: TrueZhuangjia Date: Sun, 13 Oct 2024 19:14:47 +0800 Subject: [PATCH] HD sticks --- .../StickInnerHD.imageset/Contents.json | 21 ++++++++ .../StickInnerHD.imageset/stickInnerHD.png | Bin 0 -> 4998 bytes .../StickOuterHD.imageset/Contents.json | 21 ++++++++ .../StickOuterHD.imageset/StickOuterHD.png | Bin 0 -> 3938 bytes Limelight/Input/OnScreenControls.m | 45 ++++++++++-------- 5 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 Limelight/Images.xcassets/StickInnerHD.imageset/Contents.json create mode 100644 Limelight/Images.xcassets/StickInnerHD.imageset/stickInnerHD.png create mode 100644 Limelight/Images.xcassets/StickOuterHD.imageset/Contents.json create mode 100644 Limelight/Images.xcassets/StickOuterHD.imageset/StickOuterHD.png diff --git a/Limelight/Images.xcassets/StickInnerHD.imageset/Contents.json b/Limelight/Images.xcassets/StickInnerHD.imageset/Contents.json new file mode 100644 index 00000000..8bd0f347 --- /dev/null +++ b/Limelight/Images.xcassets/StickInnerHD.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "StickInnerHD.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Limelight/Images.xcassets/StickInnerHD.imageset/stickInnerHD.png b/Limelight/Images.xcassets/StickInnerHD.imageset/stickInnerHD.png new file mode 100644 index 0000000000000000000000000000000000000000..58239dce37d159ea9a4b0f26a161d17a0f176ce7 GIT binary patch literal 4998 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 O3=E#GelF{r5}E+4NPs;6 literal 0 HcmV?d00001 diff --git a/Limelight/Images.xcassets/StickOuterHD.imageset/Contents.json b/Limelight/Images.xcassets/StickOuterHD.imageset/Contents.json new file mode 100644 index 00000000..d99aa350 --- /dev/null +++ b/Limelight/Images.xcassets/StickOuterHD.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "StickOuterHD.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Limelight/Images.xcassets/StickOuterHD.imageset/StickOuterHD.png b/Limelight/Images.xcassets/StickOuterHD.imageset/StickOuterHD.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1d0f022b8290e11bf9acc1781115cd6c32d81e GIT binary patch literal 3938 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 literal 0 HcmV?d00001 diff --git a/Limelight/Input/OnScreenControls.m b/Limelight/Input/OnScreenControls.m index 0195133e..61ab8548 100644 --- a/Limelight/Input/OnScreenControls.m +++ b/Limelight/Input/OnScreenControls.m @@ -537,13 +537,13 @@ static float L3_Y; - (void) drawButtons { UIImage* aButtonImage = [UIImage imageNamed:@"AButton"]; - UIImage* aButtonHDImage = [UIImage imageNamed:@"AButtonHD"]; + UIImage* aButtonHdImage = [UIImage imageNamed:@"AButtonHD"]; UIImage* bButtonImage = [UIImage imageNamed:@"BButton"]; - UIImage* bButtonHDImage = [UIImage imageNamed:@"BButtonHD"]; + UIImage* bButtonHdImage = [UIImage imageNamed:@"BButtonHD"]; UIImage* xButtonImage = [UIImage imageNamed:@"XButton"]; - UIImage* xButtonHDImage = [UIImage imageNamed:@"XButtonHD"]; + UIImage* xButtonHdImage = [UIImage imageNamed:@"XButtonHD"]; UIImage* yButtonImage = [UIImage imageNamed:@"YButton"]; - UIImage* yButtonHDImage = [UIImage imageNamed:@"YButtonHD"]; + UIImage* yButtonHdImage = [UIImage imageNamed:@"YButtonHD"]; @@ -553,7 +553,7 @@ static float L3_Y; CGRect yButtonFrame = CGRectMake(BUTTON_CENTER_X - yButtonImage.size.width / 2, BUTTON_CENTER_Y - BUTTON_DIST - yButtonImage.size.height, yButtonImage.size.width, yButtonImage.size.height); // create A button - _aButton.contents = (id) aButtonHDImage.CGImage; + _aButton.contents = (id) aButtonHdImage.CGImage; // Set the filtering mode for smooth downscaling _aButton.minificationFilter = kCAFilterLinear; // Smooth scaling down _aButton.magnificationFilter = kCAFilterLinear; // Smooth scaling up (if needed) @@ -568,17 +568,17 @@ static float L3_Y; // create B button _bButton.frame = _swapABXY ? aButtonFrame : bButtonFrame; - _bButton.contents = (id) bButtonHDImage.CGImage; + _bButton.contents = (id) bButtonHdImage.CGImage; [_view.layer addSublayer:_bButton]; // create X Button _xButton.frame = _swapABXY ? yButtonFrame : xButtonFrame; - _xButton.contents = (id) xButtonHDImage.CGImage; + _xButton.contents = (id) xButtonHdImage.CGImage; [_view.layer addSublayer:_xButton]; // create Y Button _yButton.frame = _swapABXY ? xButtonFrame : yButtonFrame; - _yButton.contents = (id) yButtonHDImage.CGImage; + _yButton.contents = (id) yButtonHdImage.CGImage; [_view.layer addSublayer:_yButton]; // Calculate the distances of each button from the shared center based on their transformed positions @@ -729,21 +729,21 @@ static float L3_Y; // create L1 button UIImage* l1ButtonImage = [UIImage imageNamed:@"L1"]; - UIImage* l1ButtonHDImage = [UIImage imageNamed:@"L1HD"]; + UIImage* l1ButtonHdImage = [UIImage imageNamed:@"L1HD"]; _l1Button.frame = CGRectMake(L1_X - l1ButtonImage.size.width / 2, L1_Y - l1ButtonImage.size.height / 2, l1ButtonImage.size.width, l1ButtonImage.size.height); - _l1Button.contents = (id) l1ButtonHDImage.CGImage; + _l1Button.contents = (id) l1ButtonHdImage.CGImage; [_view.layer addSublayer:_l1Button]; // create R1 button UIImage* r1ButtonImage = [UIImage imageNamed:@"R1"]; - UIImage* r1ButtonHDImage = [UIImage imageNamed:@"R1HD"]; + UIImage* r1ButtonHdImage = [UIImage imageNamed:@"R1HD"]; _r1Button.frame = CGRectMake(R1_X - r1ButtonImage.size.width / 2, R1_Y - r1ButtonImage.size.height / 2, r1ButtonImage.size.width, r1ButtonImage.size.height); - _r1Button.contents = (id) r1ButtonHDImage.CGImage; + _r1Button.contents = (id) r1ButtonHdImage.CGImage; // make l1 r1 the same size as l2 r2 if(_largerStickLR1){ UIImage* l2ButtonImage = [UIImage imageNamed:@"L2"]; - UIImage* l2ButtonHDImage = [UIImage imageNamed:@"L2HD"]; + UIImage* l2ButtonHdImage = [UIImage imageNamed:@"L2HD"]; _l1Button.bounds = _r1Button.bounds = CGRectMake(0, 0, l2ButtonImage.size.width, l2ButtonImage.size.height); } @@ -756,36 +756,39 @@ static float L3_Y; // create L2 button UIImage* l2ButtonImage = [UIImage imageNamed:@"L2"]; - UIImage* l2ButtonHDImage = [UIImage imageNamed:@"L2HD"]; + UIImage* l2ButtonHdImage = [UIImage imageNamed:@"L2HD"]; _l2Button.frame = CGRectMake(L2_X - l2ButtonImage.size.width / 2, L2_Y - l2ButtonImage.size.height / 2, l2ButtonImage.size.width, l2ButtonImage.size.height); - _l2Button.contents = (id) l2ButtonHDImage.CGImage; + _l2Button.contents = (id) l2ButtonHdImage.CGImage; [_view.layer addSublayer:_l2Button]; // create R2 button UIImage* r2ButtonImage = [UIImage imageNamed:@"R2"]; - UIImage* r2ButtonHDImage = [UIImage imageNamed:@"R2HD"]; + UIImage* r2ButtonHdImage = [UIImage imageNamed:@"R2HD"]; _r2Button.frame = CGRectMake(R2_X - r2ButtonImage.size.width / 2, R2_Y - r2ButtonImage.size.height / 2, r2ButtonImage.size.width, r2ButtonImage.size.height); - _r2Button.contents = (id) r2ButtonHDImage.CGImage; + _r2Button.contents = (id) r2ButtonHdImage.CGImage; [_view.layer addSublayer:_r2Button]; } - (void) drawSticks { // create left analog stick UIImage* leftStickBgImage = [UIImage imageNamed:@"StickOuter"]; + UIImage* stickBgHdImage = [UIImage imageNamed:@"StickOuterHD"]; + _leftStickBackground.frame = CGRectMake(LS_CENTER_X - leftStickBgImage.size.width / 2, LS_CENTER_Y - leftStickBgImage.size.height / 2, leftStickBgImage.size.width, leftStickBgImage.size.height); - _leftStickBackground.contents = (id) leftStickBgImage.CGImage; + _leftStickBackground.contents = (id) stickBgHdImage.CGImage; [_view.layer addSublayer:_leftStickBackground]; UIImage* leftStickImage = [UIImage imageNamed:@"StickInner"]; + UIImage* stickHdImage = [UIImage imageNamed:@"StickInnerHD"]; _leftStick.frame = CGRectMake(LS_CENTER_X - leftStickImage.size.width / 2, LS_CENTER_Y - leftStickImage.size.height / 2, leftStickImage.size.width, leftStickImage.size.height); - _leftStick.contents = (id) leftStickImage.CGImage; + _leftStick.contents = (id) stickHdImage.CGImage; _leftStick.opacity = STICK_OPACITY; // make stick half transparent when it's idle [_view.layer addSublayer:_leftStick]; // create right analog stick UIImage* rightStickBgImage = [UIImage imageNamed:@"StickOuter"]; _rightStickBackground.frame = CGRectMake(RS_CENTER_X - rightStickBgImage.size.width / 2, RS_CENTER_Y - rightStickBgImage.size.height / 2, rightStickBgImage.size.width, rightStickBgImage.size.height); - _rightStickBackground.contents = (id) rightStickBgImage.CGImage; + _rightStickBackground.contents = (id) stickBgHdImage.CGImage; [_view.layer addSublayer:_rightStickBackground]; @@ -793,7 +796,7 @@ static float L3_Y; UIImage* rightStickImage = [UIImage imageNamed:@"StickInner"]; _rightStick.frame = CGRectMake(RS_CENTER_X - rightStickImage.size.width / 2, RS_CENTER_Y - rightStickImage.size.height / 2, rightStickImage.size.width, rightStickImage.size.height); - _rightStick.contents = (id) rightStickImage.CGImage; + _rightStick.contents = (id) stickHdImage.CGImage; _rightStick.opacity = STICK_OPACITY; // make stick half transparent when it's idle [_view.layer addSublayer:_rightStick];