Skip to content

Commit

Permalink
Machenike hg510 (#211)
Browse files Browse the repository at this point in the history 
* HG510 Add to GUI Initial class initial 3D  models.

* Update

* Model updates, fix LED, joystick rotation and selection columns

* Column tweaks.
  • Loading branch information
@CasperH2O
CasperH2O authored Jul 30, 2022
1 parent 2bbaded commit f3bac9a
Show file tree
Hide file tree
Showing 50 changed files with 250,652 additions and 37 deletions.
3 changes: 2 additions & 1 deletion ControllerCommon/Utils/InputUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public enum OverlayModelMode
Virtual = 1,
ZDOPlus = 2,
EightBitDoLite2 = 3,
Toy = 4
MachenikeHG510 = 4,
Toy = 5
}

public static class InputUtils
Expand Down
159 changes: 159 additions & 0 deletions HandheldCompanion/HandheldCompanion.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,165 @@
<None Update="Models\DS4\Y.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\A.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\B.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Back.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\BackBody.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\BodyBack.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\DPadDown.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\DPadLeft.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\DPadRight.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\DPadUp.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\FN.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\FrontAccent.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Home-Machenike.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Home.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Joystick-Left-Ring.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Joystick-Right-Ring.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\JoystickBaseRingLeft.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\JoystickBaseRingRight.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\JoystickLeft.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\JoystickRight.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED1.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED2.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED3.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED4.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED5.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED6.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED7.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LED8.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LeftJoystickRing.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LeftMotor.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LeftShoulder.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LeftThumb.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LogoInner.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LogoMid.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\LogoOuter.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Machenike.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\MainBody.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\MotorLeft.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\MotorRight.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\RightJoystickRing.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\RightMotor.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\RightShoulder.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\RightThumb.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Shoulder-Left-Trigger.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Shoulder-Right-Trigger.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\ShoulderLeft.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\ShoulderRight.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Start.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Switch.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Turbo.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\W1.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\W2.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\X.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="models\MachenikeHG510\Y.obj">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Models\NEO\MainBody.mtl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
75 changes: 42 additions & 33 deletions HandheldCompanion/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions HandheldCompanion/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@
<data name="OverlayPage_Listening" xml:space="preserve">
<value>Listening...</value>
</data>
<data name="OverlayPage_MachenikeHG510Controller" xml:space="preserve">
<value>MACHENIKE HG510</value>
</data>
<data name="OverlayPage_MainTrigger" xml:space="preserve">
<value>Main trigger</value>
</data>
Expand Down
9 changes: 6 additions & 3 deletions HandheldCompanion/Views/Pages/OverlayPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="5*" MinWidth="200"></ColumnDefinition>
<ColumnDefinition Width="3*" MinWidth="120"></ColumnDefinition>
<ColumnDefinition Width="3*" MinWidth="200"></ColumnDefinition>
<ColumnDefinition Width="5*" MinWidth="120"></ColumnDefinition>
</Grid.ColumnDefinitions>

<DockPanel>
Expand All @@ -75,7 +75,7 @@
</ui:SimpleStackPanel>
</DockPanel>

<ui:RadioButtons Name="OverlayModel" Grid.Column="1" HorizontalAlignment="Right" SelectionChanged="OverlayModel_SelectionChanged">
<ui:RadioButtons Name="OverlayModel" Grid.Column="1" MaxColumns="3" HorizontalAlignment="Right" SelectionChanged="OverlayModel_SelectionChanged">
<RadioButton Name="OEMControllerRadio" IsEnabled="False">
<Label Content="{x:Static resx:Resources.OverlayPage_OEMController}"></Label>
</RadioButton>
Expand All @@ -88,6 +88,9 @@
<RadioButton Name="EightBitDoLite2Radio">
<Label Content="{x:Static resx:Resources.OverlayPage_8BitDoLite2Controller}"></Label>
</RadioButton>
<RadioButton Name="MachenikeHG510Radio">
<Label Content="{x:Static resx:Resources.OverlayPage_MachenikeHG510Controller}"></Label>
</RadioButton>
<RadioButton Name="ToyControllerRadio" IsEnabled="False">
<Label Content="{x:Static resx:Resources.OverlayPage_ToyController}"></Label>
</RadioButton>
Expand Down
5 changes: 5 additions & 0 deletions HandheldCompanion/Views/Windows/Overlay.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ public void UpdateModel()
newModel = new Model8BitDoLite2();
}
break;
case OverlayModelMode.MachenikeHG510:
{
newModel = new ModelMachenikeHG510();
}
break;
case OverlayModelMode.Toy:
{
newModel = new ModelToyController();
Expand Down
Loading

0 comments on commit f3bac9a

Please sign in to comment.