piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-01 19:39:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon/ControllerEmu: Break out functionality of EmulatedController

Browse Source 
to eliminate redundant unused members in Wii Remote extension objects.
This commit is contained in:
Jordan Woyak
2025-01-20 23:19:56 -06:00
parent 225039f742
commit ddb82a5e8c
26 changed files with 312 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Android/jni/Input/EmulatedController.cpp
View File

@ -20,6 +20,23 @@
#include "jni/Input/ControlReference.h"
#include "jni/Input/NumericSetting.h"
ControllerEmu::ControlGroupContainer* ControlGroupContainerFromJava(JNIEnv* env, jobject obj)
{
return reinterpret_cast<ControllerEmu::ControlGroupContainer*>(
env->GetLongField(obj, IDCache::GetEmulatedControllerPointer()));
}
static jobject ControlGroupContainerToJava(JNIEnv* env,
ControllerEmu::ControlGroupContainer* container)
{
if (!container)
return nullptr;
return env->NewObject(IDCache::GetControlGroupContainerClass(),
IDCache::GetControlGroupContainerConstructor(),
reinterpret_cast<jlong>(container));
}
ControllerEmu::EmulatedController* EmulatedControllerFromJava(JNIEnv* env, jobject obj)
{
return reinterpret_cast<ControllerEmu::EmulatedController*>(
@ -53,18 +70,18 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro
}
JNIEXPORT jint JNICALL
Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroupCount(
Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroupCount(
JNIEnv* env, jobject obj)
{
return static_cast<jint>(EmulatedControllerFromJava(env, obj)->groups.size());
return static_cast<jint>(ControlGroupContainerFromJava(env, obj)->groups.size());
}
JNIEXPORT jobject JNICALL
Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroup(
Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroup(
JNIEnv* env, jobject obj, jint controller_index)
{
return ControlGroupToJava(env,
EmulatedControllerFromJava(env, obj)->groups[controller_index].get());
return ControlGroupToJava(
env, ControlGroupContainerFromJava(env, obj)->groups[controller_index].get());
}
JNIEXPORT void JNICALL
@ -175,7 +192,7 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro
{
auto* attachments = static_cast<ControllerEmu::Attachments*>(
Wiimote::GetWiimoteGroup(controller_index, WiimoteEmu::WiimoteGroup::Attachments));
return EmulatedControllerToJava(env, attachments->GetAttachmentList()[attachment_index].get());
return ControlGroupContainerToJava(env, attachments->GetAttachmentList()[attachment_index].get());
}
JNIEXPORT jint JNICALL