Emulator Issues #5041
closedjpeterson57-dolphin clone merge (Emulated Motion Plus)
0%
Description
I'm now satisfied with my changes and they are ready to be merged with the main clone.
The main changes are the additions of a raw input mouse device for multiplayer mouse support, and m+ support. I've also fixed a few other things I've found annoying or in need of attention.
I've created a merger branch here http://code.google.com/r/jpeterson57-dolphin/source/list?name=master-merge . Please cast your votes on what should be kept and what should be conceded from the clone before a merge.
Thanks!
A unified patch file is attached (command git diff cc6f90c7d5d56055b2d70c41cd9dd76c8b149955^..HEAD > merger.patch) if you want to browse all the changes in one file.
Updated by skidau about 13 years ago
I am not keen on the game ini changes. The rest of the changes are fine.
Updated by lpfaint99 about 13 years ago
I disagree with the changes in IniFile.cpp,
if the ini setting should always be written to the file we shouldn't use the defaultValue parameter for those particular settings
Updated by NeoBrainX about 13 years ago
- 3859deb2499f : Don't like the debug switch; should prolly be moved to the View menu and/or disabled for Release builds.
- I also don't really like the new per-game options but well.. they kinda make sense so they can be kept probably :/
- Will the gfx backend setting work on Linux if Direct3D is specified as the game specific option or will that cause a segfault?
Updated by NeoBrainX about 13 years ago
Also, why does Red Steel 2 need OpenGL? You should add a note in the game ini about that if it's necessary for anything.
Updated by Sonicadvance1 about 13 years ago
I think all your crazy patches need to be split up in to separate patch files since a lot of the changes affect many different things.
Updated by NeoBrainX about 13 years ago
Seconding what Sonicadvance1 said... You've changed all kinds of unrelated things, what about first integrating m+ and then talk about the other stuff?
Also, your committing style is a bit worrying.. d7d99b4a7111 for example changes all kinds of unrelated stuff, if anyone were to find a regression in there it'd be awkward to find out what's wrong if one's not familiar with the code.
btw, what's that "FirstUse" stuff in the wiimote config used for? And wouldn't it make more sense to apply stuff like IR settings to all wiimotes at once and to each separately?
Fwiw, I also don't like adding workarounds to game inis, but we don't really have a strict policy for that. Others likely disagree.
Updated by NeoBrainX almost 13 years ago
I already stated my opinion on this on IRC, but for reference I'll mention it again here (idk to what extend other devs agree or disagree) :
-
There's too much stuff in your branch. Emulated M+ support is the main thing, but there's also UI changes, Common and Core changes (IniFile, JitCache??), a scissoring-fixed revert as well as a revert of the revert, some wx stuff. On top of that you're still committing a benchmark mode and other things. Doesn't really look like you were even trying.
-
Reviewing each commit in your merging branch is unacceptable, no one is going to do that and no one is going to pull unreviewed code.
-
Reviewing your patch is a pain as well. No one is going to review a 10k patch. Same here, no one is going to pull unreviewed code.
Updated by tommyhl2.SS almost 13 years ago
For what it's worth, I agree. The motion plus functionality is what's important. Other preference changes is only one person's opinion at this point. Trying to get the best possible motion plus feature alone is what should be the focus.
Updated by tommyhl2.SS almost 13 years ago
JPeterson: From the looks of things, nothing is ever going to get done here until you separate the emulated motion plus code form the rest of what you've done there. If you do not wish to do that, that's fine, but I wouldn't expect anything to ever be added to master otherwise.
Updated by skidau almost 13 years ago
Please separate the changes marked with * out into their own branch:
Improved Wiimote emulation.
Emulated Wiimote cleanup.
Re-add wiimote packets sniffer.
RawInput mouse backend.
*General cleanup and additions.
*Non-modal input dialogs.
*Resizable and by default larger cheat options dialog. Gekko codes moved to first tab.
*Graphics hotkeys cleanup.
Support for IR calibration from isoini database.
*Additional isoini save options
*Add option to load savestate by date saved, and overwrite oldest savestate.
*Savestate cleanup.
*Benchmarking from .dtm.
*Demo loading cleanup
*Hotkey cleanup.
*Resources cleanup.
*Build cleanup.
We can merge the ones marked with * at a later stage.
Updated by wespipes69 almost 13 years ago
"Additional isoini save options (Input settings, graphics backend, AA-setting, AF-setting. The goal is to not have to change options between isos.)"
Saving input settings is amazing, let alone the gfx backend! Can't wait for that in main! Thanks for creating that!!
Updated by skidau almost 13 years ago
I haven't started any sort of code review on this branch so no reservations so far.
Updated by BhaaL almost 13 years ago
JP: The point of splitting is to make it easier reviewable, so its not better to wait, because thats what we did for the past month since you opened this issue.
The faster you split them up the faster people can (and will) review it - and the faster it will also make its way into master.
Updated by zardo1 almost 13 years ago
Since I wanted to use the Motion Plus emulation with the newest revisions of Dolphin, I merged jpetersons branch with Dolphin master and reverted all unrelated changes. A patch file is attached and I hope it helps the developers in reviewing the changes.
There are not any direct code changes by myself. All credits go to jpeterson.
The patch includes the following changes (as long as I did not overlook anything):
Improved Wiimote emulation.
Emulated Wiimote cleanup.
Re-add wiimote packets sniffer.
Non-modal input dialogs.
Updated by NeoBrainX almost 13 years ago
Still has too much unnecessary stuff in it.
Just looking over the first changes: Randomly commenting out code, adding unused parameters.
You probably didn't even look over the patch yourself, why should we? :/
Updated by skidau almost 13 years ago
Have created a branch called "MotionPlus" with the patch included. Took out the ChunkFile change as I didn't see the benefit of that one.
Updated by zardo1 almost 13 years ago
The change in ChunkFile.h is related to a change in CWII_IPC_HLE_WiiMote::DoState(PointerWrap &p) which would also have to be changed or reverted in this case. But I can't tell if this would break anything. Otherwise you will get error messages when using save states.