ButtonSchema - use overloads more

This commit is contained in:
adelikat 2020-03-22 14:32:27 -05:00
parent 828bc2b9dc
commit c0ffe0e0e3
6 changed files with 19 additions and 37 deletions

View File

@ -165,14 +165,12 @@ namespace BizHawk.Client.EmuHawk
new ButtonSchema(10, 15, "Select"),
new ButtonSchema(60, 15, "Reset"),
new ButtonSchema(108, 15, "Power"),
new ButtonSchema(10, 40)
new ButtonSchema(10, 40, "Toggle Left Difficulty")
{
Name = "Toggle Left Difficulty",
DisplayName = "Left Difficulty"
},
new ButtonSchema(92, 40)
new ButtonSchema(92, 40, "Toggle Right Difficulty")
{
Name = "Toggle Right Difficulty",
DisplayName = "Right Difficulty"
}
}

View File

@ -121,9 +121,8 @@ namespace BizHawk.Client.EmuHawk
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1]
},
new ButtonSchema(6, 224)
new ButtonSchema(6, 224, controller, "Pedal")
{
Name = $"P{controller} Pedal",
DisplayName = "Pedal"
}
}

View File

@ -77,24 +77,20 @@ namespace BizHawk.Client.EmuHawk
ButtonSchema.Down(14, 56, $"P{controller} Down"),
ButtonSchema.Left(2, 34, $"P{controller} Left"),
ButtonSchema.Right(24, 34, $"P{controller} Right"),
new ButtonSchema(98, 40)
new ButtonSchema(98, 40, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(122, 40)
new ButtonSchema(122, 40, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(146, 40)
new ButtonSchema(146, 40, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(122, 12)
new ButtonSchema(122, 12, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
}
}
@ -112,39 +108,32 @@ namespace BizHawk.Client.EmuHawk
ButtonSchema.Down(14, 56, $"P{controller} Down"),
ButtonSchema.Left(2, 34, $"P{controller} Left"),
ButtonSchema.Right(24, 34, $"P{controller} Right"),
new ButtonSchema(98, 40)
new ButtonSchema(98, 40, controller, "A")
{
Name = $"P{controller} A",
DisplayName = "A"
},
new ButtonSchema(122, 40)
new ButtonSchema(122, 40, controller, "B")
{
Name = $"P{controller} B",
DisplayName = "B"
},
new ButtonSchema(146, 40)
new ButtonSchema(146, 40, controller, "C")
{
Name = $"P{controller} C",
DisplayName = "C"
},
new ButtonSchema(98, 65)
new ButtonSchema(98, 65, controller, "X")
{
Name = $"P{controller} X",
DisplayName = "X"
},
new ButtonSchema(122, 65)
new ButtonSchema(122, 65, controller, "Y")
{
Name = $"P{controller} Y",
DisplayName = "Y"
},
new ButtonSchema(146, 65)
new ButtonSchema(146, 65, controller, "Z")
{
Name = $"P{controller} Z",
DisplayName = "Z"
},
new ButtonSchema(122, 12)
new ButtonSchema(122, 12, controller, "Start")
{
Name = $"P{controller} Start",
DisplayName = "S"
}
}
@ -164,14 +153,12 @@ namespace BizHawk.Client.EmuHawk
MaxValue = 10000,
TargetSize = new Size(320, 240)
},
new ButtonSchema(284, 17)
new ButtonSchema(284, 17, controller, "Lightgun Trigger")
{
Name = $"P{controller} Lightgun Trigger",
DisplayName = "Trigger"
},
new ButtonSchema(284, 40)
new ButtonSchema(284, 40, controller, "Lightgun Start")
{
Name = $"P{controller} Lightgun Start",
DisplayName = "Start"
}
}

View File

@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
DefaultSize = new Size(60, 45),
Buttons = new []
{
new ButtonSchema(8, 18) { Name = "Lid" }
new ButtonSchema(8, 18, "Lid")
}
};
}
@ -51,7 +51,7 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
{
TargetSize = new Size(256, 192)
},
new ButtonSchema(72, 10) { Name = "Touch" }
new ButtonSchema(72, 10, "Touch")
}
};
}

View File

@ -187,9 +187,8 @@ namespace BizHawk.Client.EmuHawk
for (var i = 0; i < diskSize; i++)
{
buttons.Add(new ButtonSchema(10 + (i * 58), 50)
buttons.Add(new ButtonSchema(10 + (i * 58), 50, $"FDS Insert {i}")
{
Name = $"FDS Insert {i}",
DisplayName = $"Insert {i}"
});
}

View File

@ -173,7 +173,6 @@ namespace BizHawk.Client.EmuHawk
},
new SingleFloatSchema(328, 12, $"P{controller} Right Shoulder")
{
Name = $"P{controller} Right Shoulder",
DisplayName = "L",
TargetSize = new Size(128, 55),
MinValue = 0,