Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiimoteEmu: Allow shake frequency and intensity to be configured. #7952

Merged
merged 1 commit into from Apr 13, 2019

Conversation

4 participants
@jordan-woyak
Copy link
Member

commented Apr 1, 2019

Screenshot: https://i.imgur.com/ASLrUrL.png

Frequency setting controls the approximate shakes per second.
Intensity setting controls the total travel in centimeters.

Partially pressing inputs will reduce intensity.

A fancy graph shows the effects on the emulated wiimote's position.

Donkey Kong Country Returns expects wiimote and nunchuk to be shaken in opposing directions which can now be achieved with a negative intensity value on either Wiimote or Nunchuk.
Increasing the frequency to about 12 kinda seems to force it to work as well which is why it used to work.
Fixes: https://bugs.dolphin-emu.org/issues/11535

Shake inputs now affect IR data.

Defaults:
Intensity: 10 cm (-10 for Nunchuk)
Frequency: 6 hz

This works with the problem games I am aware of:
Batman: TBATB
Jett Rocket
Donkey Kong Country Returns

@jordan-woyak jordan-woyak force-pushed the jordan-woyak:emu-shake-params branch from 9f8c6ed to c3e857e Apr 1, 2019

@Miksel12

This comment has been minimized.

Copy link

commented Apr 1, 2019

Works great in DKCR.
Only problem I have is that it looks a bit weird in SMG with the IR now affected by shake, could this be made toggleable?

@BhaaLseN
Copy link
Member

left a comment

Love the net negative line-diff! Code seems fine (apart from that one mention), untested.

Show resolved Hide resolved Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp Outdated
@jordan-woyak

This comment has been minimized.

Copy link
Member Author

commented Apr 1, 2019

Works great in DKCR.
Only problem I have is that it looks a bit weird in SMG with the IR now affected by shake, could this be made toggleable?

@Miksel12 Shaking would affect the cursor in real life. :P You can configure just the Y axis (forward/backward) to induce minimal cursor movement. SMG still detects shakes on just Y. You can also reduce the intensity down pretty low for many games. I'd rather not clutter the UI with another option if it's not really needed.

@Miksel12

This comment has been minimized.

Copy link

commented Apr 1, 2019

@Miksel12 Shaking would affect the cursor in real life. :P You can configure just the Y axis (forward/backward) to induce minimal cursor movement. SMG still detects shakes on just Y. You can also reduce the intensity down pretty low for many games. I'd rather not clutter the UI with another option if it's not really needed.

That is understandable, the auto hide function also alleviates the problems for the most part so it's not a big deal.
Edit: Using only nunchuck shake is also an easy solution.

@jordan-woyak jordan-woyak force-pushed the jordan-woyak:emu-shake-params branch 3 times, most recently from cb96ed4 to c5f0081 Apr 1, 2019

@jordan-woyak jordan-woyak force-pushed the jordan-woyak:emu-shake-params branch from c5f0081 to c89ddf8 Apr 12, 2019

@JMC47

This comment has been minimized.

Copy link
Contributor

commented Apr 12, 2019

Retested and seems good. People will need to get used to certain motions being more logical though, like shake affecting IR position.

@JMC47 JMC47 merged commit a891115 into dolphin-emu:master Apr 13, 2019

10 checks passed

default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details

@jordan-woyak jordan-woyak deleted the jordan-woyak:emu-shake-params branch Apr 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.