Refactoring III

This commit is contained in:
Robert Vokac 2024-12-21 21:57:55 +01:00
parent 20c92e836a
commit ce693bd9af
2 changed files with 185 additions and 183 deletions

View File

@ -238,7 +238,7 @@ namespace WindowsPhoneSpeedyBlupi
} }
double horizontalChange = 0.0; double horizontalChange = 0.0;
double verticalChange = 0.0; double verticalChange = 0.0;
int num3 = 0; int keyPress = 0;
padPressed = false; padPressed = false;
Def.ButtonGlyph buttonGlyph = Def.ButtonGlyph.None; Def.ButtonGlyph buttonGlyph = Def.ButtonGlyph.None;
TouchCollection touches = TouchPanel.GetState(); TouchCollection touches = TouchPanel.GetState();
@ -339,18 +339,18 @@ namespace WindowsPhoneSpeedyBlupi
padPressed = true; padPressed = true;
} }
Debug.WriteLine("padPressed=" + padPressed); Debug.WriteLine("padPressed=" + padPressed);
Def.ButtonGlyph buttonGlyph2 = ButtonDetect(touchOrClick); Def.ButtonGlyph pressedGlyph = ButtonDetect(touchOrClick);
Debug.WriteLine("buttonGlyph2 =" + buttonGlyph2); Debug.WriteLine("buttonGlyph2 =" + pressedGlyph);
if (buttonGlyph2 != 0) if (pressedGlyph != 0)
{ {
pressedGlyphs.Add(buttonGlyph2); pressedGlyphs.Add(pressedGlyph);
} }
if (keyboardPressed) if (keyboardPressed)
{ {
switch (keyPressed) switch (keyPressed)
{ {
case Keys.LeftControl: buttonGlyph2 = Def.ButtonGlyph.PlayJump; pressedGlyphs.Add(buttonGlyph2); break; case Keys.LeftControl: pressedGlyph = Def.ButtonGlyph.PlayJump; pressedGlyphs.Add(pressedGlyph); break;
case Keys.Space: buttonGlyph2 = Def.ButtonGlyph.PlayAction; pressedGlyphs.Add(buttonGlyph2); break; case Keys.Space: pressedGlyph = Def.ButtonGlyph.PlayAction; pressedGlyphs.Add(pressedGlyph); break;
} }
} }
@ -358,16 +358,16 @@ namespace WindowsPhoneSpeedyBlupi
{ {
gameData.AccelSensitivity = accelSlider.Value; gameData.AccelSensitivity = accelSlider.Value;
} }
switch (buttonGlyph2) switch (pressedGlyph)
{ {
case Def.ButtonGlyph.PlayJump: case Def.ButtonGlyph.PlayJump:
Debug.WriteLine("Jumping detected"); Debug.WriteLine("Jumping detected");
accelWaitZero = false; accelWaitZero = false;
num3 |= 1; keyPress |= 1;
break; break;
case Def.ButtonGlyph.PlayDown: case Def.ButtonGlyph.PlayDown:
accelWaitZero = false; accelWaitZero = false;
num3 |= 4; keyPress |= 4;
break; break;
case Def.ButtonGlyph.InitGamerA: case Def.ButtonGlyph.InitGamerA:
case Def.ButtonGlyph.InitGamerB: case Def.ButtonGlyph.InitGamerB:
@ -411,7 +411,7 @@ namespace WindowsPhoneSpeedyBlupi
case Def.ButtonGlyph.Cheat8: case Def.ButtonGlyph.Cheat8:
case Def.ButtonGlyph.Cheat9: case Def.ButtonGlyph.Cheat9:
accelWaitZero = false; accelWaitZero = false;
buttonGlyph = buttonGlyph2; buttonGlyph = pressedGlyph;
showCheatMenu = false; showCheatMenu = false;
break; break;
} }
@ -419,10 +419,7 @@ namespace WindowsPhoneSpeedyBlupi
} }
if (buttonGlyph != 0 && buttonGlyph != Def.ButtonGlyph.PlayAction && buttonGlyph != Def.ButtonGlyph.Cheat11 && buttonGlyph != Def.ButtonGlyph.Cheat12 && buttonGlyph != Def.ButtonGlyph.Cheat21 && buttonGlyph != Def.ButtonGlyph.Cheat22 && buttonGlyph != Def.ButtonGlyph.Cheat31 && buttonGlyph != Def.ButtonGlyph.Cheat32 && lastButtonDown == Def.ButtonGlyph.None) if (buttonGlyph != 0 && buttonGlyph != Def.ButtonGlyph.PlayAction && buttonGlyph != Def.ButtonGlyph.Cheat11 && buttonGlyph != Def.ButtonGlyph.Cheat12 && buttonGlyph != Def.ButtonGlyph.Cheat21 && buttonGlyph != Def.ButtonGlyph.Cheat22 && buttonGlyph != Def.ButtonGlyph.Cheat31 && buttonGlyph != Def.ButtonGlyph.Cheat32 && lastButtonDown == Def.ButtonGlyph.None)
{ {
TinyPoint tinyPoint3 = default(TinyPoint); TinyPoint pos = new TinyPoint(320, 240);
tinyPoint3.X = 320;
tinyPoint3.Y = 240;
TinyPoint pos = tinyPoint3;
sound.PlayImage(0, pos); sound.PlayImage(0, pos);
} }
if (buttonGlyph == Def.ButtonGlyph.None && lastButtonDown != 0) if (buttonGlyph == Def.ButtonGlyph.None && lastButtonDown != 0)
@ -498,14 +495,14 @@ namespace WindowsPhoneSpeedyBlupi
{ {
horizontalChange = accelSpeedX; horizontalChange = accelSpeedX;
verticalChange = 0.0; verticalChange = 0.0;
if (((uint)num3 & 4u) != 0) if (((uint)keyPress & 4u) != 0)
{ {
verticalChange = 1.0; verticalChange = 1.0;
} }
} }
decor.SetSpeedX(horizontalChange); decor.SetSpeedX(horizontalChange);
decor.SetSpeedY(verticalChange); decor.SetSpeedY(verticalChange);
decor.KeyChange(num3); decor.KeyChange(keyPress);
} }
private Def.ButtonGlyph ButtonDetect(TinyPoint touchOrClick) private Def.ButtonGlyph ButtonDetect(TinyPoint touchOrClick)
@ -541,8 +538,8 @@ namespace WindowsPhoneSpeedyBlupi
bool selected = false; bool selected = false;
if (buttonGlyph >= Def.ButtonGlyph.InitGamerA && buttonGlyph <= Def.ButtonGlyph.InitGamerC) if (buttonGlyph >= Def.ButtonGlyph.InitGamerA && buttonGlyph <= Def.ButtonGlyph.InitGamerC)
{ {
int num = (int)(buttonGlyph - 1); int selectedGamer = (int)(buttonGlyph - 1);
selected = num == gameData.SelectedGamer; selected = selectedGamer == gameData.SelectedGamer;
} }
if (buttonGlyph == Def.ButtonGlyph.SetupSounds) if (buttonGlyph == Def.ButtonGlyph.SetupSounds)
{ {
@ -570,249 +567,246 @@ namespace WindowsPhoneSpeedyBlupi
private TinyRect GetPadBounds(TinyPoint center, int radius) private TinyRect GetPadBounds(TinyPoint center, int radius)
{ {
TinyRect result = default(TinyRect); return new TinyRect(center.X - radius, center.X + radius, center.Y - radius, center.Y + radius);
result.LeftX = center.X - radius;
result.RightX = center.X + radius;
result.TopY = center.Y - radius;
result.BottomY = center.Y + radius;
return result;
} }
public TinyRect GetButtonRect(Def.ButtonGlyph glyph) public TinyRect GetButtonRect(Def.ButtonGlyph glyph)
{ {
TinyRect drawBounds = pixmap.DrawBounds; TinyRect drawBounds = pixmap.DrawBounds;
double num = drawBounds.Width; double drawBoundsWidth = drawBounds.Width;
double num2 = drawBounds.Height; double drawBoundsHeight = drawBounds.Height;
double num3 = num2 / 5.0; double buttonSizeFactor1 = drawBoundsHeight / 5.0;
double num4 = num2 * 140.0 / 480.0; double buttonSizeFactor2 = drawBoundsHeight * 140.0 / 480.0;
double num5 = num2 / 3.5; double cheatButtonSizeFactor = drawBoundsHeight / 3.5;
if (glyph >= Def.ButtonGlyph.Cheat1 && glyph <= Def.ButtonGlyph.Cheat9) if (glyph >= Def.ButtonGlyph.Cheat1 && glyph <= Def.ButtonGlyph.Cheat9)
{ {
int num6 = (int)(glyph - 35); int cheatNumber = (int)(glyph - 35);
TinyRect result = default(TinyRect); TinyRect result = default(TinyRect);
result.LeftX = 80 * num6; result.LeftX = 80 * cheatNumber;
result.RightX = 80 * (num6 + 1); result.RightX = 80 * (cheatNumber + 1);
result.TopY = 0; result.TopY = 0;
result.BottomY = 80; result.BottomY = 80;
return result; return result;
} }
int leftXForButtonsInLeftColumn = (int)(20.0 + buttonSizeFactor2 * 0.0);
int rightXForButtonsInLeftColumn = (int)(20.0 + buttonSizeFactor2 * 0.5);
switch (glyph) switch (glyph)
{ {
case Def.ButtonGlyph.InitGamerA: case Def.ButtonGlyph.InitGamerA:
{ {
TinyRect result19 = default(TinyRect); TinyRect result19 = default(TinyRect);
result19.LeftX = (int)(20.0 + num4 * 0.0); result19.LeftX = leftXForButtonsInLeftColumn;
result19.RightX = (int)(20.0 + num4 * 0.5); result19.RightX = rightXForButtonsInLeftColumn;
result19.TopY = (int)(num2 - 20.0 - num4 * 2.1); result19.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 2.1);
result19.BottomY = (int)(num2 - 20.0 - num4 * 1.6); result19.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.6);
return result19; return result19;
} }
case Def.ButtonGlyph.InitGamerB: case Def.ButtonGlyph.InitGamerB:
{ {
TinyRect result18 = default(TinyRect); TinyRect result18 = default(TinyRect);
result18.LeftX = (int)(20.0 + num4 * 0.0); result18.LeftX = leftXForButtonsInLeftColumn;
result18.RightX = (int)(20.0 + num4 * 0.5); result18.RightX = rightXForButtonsInLeftColumn;
result18.TopY = (int)(num2 - 20.0 - num4 * 1.6); result18.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.6);
result18.BottomY = (int)(num2 - 20.0 - num4 * 1.1); result18.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.1);
return result18; return result18;
} }
case Def.ButtonGlyph.InitGamerC: case Def.ButtonGlyph.InitGamerC:
{ {
TinyRect result15 = default(TinyRect); TinyRect result15 = default(TinyRect);
result15.LeftX = (int)(20.0 + num4 * 0.0); result15.LeftX = leftXForButtonsInLeftColumn;
result15.RightX = (int)(20.0 + num4 * 0.5); result15.RightX = rightXForButtonsInLeftColumn;
result15.TopY = (int)(num2 - 20.0 - num4 * 1.1); result15.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.1);
result15.BottomY = (int)(num2 - 20.0 - num4 * 0.6); result15.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.6);
return result15; return result15;
} }
case Def.ButtonGlyph.InitSetup: case Def.ButtonGlyph.InitSetup:
{ {
TinyRect result14 = default(TinyRect); TinyRect result14 = default(TinyRect);
result14.LeftX = (int)(20.0 + num4 * 0.0); result14.LeftX = leftXForButtonsInLeftColumn;
result14.RightX = (int)(20.0 + num4 * 0.5); result14.RightX = rightXForButtonsInLeftColumn;
result14.TopY = (int)(num2 - 20.0 - num4 * 0.5); result14.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.5);
result14.BottomY = (int)(num2 - 20.0 - num4 * 0.0); result14.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.0);
return result14; return result14;
} }
case Def.ButtonGlyph.InitPlay: case Def.ButtonGlyph.InitPlay:
{ {
TinyRect result11 = default(TinyRect); TinyRect result11 = default(TinyRect);
result11.LeftX = (int)(num - 20.0 - num4 * 1.0); result11.LeftX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 1.0);
result11.RightX = (int)(num - 20.0 - num4 * 0.0); result11.RightX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 0.0);
result11.TopY = (int)(num2 - 40.0 - num4 * 1.0); result11.TopY = (int)(drawBoundsHeight - 40.0 - buttonSizeFactor2 * 1.0);
result11.BottomY = (int)(num2 - 40.0 - num4 * 0.0); result11.BottomY = (int)(drawBoundsHeight - 40.0 - buttonSizeFactor2 * 0.0);
return result11; return result11;
} }
case Def.ButtonGlyph.InitBuy: case Def.ButtonGlyph.InitBuy:
case Def.ButtonGlyph.InitRanking: case Def.ButtonGlyph.InitRanking:
{ {
TinyRect result10 = default(TinyRect); TinyRect result10 = default(TinyRect);
result10.LeftX = (int)(num - 20.0 - num4 * 0.75); result10.LeftX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 0.75);
result10.RightX = (int)(num - 20.0 - num4 * 0.25); result10.RightX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 0.25);
result10.TopY = (int)(num2 - 20.0 - num4 * 2.1); result10.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 2.1);
result10.BottomY = (int)(num2 - 20.0 - num4 * 1.6); result10.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.6);
return result10; return result10;
} }
case Def.ButtonGlyph.PauseMenu: case Def.ButtonGlyph.PauseMenu:
{ {
TinyRect result37 = default(TinyRect); TinyRect result37 = default(TinyRect);
result37.LeftX = (int)((double)PixmapOrigin.X + num4 * -0.21); result37.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * -0.21);
result37.RightX = (int)((double)PixmapOrigin.X + num4 * 0.79); result37.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 0.79);
result37.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result37.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result37.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result37.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result37; return result37;
} }
case Def.ButtonGlyph.PauseBack: case Def.ButtonGlyph.PauseBack:
{ {
TinyRect result36 = default(TinyRect); TinyRect result36 = default(TinyRect);
result36.LeftX = (int)((double)PixmapOrigin.X + num4 * 0.79); result36.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 0.79);
result36.RightX = (int)((double)PixmapOrigin.X + num4 * 1.79); result36.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 1.79);
result36.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result36.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result36.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result36.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result36; return result36;
} }
case Def.ButtonGlyph.PauseSetup: case Def.ButtonGlyph.PauseSetup:
{ {
TinyRect result35 = default(TinyRect); TinyRect result35 = default(TinyRect);
result35.LeftX = (int)((double)PixmapOrigin.X + num4 * 1.79); result35.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 1.79);
result35.RightX = (int)((double)PixmapOrigin.X + num4 * 2.79); result35.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 2.79);
result35.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result35.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result35.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result35.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result35; return result35;
} }
case Def.ButtonGlyph.PauseRestart: case Def.ButtonGlyph.PauseRestart:
{ {
TinyRect result34 = default(TinyRect); TinyRect result34 = default(TinyRect);
result34.LeftX = (int)((double)PixmapOrigin.X + num4 * 2.79); result34.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 2.79);
result34.RightX = (int)((double)PixmapOrigin.X + num4 * 3.79); result34.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.79);
result34.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result34.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result34.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result34.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result34; return result34;
} }
case Def.ButtonGlyph.PauseContinue: case Def.ButtonGlyph.PauseContinue:
{ {
TinyRect result33 = default(TinyRect); TinyRect result33 = default(TinyRect);
result33.LeftX = (int)((double)PixmapOrigin.X + num4 * 3.79); result33.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.79);
result33.RightX = (int)((double)PixmapOrigin.X + num4 * 4.79); result33.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 4.79);
result33.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result33.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result33.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result33.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result33; return result33;
} }
case Def.ButtonGlyph.ResumeMenu: case Def.ButtonGlyph.ResumeMenu:
{ {
TinyRect result32 = default(TinyRect); TinyRect result32 = default(TinyRect);
result32.LeftX = (int)((double)PixmapOrigin.X + num4 * 1.29); result32.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 1.29);
result32.RightX = (int)((double)PixmapOrigin.X + num4 * 2.29); result32.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 2.29);
result32.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result32.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result32.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result32.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result32; return result32;
} }
case Def.ButtonGlyph.ResumeContinue: case Def.ButtonGlyph.ResumeContinue:
{ {
TinyRect result31 = default(TinyRect); TinyRect result31 = default(TinyRect);
result31.LeftX = (int)((double)PixmapOrigin.X + num4 * 2.29); result31.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 2.29);
result31.RightX = (int)((double)PixmapOrigin.X + num4 * 3.29); result31.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.29);
result31.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.2); result31.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.2);
result31.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.2); result31.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.2);
return result31; return result31;
} }
case Def.ButtonGlyph.WinLostReturn: case Def.ButtonGlyph.WinLostReturn:
{ {
TinyRect result30 = default(TinyRect); TinyRect result30 = default(TinyRect);
result30.LeftX = (int)((double)PixmapOrigin.X + num - num3 * 2.2); result30.LeftX = (int)((double)PixmapOrigin.X + drawBoundsWidth - buttonSizeFactor1 * 2.2);
result30.RightX = (int)((double)PixmapOrigin.X + num - num3 * 1.2); result30.RightX = (int)((double)PixmapOrigin.X + drawBoundsWidth - buttonSizeFactor1 * 1.2);
result30.TopY = (int)((double)PixmapOrigin.Y + num3 * 0.2); result30.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor1 * 0.2);
result30.BottomY = (int)((double)PixmapOrigin.Y + num3 * 1.2); result30.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor1 * 1.2);
return result30; return result30;
} }
case Def.ButtonGlyph.TrialBuy: case Def.ButtonGlyph.TrialBuy:
{ {
TinyRect result29 = default(TinyRect); TinyRect result29 = default(TinyRect);
result29.LeftX = (int)((double)PixmapOrigin.X + num4 * 2.5); result29.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 2.5);
result29.RightX = (int)((double)PixmapOrigin.X + num4 * 3.5); result29.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.5);
result29.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.1); result29.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.1);
result29.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.1); result29.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.1);
return result29; return result29;
} }
case Def.ButtonGlyph.TrialCancel: case Def.ButtonGlyph.TrialCancel:
{ {
TinyRect result28 = default(TinyRect); TinyRect result28 = default(TinyRect);
result28.LeftX = (int)((double)PixmapOrigin.X + num4 * 3.5); result28.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.5);
result28.RightX = (int)((double)PixmapOrigin.X + num4 * 4.5); result28.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 4.5);
result28.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.1); result28.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.1);
result28.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.1); result28.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.1);
return result28; return result28;
} }
case Def.ButtonGlyph.RankingContinue: case Def.ButtonGlyph.RankingContinue:
{ {
TinyRect result27 = default(TinyRect); TinyRect result27 = default(TinyRect);
result27.LeftX = (int)((double)PixmapOrigin.X + num4 * 3.5); result27.LeftX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 3.5);
result27.RightX = (int)((double)PixmapOrigin.X + num4 * 4.5); result27.RightX = (int)((double)PixmapOrigin.X + buttonSizeFactor2 * 4.5);
result27.TopY = (int)((double)PixmapOrigin.Y + num4 * 2.1); result27.TopY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 2.1);
result27.BottomY = (int)((double)PixmapOrigin.Y + num4 * 3.1); result27.BottomY = (int)((double)PixmapOrigin.Y + buttonSizeFactor2 * 3.1);
return result27; return result27;
} }
case Def.ButtonGlyph.SetupSounds: case Def.ButtonGlyph.SetupSounds:
{ {
TinyRect result26 = default(TinyRect); TinyRect result26 = default(TinyRect);
result26.LeftX = (int)(20.0 + num4 * 0.0); result26.LeftX = leftXForButtonsInLeftColumn;
result26.RightX = (int)(20.0 + num4 * 0.5); result26.RightX = rightXForButtonsInLeftColumn;
result26.TopY = (int)(num2 - 20.0 - num4 * 2.0); result26.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 2.0);
result26.BottomY = (int)(num2 - 20.0 - num4 * 1.5); result26.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.5);
return result26; return result26;
} }
case Def.ButtonGlyph.SetupJump: case Def.ButtonGlyph.SetupJump:
{ {
TinyRect result25 = default(TinyRect); TinyRect result25 = default(TinyRect);
result25.LeftX = (int)(20.0 + num4 * 0.0); result25.LeftX = leftXForButtonsInLeftColumn;
result25.RightX = (int)(20.0 + num4 * 0.5); result25.RightX = rightXForButtonsInLeftColumn;
result25.TopY = (int)(num2 - 20.0 - num4 * 1.5); result25.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.5);
result25.BottomY = (int)(num2 - 20.0 - num4 * 1.0); result25.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.0);
return result25; return result25;
} }
case Def.ButtonGlyph.SetupZoom: case Def.ButtonGlyph.SetupZoom:
{ {
TinyRect result24 = default(TinyRect); TinyRect result24 = default(TinyRect);
result24.LeftX = (int)(20.0 + num4 * 0.0); result24.LeftX = leftXForButtonsInLeftColumn;
result24.RightX = (int)(20.0 + num4 * 0.5); result24.RightX = rightXForButtonsInLeftColumn;
result24.TopY = (int)(num2 - 20.0 - num4 * 1.0); result24.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.0);
result24.BottomY = (int)(num2 - 20.0 - num4 * 0.5); result24.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.5);
return result24; return result24;
} }
case Def.ButtonGlyph.SetupAccel: case Def.ButtonGlyph.SetupAccel:
{ {
TinyRect result23 = default(TinyRect); TinyRect result23 = default(TinyRect);
result23.LeftX = (int)(20.0 + num4 * 0.0); result23.LeftX = leftXForButtonsInLeftColumn;
result23.RightX = (int)(20.0 + num4 * 0.5); result23.RightX = rightXForButtonsInLeftColumn;
result23.TopY = (int)(num2 - 20.0 - num4 * 0.5); result23.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.5);
result23.BottomY = (int)(num2 - 20.0 - num4 * 0.0); result23.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.0);
return result23; return result23;
} }
case Def.ButtonGlyph.SetupReset: case Def.ButtonGlyph.SetupReset:
{ {
TinyRect result22 = default(TinyRect); TinyRect result22 = default(TinyRect);
result22.LeftX = (int)(450.0 + num4 * 0.0); result22.LeftX = (int)(450.0 + buttonSizeFactor2 * 0.0);
result22.RightX = (int)(450.0 + num4 * 0.5); result22.RightX = (int)(450.0 + buttonSizeFactor2 * 0.5);
result22.TopY = (int)(num2 - 20.0 - num4 * 2.0); result22.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 2.0);
result22.BottomY = (int)(num2 - 20.0 - num4 * 1.5); result22.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 1.5);
return result22; return result22;
} }
case Def.ButtonGlyph.SetupReturn: case Def.ButtonGlyph.SetupReturn:
{ {
TinyRect result21 = default(TinyRect); TinyRect result21 = default(TinyRect);
result21.LeftX = (int)(num - 20.0 - num4 * 0.8); result21.LeftX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 0.8);
result21.RightX = (int)(num - 20.0 - num4 * 0.0); result21.RightX = (int)(drawBoundsWidth - 20.0 - buttonSizeFactor2 * 0.0);
result21.TopY = (int)(num2 - 20.0 - num4 * 0.8); result21.TopY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.8);
result21.BottomY = (int)(num2 - 20.0 - num4 * 0.0); result21.BottomY = (int)(drawBoundsHeight - 20.0 - buttonSizeFactor2 * 0.0);
return result21; return result21;
} }
case Def.ButtonGlyph.PlayPause: case Def.ButtonGlyph.PlayPause:
{ {
TinyRect result20 = default(TinyRect); TinyRect result20 = default(TinyRect);
result20.LeftX = (int)(num - num3 * 0.7); result20.LeftX = (int)(drawBoundsWidth - buttonSizeFactor1 * 0.7);
result20.RightX = (int)(num - num3 * 0.2); result20.RightX = (int)(drawBoundsWidth - buttonSizeFactor1 * 0.2);
result20.TopY = (int)(num3 * 0.2); result20.TopY = (int)(buttonSizeFactor1 * 0.2);
result20.BottomY = (int)(num3 * 0.7); result20.BottomY = (int)(buttonSizeFactor1 * 0.7);
return result20; return result20;
} }
case Def.ButtonGlyph.PlayAction: case Def.ButtonGlyph.PlayAction:
@ -820,17 +814,17 @@ namespace WindowsPhoneSpeedyBlupi
if (gameData.JumpRight) if (gameData.JumpRight)
{ {
TinyRect result16 = default(TinyRect); TinyRect result16 = default(TinyRect);
result16.LeftX = (int)((double)drawBounds.Width - num3 * 1.2); result16.LeftX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 1.2);
result16.RightX = (int)((double)drawBounds.Width - num3 * 0.2); result16.RightX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 0.2);
result16.TopY = (int)(num2 - num3 * 2.6); result16.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 2.6);
result16.BottomY = (int)(num2 - num3 * 1.6); result16.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.6);
return result16; return result16;
} }
TinyRect result17 = default(TinyRect); TinyRect result17 = default(TinyRect);
result17.LeftX = (int)(num3 * 0.2); result17.LeftX = (int)(buttonSizeFactor1 * 0.2);
result17.RightX = (int)(num3 * 1.2); result17.RightX = (int)(buttonSizeFactor1 * 1.2);
result17.TopY = (int)(num2 - num3 * 2.6); result17.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 2.6);
result17.BottomY = (int)(num2 - num3 * 1.6); result17.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.6);
return result17; return result17;
} }
case Def.ButtonGlyph.PlayJump: case Def.ButtonGlyph.PlayJump:
@ -838,17 +832,17 @@ namespace WindowsPhoneSpeedyBlupi
if (gameData.JumpRight) if (gameData.JumpRight)
{ {
TinyRect result12 = default(TinyRect); TinyRect result12 = default(TinyRect);
result12.LeftX = (int)((double)drawBounds.Width - num3 * 1.2); result12.LeftX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 1.2);
result12.RightX = (int)((double)drawBounds.Width - num3 * 0.2); result12.RightX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 0.2);
result12.TopY = (int)(num2 - num3 * 1.2); result12.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.2);
result12.BottomY = (int)(num2 - num3 * 0.2); result12.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 0.2);
return result12; return result12;
} }
TinyRect result13 = default(TinyRect); TinyRect result13 = default(TinyRect);
result13.LeftX = (int)(num3 * 0.2); result13.LeftX = (int)(buttonSizeFactor1 * 0.2);
result13.RightX = (int)(num3 * 1.2); result13.RightX = (int)(buttonSizeFactor1 * 1.2);
result13.TopY = (int)(num2 - num3 * 1.2); result13.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.2);
result13.BottomY = (int)(num2 - num3 * 0.2); result13.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 0.2);
return result13; return result13;
} }
case Def.ButtonGlyph.PlayDown: case Def.ButtonGlyph.PlayDown:
@ -856,71 +850,71 @@ namespace WindowsPhoneSpeedyBlupi
if (gameData.JumpRight) if (gameData.JumpRight)
{ {
TinyRect result8 = default(TinyRect); TinyRect result8 = default(TinyRect);
result8.LeftX = (int)(num3 * 0.2); result8.LeftX = (int)(buttonSizeFactor1 * 0.2);
result8.RightX = (int)(num3 * 1.2); result8.RightX = (int)(buttonSizeFactor1 * 1.2);
result8.TopY = (int)(num2 - num3 * 1.2); result8.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.2);
result8.BottomY = (int)(num2 - num3 * 0.2); result8.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 0.2);
return result8; return result8;
} }
TinyRect result9 = default(TinyRect); TinyRect result9 = default(TinyRect);
result9.LeftX = (int)((double)drawBounds.Width - num3 * 1.2); result9.LeftX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 1.2);
result9.RightX = (int)((double)drawBounds.Width - num3 * 0.2); result9.RightX = (int)((double)drawBounds.Width - buttonSizeFactor1 * 0.2);
result9.TopY = (int)(num2 - num3 * 1.2); result9.TopY = (int)(drawBoundsHeight - buttonSizeFactor1 * 1.2);
result9.BottomY = (int)(num2 - num3 * 0.2); result9.BottomY = (int)(drawBoundsHeight - buttonSizeFactor1 * 0.2);
return result9; return result9;
} }
case Def.ButtonGlyph.Cheat11: case Def.ButtonGlyph.Cheat11:
{ {
TinyRect result7 = default(TinyRect); TinyRect result7 = default(TinyRect);
result7.LeftX = (int)(num5 * 0.0); result7.LeftX = (int)(cheatButtonSizeFactor * 0.0);
result7.RightX = (int)(num5 * 1.0); result7.RightX = (int)(cheatButtonSizeFactor * 1.0);
result7.TopY = (int)(num5 * 0.0); result7.TopY = (int)(cheatButtonSizeFactor * 0.0);
result7.BottomY = (int)(num5 * 1.0); result7.BottomY = (int)(cheatButtonSizeFactor * 1.0);
return result7; return result7;
} }
case Def.ButtonGlyph.Cheat12: case Def.ButtonGlyph.Cheat12:
{ {
TinyRect result6 = default(TinyRect); TinyRect result6 = default(TinyRect);
result6.LeftX = (int)(num5 * 0.0); result6.LeftX = (int)(cheatButtonSizeFactor * 0.0);
result6.RightX = (int)(num5 * 1.0); result6.RightX = (int)(cheatButtonSizeFactor * 1.0);
result6.TopY = (int)(num5 * 1.0); result6.TopY = (int)(cheatButtonSizeFactor * 1.0);
result6.BottomY = (int)(num5 * 2.0); result6.BottomY = (int)(cheatButtonSizeFactor * 2.0);
return result6; return result6;
} }
case Def.ButtonGlyph.Cheat21: case Def.ButtonGlyph.Cheat21:
{ {
TinyRect result5 = default(TinyRect); TinyRect result5 = default(TinyRect);
result5.LeftX = (int)(num5 * 1.0); result5.LeftX = (int)(cheatButtonSizeFactor * 1.0);
result5.RightX = (int)(num5 * 2.0); result5.RightX = (int)(cheatButtonSizeFactor * 2.0);
result5.TopY = (int)(num5 * 0.0); result5.TopY = (int)(cheatButtonSizeFactor * 0.0);
result5.BottomY = (int)(num5 * 1.0); result5.BottomY = (int)(cheatButtonSizeFactor * 1.0);
return result5; return result5;
} }
case Def.ButtonGlyph.Cheat22: case Def.ButtonGlyph.Cheat22:
{ {
TinyRect result4 = default(TinyRect); TinyRect result4 = default(TinyRect);
result4.LeftX = (int)(num5 * 1.0); result4.LeftX = (int)(cheatButtonSizeFactor * 1.0);
result4.RightX = (int)(num5 * 2.0); result4.RightX = (int)(cheatButtonSizeFactor * 2.0);
result4.TopY = (int)(num5 * 1.0); result4.TopY = (int)(cheatButtonSizeFactor * 1.0);
result4.BottomY = (int)(num5 * 2.0); result4.BottomY = (int)(cheatButtonSizeFactor * 2.0);
return result4; return result4;
} }
case Def.ButtonGlyph.Cheat31: case Def.ButtonGlyph.Cheat31:
{ {
TinyRect result3 = default(TinyRect); TinyRect result3 = default(TinyRect);
result3.LeftX = (int)(num5 * 2.0); result3.LeftX = (int)(cheatButtonSizeFactor * 2.0);
result3.RightX = (int)(num5 * 3.0); result3.RightX = (int)(cheatButtonSizeFactor * 3.0);
result3.TopY = (int)(num5 * 0.0); result3.TopY = (int)(cheatButtonSizeFactor * 0.0);
result3.BottomY = (int)(num5 * 1.0); result3.BottomY = (int)(cheatButtonSizeFactor * 1.0);
return result3; return result3;
} }
case Def.ButtonGlyph.Cheat32: case Def.ButtonGlyph.Cheat32:
{ {
TinyRect result2 = default(TinyRect); TinyRect result2 = default(TinyRect);
result2.LeftX = (int)(num5 * 2.0); result2.LeftX = (int)(cheatButtonSizeFactor * 2.0);
result2.RightX = (int)(num5 * 3.0); result2.RightX = (int)(cheatButtonSizeFactor * 3.0);
result2.TopY = (int)(num5 * 1.0); result2.TopY = (int)(cheatButtonSizeFactor * 1.0);
result2.BottomY = (int)(num5 * 2.0); result2.BottomY = (int)(cheatButtonSizeFactor * 2.0);
return result2; return result2;
} }
default: default:
@ -968,15 +962,15 @@ namespace WindowsPhoneSpeedyBlupi
AccelerometerReading sensorReading = e.SensorReading; AccelerometerReading sensorReading = e.SensorReading;
float y = ((AccelerometerReading)(sensorReading)).Acceleration.Y; float y = ((AccelerometerReading)(sensorReading)).Acceleration.Y;
float num = (1f - (float)gameData.AccelSensitivity) * 0.06f + 0.04f; float sensitivityThreshold = (1f - (float)gameData.AccelSensitivity) * 0.06f + 0.04f;
float num2 = (accelLastState ? (num * 0.6f) : num); float adjustedThreshold = (accelLastState ? (sensitivityThreshold * 0.6f) : sensitivityThreshold);
if (y > num2) if (y > adjustedThreshold)
{ {
accelSpeedX = 0.0 - Math.Min((double)y * 0.25 / (double)num + 0.25, 1.0); accelSpeedX = 0.0 - Math.Min((double)y * 0.25 / (double)sensitivityThreshold + 0.25, 1.0);
} }
else if (y < 0f - num2) else if (y < 0f - adjustedThreshold)
{ {
accelSpeedX = Math.Min((double)(0f - y) * 0.25 / (double)num + 0.25, 1.0); accelSpeedX = Math.Min((double)(0f - y) * 0.25 / (double)sensitivityThreshold + 0.25, 1.0);
} }
else else
{ {

View File

@ -13,6 +13,14 @@ namespace WindowsPhoneSpeedyBlupi
public int BottomY; public int BottomY;
public TinyRect(int leftX, int rightX, int topY, int bottomY)
{
LeftX = leftX;
RightX = rightX;
TopY = topY;
BottomY = bottomY;
}
public int Width public int Width
{ {
get get