Skip to content

Commit

Permalink
Ssfimpactor (#10)
Browse files Browse the repository at this point in the history
* Added: Bass_fx.dll for pitch, tempo support
Added: Nuget package for ManagedBass.Fx
Changes:
- Flipper Intensity set @ 25%
- Shaker logic responds to value changes for different effects as set by
- Shaker now `ramps up` slightly when started
- Extra confusing log line removed

* Changes:
Update loop bug fixes
Reverted to old calculations for shaker changes
(Update loop bug fixes address cutoff)
Explicit kills of shaker tones to prevent `stacking`

* Changes:
Refactored to use internal channel assignment
Switched signals to mono*  *Rusty Special unchanged :)
Swapped shaker ramp and pulse - wrong streams were assigned
Other small fixes

* added packages.config for Bass.Fx

* Modified Shaker Pulse tone. Changed Solenoid TargetChannels

* Add speaker and output device configurability

* Fixes for using single channel tones.
Removed more logging; combined fixes from unpublished branch.
Smoothed out shaker tone and operation
NB: These changes are in support of end-user configuration. All exciters are not being used - awaiting mixer implementation.

* Refactor without using BassFlags in class definition

* Changes: Adds Mixer addon toward support for advanced channelmapping
Assigns and reuses a single sample instance
"Left Flipper Bypass Feature" (bug) has been addressed

* Adding unsaved changes from VS :/

* Adds support for user speaker configuration
Adds revised Shaker Pulse tone
Adds support for user-defined levels for contactors and shaker

* Type conversion fix for shaker intensity

* Adds summaries, changes fractional user options to 0-100 ranges, removes unneeded debug logging messages. Needed ones remain still :)

* Adds discrete output controls for bass shakers and exciters. Simplfies LowImpact mode.

* Adds DOF controlled gear motor

* Adds Level Control for SSFGear

* Fixed a couple of summary typos

* Embed OG (gear) sound resource

* Enable support for low impact option
Apply volume adjustments to all impact streams

* Embed bass.dll

* Bass initialization should always occur in SSFImpactController.Init()

This fixes issue with SSFImpactor not working when loading
and running a new table.

* Set default configurations values to match documentation
Use configured values rather than hard coded channels

* * Fix logging of bad Enum->String speaker names
* Log more information about device selection
  and speaker assignment. Driving issue was
  if Windows default audio device gets changed
  to a stereo output device then sound streams
  can not be assigned to surround sound channels.
  This change makes the problem more obvious in
  the DOF log file.

* Restart solenoid sound effect if already playing.
Previously effects that happened too rapidly would
be skipped because the stream was already playing.

* Add .vpx files to OpenTableFileDialog filter

* Set current motor speed to 0 to ensure TurnOff() turns motor stream off

Co-authored-by: Kai Cherry <kaicherry@Mac-Pro.local>
Co-authored-by: Rob Ross <djrobx@hotmail.com>
Co-authored-by: kaicherry <kaicherry@mac.com>
  • Loading branch information
4 people committed Apr 17, 2021
1 parent 197ce1f commit 9f5e7df
Show file tree
Hide file tree
Showing 13 changed files with 534 additions and 114 deletions.
Binary file added DirectOutput/Cab/Out/SSF/7hzOD
Binary file not shown.
Binary file added DirectOutput/Cab/Out/SSF/OG
Binary file not shown.
Binary file modified DirectOutput/Cab/Out/SSF/PE
Binary file not shown.
Binary file modified DirectOutput/Cab/Out/SSF/S1W
Binary file not shown.
Binary file modified DirectOutput/Cab/Out/SSF/SSF
Binary file not shown.
Binary file added DirectOutput/Cab/Out/SSF/SSF1C
Binary file not shown.
630 changes: 519 additions & 111 deletions DirectOutput/Cab/Out/SSF/SSFImpactController.cs

Large diffs are not rendered by default.

Binary file added DirectOutput/Costura32/Bass.dll
Binary file not shown.
Binary file added DirectOutput/Costura32/bass_fx.dll
Binary file not shown.
Binary file added DirectOutput/Costura32/bassmix.dll
Binary file not shown.
14 changes: 12 additions & 2 deletions DirectOutput/DirectOutput.csproj
Expand Up @@ -110,6 +110,12 @@
<Reference Include="ManagedBass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ManagedBass.2.0.4\lib\net45\ManagedBass.dll</HintPath>
</Reference>
<Reference Include="ManagedBass.Fx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ManagedBass.Fx.1.0.2\lib\portable-net45+MonoAndroid+uap\ManagedBass.Fx.dll</HintPath>
</Reference>
<Reference Include="ManagedBass.Mix, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ManagedBass.Mix.1.0.1\lib\portable-net45+MonoAndroid+uap\ManagedBass.Mix.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -406,6 +412,9 @@
<Compile Include="Table\TableElementValueChangedEventArgs.cs" />
<Compile Include="Cab\Toys\ToyBase.cs" />
<Compile Include="Cab\Toys\ToyList.cs" />
<EmbeddedResource Include="Costura32\bassmix.dll" />
<EmbeddedResource Include="Costura32\bass_fx.dll" />
<EmbeddedResource Include="Costura32\bass.dll" />
<Content Include="DirectOutputShapes.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
Expand All @@ -427,10 +436,11 @@
</ItemGroup>
<ItemGroup>
<None Include="Builds\DirectOutput_rambo3_2017-02-09.zip" />
<EmbeddedResource Include="Cab\Out\SSF\SSF" />
<EmbeddedResource Include="Cab\Out\SSF\SSFLI" />
<EmbeddedResource Include="Cab\Out\SSF\PE" />
<EmbeddedResource Include="Cab\Out\SSF\S1W" />
<EmbeddedResource Include="Cab\Out\SSF\SSF1C" />
<EmbeddedResource Include="Cab\Out\SSF\7hzOD" />
<EmbeddedResource Include="Cab\Out\SSF\OG" />
<None Include="ClassDiagram1.cd" />
<None Include="Config\ledcontrol.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
2 changes: 2 additions & 0 deletions DirectOutput/packages.config
Expand Up @@ -4,6 +4,8 @@
<package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
<package id="Fody" version="3.1.7" targetFramework="net452" developmentDependency="true" />
<package id="ManagedBass" version="2.0.4" targetFramework="net452" />
<package id="ManagedBass.Fx" version="1.0.2" targetFramework="net452" />
<package id="ManagedBass.Mix" version="1.0.1" targetFramework="net452" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
Expand Down
2 changes: 1 addition & 1 deletion DirectOutputConfigTester/OpenConfigDialog.Designer.cs

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

0 comments on commit 9f5e7df

Please sign in to comment.