Dolphin iOS: Add Simple Skylander Portal #68
Conversation
deReeperJosh
force-pushed
the
skylanderportal
branch
2 times, most recently
from
c9d222f
to
e3e71c9
Compare
|
I do know that there is other games that also uses nfc characters like Disney Infinity. Do you think it could be used for such game or others? If so wouldn’t the name be better to describe it as load figure dump (Skylanders Portal), figuring manager (skylander manager). |
|
@Spidy123222 yeah I have got another PR open (dolphin-emu/dolphin#11546) to emulate the Infinity Base - but the structure for dumps for Infinity is much different and a lot more complex, would want a separate UIAction for that with different names |
|
Since there's a bunch of commits here that have been merged upstream already, would it be OK if I merged upstream on |
|
@OatmealDome yeah of course - I'm happy with that |
deReeperJosh
force-pushed
the
skylanderportal
branch
from
e3e71c9
to
5dd38e7
Compare
|
Let me just take a bit of time to get this to only the one commit of things that are relevant - I might have missed a commit or 2 when cherry-picking |
deReeperJosh
force-pushed
the
skylanderportal
branch
2 times, most recently
from
5b5af9b
to
0eb8c0c
Compare
|
This is where I want it now - not sure about the XCode auto generated changes, but can revert those where needed |
| @@ -1234,6 +1234,11 @@ bool SkylanderPortal::CreateSkylander(const std::string& file_path, u16 sky_id, | |||
| return true; | |||
| } | |||
|
|
|||
| bool SkylanderPortal::RemoveSkylanderiOS(u8 sky_num) | |||
There was a problem hiding this comment.
Is there a reason why RemoveSkylanderiOS and LoadSkylanderiOS exist? Can't you just call RemoveSkylander and LoadSkylander directly? I'm probably missing something here.
There was a problem hiding this comment.
I wish I could explain this, but this was the only way that it actually worked - almost as if the objective c++ had a reference to a different system instance than the C++ lib, calling it directly had no effect on the game being played
| @@ -197,6 +243,10 @@ - (bool)isWiimoteTouchPadAttached { | |||
| return true; | |||
| } | |||
|
|
|||
| - (bool)emulateSkylanderPortal { | |||
There was a problem hiding this comment.
This method doesn't seem to be used anywhere. Is this supposed to be used for conditionally adding the "Skylanders Portal" UIAction above?
There was a problem hiding this comment.
Ah yes - think I had this in to try to conditionally display the menu item, was going to ask if you would be happy to convert the UIMenu items to instead be added with a UIMenuBuilder, I can make that change in this PR if so
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
Source/iOS/App/DolphiniOS/UI/Emulation/EmulationiOSViewController.mm
Outdated
Show resolved
Hide resolved
deReeperJosh
force-pushed
the
skylanderportal
branch
from
7ad7264
to
fad91a3
Compare
deReeperJosh
force-pushed
the
skylanderportal
branch
from
fad91a3
to
5f13ddf
Compare
With the Skylander Portal now in mainline Dolphin, I have seen a few requests come through (like here #60) to bring the functionality to Dolphin iOS, so this PR aims to implement that here. The only relevant commit is the most recent one, the rest have been cherry-picked from the main Dolphin Repo.
As a start, I haven't added the create Skylander Functionality, so users can either just use their existing Dumps or use ones they have created on Dolphin for Desktop.
I have tried to make it as simple as possible, and not clog up the UI - so Users can select to Load, Clear or Clear All. Load will load in to the next available slot (determined in the C++ code), Clear will clear the Skylander from the most recently used Slot, and Clear all will reset the portal.
If it would be better to create a Dialog Window with the full create, load and clear functionality, I can try to implement that further down the line, but for now the UIAlert is limited with what can and can't be done. Screenshots below:
Position in the Left Menu
The Alert Dialog
In Game
