teambeef/doom3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Doom3Quest.git synced 2024-11-10 06:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to use bHaptics external service

Browse source
This commit is contained in:
Simon 2021-05-03 18:28:04 +01:00
parent 7216d02b43
commit 0872773412
3 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Projects/Android/libs/haptic_service.aar Normal file
View file

Binary file not shown.

BIN
Projects/Android/libs/hapticsservice.aar
View file

Binary file not shown.

97
java/com/drbeef/doom3quest/GLES3JNIActivity.java
View file

@ -20,9 +20,10 @@ import android.support.v4.content.ContextCompat;
import android.util.Log; import android.util.Log;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import com.drbeef.hapticsservice.IHapticsService; import com.drbeef.externalhapticsservice.HapticServiceClient;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -35,7 +36,7 @@ import java.io.OutputStream;
import static android.system.Os.setenv; import static android.system.Os.setenv;
@SuppressLint("SdCardPath") public class GLES3JNIActivity extends Activity implements SurfaceHolder.Callback, ServiceConnection @SuppressLint("SdCardPath") public class GLES3JNIActivity extends Activity implements SurfaceHolder.Callback
{ {
// Load the gles3jni library right away to make sure JNI_OnLoad() gets called as the very first thing. // Load the gles3jni library right away to make sure JNI_OnLoad() gets called as the very first thing.
static static
@ -43,8 +44,7 @@ import static android.system.Os.setenv;
System.loadLibrary( "doom3" ); System.loadLibrary( "doom3" );
} }
private boolean hasHapticService = false; private HapticServiceClient externalHapticsServiceClient = null;
private IHapticsService hapticsService = null;
private int permissionCount = 0; private int permissionCount = 0;
private static final int READ_EXTERNAL_STORAGE_PERMISSION_ID = 1; private static final int READ_EXTERNAL_STORAGE_PERMISSION_ID = 1;
@ -68,66 +68,78 @@ import static android.system.Os.setenv;
public void haptic_event(String event, int position, int flags, int intensity, float angle, float yHeight) { public void haptic_event(String event, int position, int flags, int intensity, float angle, float yHeight) {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticEvent(APPLICATION, event, position, flags, intensity, angle, yHeight); externalHapticsServiceClient.getHapticsService().hapticEvent(APPLICATION, event, position, flags, intensity, angle, yHeight);
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
public void haptic_updateevent(String event, int intensity, float angle) { public void haptic_updateevent(String event, int intensity, float angle) {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticUpdateEvent(APPLICATION, event, intensity, angle); externalHapticsServiceClient.getHapticsService().hapticUpdateEvent(APPLICATION, event, intensity, angle);
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
public void haptic_stopevent(String event) { public void haptic_stopevent(String event) {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticStopEvent(APPLICATION, event); externalHapticsServiceClient.getHapticsService().hapticStopEvent(APPLICATION, event);
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
public void haptic_endframe() { public void haptic_endframe() {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticFrameTick(); externalHapticsServiceClient.getHapticsService().hapticFrameTick();
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
public void haptic_enable() { public void haptic_enable() {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticEnable(); externalHapticsServiceClient.getHapticsService().hapticEnable();
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
public void haptic_disable() { public void haptic_disable() {
if (hasHapticService) { if (externalHapticsServiceClient.hasService()) {
try { try {
hapticsService.hapticDisable(); externalHapticsServiceClient.getHapticsService().hapticDisable();
} catch (RemoteException e) { }
e.printStackTrace(); catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
} }
} }
} }
@ -281,6 +293,13 @@ import static android.system.Os.setenv;
} }
} }
externalHapticsServiceClient = new HapticServiceClient(this, (state, desc) -> {
Log.v(APPLICATION, "ExternalHapticsService is:" + desc);
});
externalHapticsServiceClient.bindService();
mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams, refresh, ss, msaa ); mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams, refresh, ss, msaa );
} }
@ -331,10 +350,6 @@ import static android.system.Os.setenv;
Log.v(APPLICATION, "GLES3JNIActivity::onStart()" ); Log.v(APPLICATION, "GLES3JNIActivity::onStart()" );
super.onStart(); super.onStart();
// Bind to the service - Make this a config file thing
bindService(new Intent("com.drbeef.hapticservice.HapticService_bHaptics").setPackage("com.drbeef.hapticservice"), this,
Context.BIND_AUTO_CREATE);
if ( mNativeHandle != 0 ) if ( mNativeHandle != 0 )
{ {
GLES3JNILib.onStart(mNativeHandle, this); GLES3JNILib.onStart(mNativeHandle, this);
@ -370,8 +385,6 @@ import static android.system.Os.setenv;
GLES3JNILib.onStop(mNativeHandle); GLES3JNILib.onStop(mNativeHandle);
} }
// Unbind from the service
unbindService(this);
super.onStop(); super.onStop();
} }
@ -390,6 +403,8 @@ import static android.system.Os.setenv;
GLES3JNILib.onDestroy(mNativeHandle); GLES3JNILib.onDestroy(mNativeHandle);
} }
externalHapticsServiceClient.stopBinding();
super.onDestroy(); super.onDestroy();
mNativeHandle = 0; mNativeHandle = 0;
} }
@ -423,18 +438,4 @@ import static android.system.Os.setenv;
mSurfaceHolder = null; mSurfaceHolder = null;
} }
} }
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
hapticsService = IHapticsService.Stub.asInterface(service);
hasHapticService = true;
}
@Override
public void onServiceDisconnected(ComponentName name) {
stopService(new Intent("com.drbeef.hapticservice.HapticService_bHaptics").setPackage("com.drbeef.hapticservice"));
hasHapticService = false;
hapticsService = null;
}
} }