teambeef
/
doom3quest
mirror of https://github.com/DrBeef/Doom3Quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish removal of the useHapticsService cvar

This commit is contained in:
Simon 2021-05-15 19:11:22 +01:00
parent 812e38969d
commit 5ca43984e0
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Projects/Android/AndroidManifest.xml
View File

@ -1,8 +1,9 @@
<?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.doom3quest" package="com.drbeef.doom3quest"
android:versionCode="24" android:versionCode="25"
android:versionName="1.2.0" android:installLocation="auto" > android:versionName="1.2.1"
android:installLocation="auto">
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
@ -17,7 +18,11 @@
<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" />
<application android:allowBackup="false" android:icon="@drawable/ic_qquest" android:label="@string/doom3quest"> <application android:allowBackup="false"
android:icon="@drawable/ic_qquest"
android:label="@string/doom3quest"
android:extractNativeLibs="true">
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/> <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/> <meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/>
<!-- The activity is the built-in NativeActivity framework class. --> <!-- The activity is the built-in NativeActivity framework class. -->

3
Projects/Android/build.gradle
View File

@ -63,3 +63,6 @@ buildscript {
google() google()
} }
} }
task prepareKotlinBuildScriptModel {
}

2
Projects/Android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

2
Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h
View File

@ -41,7 +41,7 @@ If you have questions concerning this license or the applicable additional terms
#define GAME_NAME "Doom3Quest" // appears on window titles and errors #define GAME_NAME "Doom3Quest" // appears on window titles and errors
#endif #endif
#define ENGINE_VERSION "Doom3Quest 1.2.0" // printed in console #define ENGINE_VERSION "Doom3Quest 1.2.1" // printed in console
#ifdef ID_REPRODUCIBLE_BUILD #ifdef ID_REPRODUCIBLE_BUILD
// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__ // for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__

4
Projects/Android/jni/d3es-multithread-master/neo/sound/snd_world.cpp
View File

@ -1357,7 +1357,6 @@ void idSoundWorldLocal::ReadFromSaveGame( idFile *savefile ) {
} }
//Only concerned with registering looping sounds with the haptics service //Only concerned with registering looping sounds with the haptics service
if (cvarSystem->GetCVarBool("vr_useHapticsService"))
{ {
bool looping = (def->parms.soundShaderFlags & SSF_LOOPING) != 0; bool looping = (def->parms.soundShaderFlags & SSF_LOOPING) != 0;
if (looping) if (looping)
@ -1769,8 +1768,7 @@ void idSoundWorldLocal::AddChannelContribution( idSoundEmitterLocal *sound, idSo
float inputSamples[MIXBUFFER_SAMPLES*2+16]; float inputSamples[MIXBUFFER_SAMPLES*2+16];
float *alignedInputSamples = (float *) ( ( ( (intptr_t)inputSamples ) + 15 ) & ~15 ); float *alignedInputSamples = (float *) ( ( ( (intptr_t)inputSamples ) + 15 ) & ~15 );
if (cvarSystem->GetCVarBool("vr_useHapticsService") && if (looping)
looping)
{ {
idVec3 direction = (listenerPos / DOOM_TO_METERS) - sound->origin; idVec3 direction = (listenerPos / DOOM_TO_METERS) - sound->origin;