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

Adjustment to controller weapon wheel

Browse source 
- Make proximity of selection bigger
- Copy pakQ3Q to baseoa if it exists
This commit is contained in:
Simon 2022-03-19 16:51:32 +00:00
parent cb387417c1
commit aa9e2899bd
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest" package="com.drbeef.ioq3quest"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="38" android:versionCode="39"
android:versionName="0.26.1"> android:versionName="0.26.2">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" /> <uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>--> <!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->

20
android/app/src/main/cpp/code/cgame/cg_weapons.c
View file

@ -2195,7 +2195,7 @@ void CG_DrawWeaponSelector( void )
vec3_t diff; vec3_t diff;
VectorSubtract(selectorOrigin, iconOrigin, diff); VectorSubtract(selectorOrigin, iconOrigin, diff);
float length = VectorLength(diff); float length = VectorLength(diff);
if (length <= 1.2f && if (length <= 1.5f &&
frac == 1.0f && frac == 1.0f &&
selectable) selectable)
{ {
@ -2255,20 +2255,10 @@ void CG_DrawWeaponSelector( void )
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
VectorCopy(iconOrigin, ent.origin); VectorCopy(iconOrigin, ent.origin);
//Shift the weapon model a bit to be in the sphere //Shift model a bit
if (weaponId == WP_GAUNTLET) VectorMA(ent.origin, 0.3f, wheelForward, ent.origin);
{ VectorMA(ent.origin, -0.2f, wheelRight, ent.origin);
SCALE = 0.065f; VectorMA(ent.origin, 0.1f, wheelUp, ent.origin);
VectorMA(ent.origin, 0.3f, wheelUp, ent.origin);
VectorMA(ent.origin, 0.15f, wheelRight, ent.origin);
VectorMA(ent.origin, -0.15f, wheelForward, ent.origin);
}
else
{
VectorMA(ent.origin, 0.3f, wheelForward, ent.origin);
VectorMA(ent.origin, -0.2f, wheelRight, ent.origin);
VectorMA(ent.origin, 0.5f, wheelUp, ent.origin);
}
vec3_t iconAngles; vec3_t iconAngles;
VectorCopy(wheelAngles, iconAngles); VectorCopy(wheelAngles, iconAngles);

6
android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java
View file

@ -99,6 +99,12 @@ public class MainActivity extends SDLActivity // implements KeyEvent.Callback
copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true); copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true);
copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true); copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true);
//If open arena is installed then copy necessary stuff
if (new File("/sdcard/ioquake3Quest/baseoa").exists()) {
copy_asset("/sdcard/ioquake3Quest/baseoa", "autoexec.cfg", false);
copy_asset("/sdcard/ioquake3Quest/baseoa", "pakQ3Q.pk3", true);
}
//Read these from a file and pass through //Read these from a file and pass through
commandLineParams = new String(); commandLineParams = new String();