teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2025-04-25 02:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added External Haptics Intensity config

Browse source 
Affects level of all external haptics
This commit is contained in:
Simon 2021-06-14 22:14:29 +01:00
parent 8bd954828a
commit a3d2eca0d8
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.questzdoom" package="com.drbeef.questzdoom"
android:versionCode="26" android:versionCode="27"
android:versionName="1.2.1" android:installLocation="auto" > android:versionName="1.2.2" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/> <uses-feature android:glEsVersion="0x00030001" android:required="true"/>
@ -13,10 +13,6 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

6
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/c_cvars.cpp
View file

@ -1677,6 +1677,8 @@ FBaseCVar *FindCVarSub (const char *var_name, int namelen)
return var; return var;
} }
EXTERN_CVAR(Float, ext_haptic_level_global_intensity)
float C_GetExternalHapticLevelValue(const char *haptic_name) float C_GetExternalHapticLevelValue(const char *haptic_name)
{ {
char buffer[256]; char buffer[256];
@ -1684,10 +1686,10 @@ float C_GetExternalHapticLevelValue(const char *haptic_name)
FBaseCVar *pCVar = FindCVar(buffer, NULL); FBaseCVar *pCVar = FindCVar(buffer, NULL);
if (pCVar != NULL) if (pCVar != NULL)
{ {
return pCVar->GetGenericRep(CVAR_Float).Float; return pCVar->GetGenericRep(CVAR_Float).Float * ext_haptic_level_global_intensity;
} }
return 1.0; return ext_haptic_level_global_intensity;
} }
FBaseCVar *GetCVar(int playernum, const char *cvarname) FBaseCVar *GetCVar(int playernum, const char *cvarname)

1
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_actionfunctions.cpp
View file

@ -105,6 +105,7 @@ FRandom pr_cajump("CustomJump");
CVAR(Bool, vr_recoil, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Bool, vr_recoil, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
//External Haptics Level CVARs //External Haptics Level CVARs
CVAR(Float, ext_haptic_level_global_intensity, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR(Float, ext_haptic_level_damage_projectile, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Float, ext_haptic_level_damage_projectile, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR(Float, ext_haptic_level_pickup_weapon, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Float, ext_haptic_level_pickup_weapon, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR(Float, ext_haptic_level_pickup, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Float, ext_haptic_level_pickup, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

2
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h
View file

@ -41,7 +41,7 @@ const char *GetVersionString();
/** Lots of different version numbers **/ /** Lots of different version numbers **/
#define VERSIONSTR "DrBeef's QuestZDoom-1.2.1 (LZDoom 3.86)" #define VERSIONSTR "DrBeef's QuestZDoom-1.2.2 (LZDoom 3.86)"
// The version as seen in the Windows resource // The version as seen in the Windows resource
#define RC_FILEVERSION 3,86,0 #define RC_FILEVERSION 3,86,0

1
Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt
View file

@ -2345,6 +2345,7 @@ OptionMenu VROptionsMenu protected
StaticText "Haptics" StaticText "Haptics"
Slider "Item Pickup Haptic Level", "vr_pickup_haptic_level", 0.0, 1.0, 0.1, 2 Slider "Item Pickup Haptic Level", "vr_pickup_haptic_level", 0.0, 1.0, 0.1, 2
Slider "Quake Haptic Level", "vr_quake_haptic_level", 0.0, 1.0, 0.1, 2 Slider "Quake Haptic Level", "vr_quake_haptic_level", 0.0, 1.0, 0.1, 2
Slider "External Haptics Intensity", "ext_haptic_level_global_intensity", 0.0, 2.0, 0.1, 2
StaticText "" StaticText ""
StaticText "Weapon" StaticText "Weapon"

BIN
Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/static.7z Normal file
View file

Binary file not shown.

BIN
assets/res/lzdoom.pk3
View file

Binary file not shown.