teambeef/doom3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Doom3Quest.git synced 2025-04-24 08:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Further Fixes

Browse source
This commit is contained in:
Simon 2021-03-02 23:49:19 +00:00
parent c934f1b61a
commit e9e963ea9e
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Projects/Android/jni/Doom3Quest/VrInputDefault.c
View file

@ -285,11 +285,11 @@ void HandleInput_Default( int controlscheme, int switchsticks, ovrInputStateGame
if (velocityTriggeredAttack)
{
if (controlscheme == 0) {
Doom3Quest_HapticEvent("punchR", 2, 100, 0,
Doom3Quest_HapticEvent("punchR", 0, 100, 0,
0);
}
else{
Doom3Quest_HapticEvent("punchL", 1, 100, 0,
Doom3Quest_HapticEvent("punchL", 0, 100, 0,
0);
}
}
@ -325,11 +325,11 @@ void HandleInput_Default( int controlscheme, int switchsticks, ovrInputStateGame
if (velocityTriggeredAttack)
{
if (controlscheme == 1) {
Doom3Quest_HapticEvent("punchR", 2, 100, 0,
Doom3Quest_HapticEvent("punchR", 0, 100, 0,
0);
}
else{
Doom3Quest_HapticEvent("punchL", 1, 100, 0,
Doom3Quest_HapticEvent("punchL", 0, 100, 0,
0);
}
}

23
java/com/drbeef/doom3quest/bhaptics/bHaptics.java
View file

@ -73,6 +73,8 @@ public class bHaptics {
{
if (initialised)
{
//Already initialised, but might need to rescan
scanIfNeeded();
return;
}
@ -85,7 +87,8 @@ public class bHaptics {
/*
DAMAGE
*/
registerFromAsset(context, "bHaptics/Damage/Body_Heartbeat.tact", "heartbeat", "heartbeat");
registerFromAsset(context, "bHaptics/Damage/Body_Heartbeat.tact", HapticType.Vest, "heartbeat", "damage", 1.0f, 1.2f);
registerFromAsset(context, "bHaptics/Damage/Body_DMG_Melee1.tact", "melee_left", "damage");
registerFromAsset(context, "bHaptics/Damage/Body_DMG_Melee2.tact", "melee_right", "damage");
registerFromAsset(context, "bHaptics/Damage/Body_DMG_Fireball.tact", "fireball", "damage");
@ -117,7 +120,7 @@ public class bHaptics {
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Door_Open.tact", "dooropen", "door");
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Door_Close.tact", "doorclose", "door");
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Scan.tact", HapticType.Vest, "scan", "environment", 1.0f, 1.2f);
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Scan.tact", HapticType.Vest, "scan", "environment", 1.0f, 1.1f);
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Rumble.tact", "rumble", "rumble");
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Chamber_Up.tact", "liftup", "environment");
registerFromAsset(context, "bHaptics/Interaction/Vest/Body_Chamber_Down.tact", "liftdown", "environment");
@ -420,8 +423,20 @@ public class bHaptics {
if (hasPairedDevice) {
manager.scan();
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
manager.pingAll();
}
catch (Throwable e) {
}
}
});
t.start();
}
}
}