teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-04-23 15:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

RC1

Browse source 
- Weapon alignments from VR_Bummser
- Restored controller based movement direction as default
- Added toggle for turning mode (smooth vs snap)
-
This commit is contained in:
Simon 2020-08-13 15:43:50 +01:00
parent da06592121
commit 3e756e826e
11 changed files with 81 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.rtcwquest"
android:versionCode="32"
android:versionName="0.25.2" android:installLocation="auto" >
android:versionCode="33"
android:versionName="0.26.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

5
Projects/Android/jni/RTCWVR/RTCWVR_SurfaceView.c
View file

@ -1290,10 +1290,11 @@ void RTCWVR_Init()
srand(time(NULL));
//Create Cvars
vr_snapturn_angle = Cvar_Get( "vr_snapturn_angle", "45", CVAR_ARCHIVE);
vr_turn_mode = Cvar_Get( "vr_turn_mode", "0", CVAR_ARCHIVE); // 0 = snap, 1 = smooth
vr_turn_angle = Cvar_Get( "vr_turn_angle", "45", CVAR_ARCHIVE);
vr_reloadtimeoutms = Cvar_Get( "vr_reloadtimeoutms", "200", CVAR_ARCHIVE);
vr_positional_factor = Cvar_Get( "vr_positional_factor", "12", CVAR_ARCHIVE);
vr_walkdirection = Cvar_Get( "vr_walkdirection", "1", CVAR_ARCHIVE);
vr_walkdirection = Cvar_Get( "vr_walkdirection", "0", CVAR_ARCHIVE);
vr_movement_multiplier = Cvar_Get( "vr_movement_multiplier", "0.7", CVAR_ARCHIVE);
vr_weapon_pitchadjust = Cvar_Get( "vr_weapon_pitchadjust", "-20.0", CVAR_ARCHIVE);
vr_lasersight = Cvar_Get( "vr_lasersight", "0", CVAR_LATCH);

3
Projects/Android/jni/RTCWVR/VrCvars.h
View file

@ -1,4 +1,5 @@
cvar_t *vr_snapturn_angle;
cvar_t *vr_turn_mode;
cvar_t *vr_turn_angle;
cvar_t *vr_reloadtimeoutms;
cvar_t *vr_positional_factor;
cvar_t *vr_walkdirection;

12
Projects/Android/jni/RTCWVR/VrInputDefault.c
View file

@ -572,8 +572,10 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
if (!vr.mountedgun && !vr.scopeengaged) {
if (pDominantTrackedRemoteNew->Joystick.x > 0.7f) {
if (increaseSnap) {
snapTurn -= vr_snapturn_angle->value;
if (vr_snapturn_angle->value > 10.0f) {
float turnAngle = vr_turn_mode->integer ? (vr_turn_angle->value / 9.0f) : vr_turn_angle->value;
snapTurn -= turnAngle;
if (vr_turn_mode->integer == 0) {
increaseSnap = false;
}
@ -590,10 +592,12 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
static int decreaseSnap = true;
if (pDominantTrackedRemoteNew->Joystick.x < -0.7f) {
if (decreaseSnap) {
snapTurn += vr_snapturn_angle->value;
float turnAngle = vr_turn_mode->integer ? (vr_turn_angle->value / 9.0f) : vr_turn_angle->value;
snapTurn += turnAngle;
//If snap turn configured for less than 10 degrees
if (vr_snapturn_angle->value > 10.0f) {
if (vr_turn_mode->integer == 0) {
decreaseSnap = false;
}

4
Projects/Android/jni/RTCWVR/VrInputWeaponAlign.c
View file

@ -216,13 +216,13 @@ void HandleInput_WeaponAlign( ovrInputStateTrackedRemote *pDominantTrackedRemote
}
}
Com_sprintf(vr.test_name, sizeof(vr.test_name), "%s: %.2f", item_names[item_index], *(items[item_index]));
Com_sprintf(vr.test_name, sizeof(vr.test_name), "%s: %.3f", item_names[item_index], *(items[item_index]));
char cvar_name[64];
Com_sprintf(cvar_name, sizeof(cvar_name), "vr_weapon_adjustment_%i", vr.weaponid);
char buffer[256];
Com_sprintf(buffer, sizeof(buffer), "%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f", vr.test_scale, (vr.test_offset[0] / vr.test_scale), (vr.test_offset[1] / vr.test_scale), (vr.test_offset[2] / vr.test_scale),
Com_sprintf(buffer, sizeof(buffer), "%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f", vr.test_scale, (vr.test_offset[0] / vr.test_scale), (vr.test_offset[1] / vr.test_scale), (vr.test_offset[2] / vr.test_scale),
(vr.test_angles[PITCH]), (vr.test_angles[YAW]), (vr.test_angles[ROLL]));
Cvar_Set(cvar_name, buffer );
}

2
Projects/Android/jni/rtcw/src/game/q_shared.h
View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
#define Q3_VERSION "RTCWQuest 0.25.2 (Wolf 1.41)"
#define Q3_VERSION "RTCWQuest 0.26.0 (Wolf 1.41)"
// ver 1.0.0 - release
// ver 1.0.1 - post-release work
// ver 1.1.0 - patch 1 (12/12/01)

29
Projects/Android/z_rtcwquest_vrmenu/ui/controls.menu
View file

@ -188,9 +188,10 @@ itemDef
itemDef {
name vr
group grpControls
type ITEM_TYPE_SLIDER
text "Turn Angle ( <= 10 for smooth turn):"
cvarfloat "vr_snapturn_angle" .0 1 90
text "Turning Mode:"
type ITEM_TYPE_MULTI
cvar "vr_turn_mode"
cvarFloatList {"Snap Turn" 0 "Smooth Turn" 1 }
rect 82 90 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
@ -201,6 +202,24 @@ itemDef
forecolor 1 1 1 1
visible 1
}
itemDef {
name vr
group grpControls
type ITEM_TYPE_SLIDER
text "Turn Angle:"
cvarfloat "vr_turn_angle" .0 1 90
rect 82 105 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10
textscale .23
style WINDOW_STYLE_FILLED
backcolor 1 1 1 .07
forecolor 1 1 1 1
visible 1
}
itemDef {
@ -209,7 +228,7 @@ itemDef
type ITEM_TYPE_YESNO
text "Gaze Movement Direction: "
cvar "vr_walkdirection"
rect 82 105 290 12
rect 82 120 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10
@ -226,7 +245,7 @@ itemDef
type ITEM_TYPE_SLIDER
text "Movement Speed:"
cvarfloat "vr_movement_multiplier" .0 0.05 1.0
rect 82 120 290 12
rect 82 135 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10

29
Projects/Android/z_rtcwquest_vrmenu/ui/ingame_controls.menu
View file

@ -162,12 +162,31 @@ itemDef
itemDef {
name ingame_vr
group grpControls
type ITEM_TYPE_SLIDER
text "Turn Angle ( <= 10 for smooth turn):"
cvarfloat "vr_snapturn_angle" .0 1 90
text "Turning Mode:"
type ITEM_TYPE_MULTI
cvar "vr_turn_mode"
cvarFloatList {"Snap Turn" 0 "Smooth Turn" 1 }
rect 82 90 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10
textscale .23
style WINDOW_STYLE_FILLED
backcolor 1 1 1 .07
forecolor 1 1 1 1
visible 1
}
itemDef {
name ingame_vr
group grpControls
type ITEM_TYPE_SLIDER
text "Turn Angle:"
cvarfloat "vr_turn_angle" .0 1 90
rect 82 105 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10
textscale .23
style WINDOW_STYLE_FILLED
@ -183,7 +202,7 @@ itemDef
type ITEM_TYPE_YESNO
text "Gaze Movement Direction: "
cvar "vr_walkdirection"
rect 82 105 290 12
rect 82 120 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10
@ -200,7 +219,7 @@ itemDef
type ITEM_TYPE_SLIDER
text "Movement Speed:"
cvarfloat "vr_movement_multiplier" .0 0.05 1.0
rect 82 120 290 12
rect 82 135 290 12
textalign ITEM_ALIGN_RIGHT
textalignx 142
textaligny 10

BIN
Projects/Android/z_rtcwquest_vrmenu/z_rtcwquest_vrmenu.pk3
View file

Binary file not shown.

33
assets/weapons_vr.cfg
View file

@ -33,24 +33,21 @@
// put the weapon id at the end of the cvar name, so the knife is vr_weapon_adjustment_1
// Values are: scale,right,up,forward,pitch,yaw,roll
seta vr_weapon_adjustment_2 "0.60,-9.30,10.60,-19.14,-4.80,-4.40,0.00"
seta vr_weapon_adjustment_3 "0.65,-8.24,5.51,-8.14,-4.00,0.40,3.40"
seta vr_weapon_adjustment_11 "0.57,-9.54,10.71,-22.90,1.70,-1.40,0.00"
seta vr_weapon_adjustment_12 "0.75,-7.63,7.41,-11.84,-2.80,0.00,0.00"
seta vr_weapon_adjustment_18 "0.50,-8.32,10.40,-4.28,-4.90,0.80,0.00"
seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
seta vr_weapon_adjustment_6 "0.60,-10.77,17.57,-21.73,0.00,1.60,0.00"
seta vr_weapon_adjustment_7 "1.04,-5.51,6.65,-7.55,0.00,0.00,0.00"
seta vr_weapon_adjustment_2 "0.43,-8.97,13.22,-21.68,-4.80,-4.50,-0.40"
seta vr_weapon_adjustment_3 "0.63,-8.51,8.99,-10.95,-2.50,0.20,2.70"
seta vr_weapon_adjustment_4 "0.43,-8.75,12.50,-2.31,-0.00,-1.80,5.00"
seta vr_weapon_adjustment_5 "0.53,-8.59,9.51,-17.38,0.40,1.50,-0.60"
seta vr_weapon_adjustment_6 "0.57,-10.07,14.09,-21.36,28.00,30.50,-0.60"
seta vr_weapon_adjustment_7 "1.22,-5.65,6.81,-3.40,0.00,0.20,0.70"
seta vr_weapon_adjustment_8 "0.67,-9.31,12.49,-7.42,0.50,0.20,0.70"
seta vr_weapon_adjustment_9 "0.70,-5.01,6.81,13.25,0.00,0.00,0.00"
seta vr_weapon_adjustment_10 "0.75,-8.45,5.91,-11.39,0.00,0.00,0.00"
seta vr_weapon_adjustment_13 "0.55,-9.71,8.15,-2.54,0.70,-2.00,0.00"
seta vr_weapon_adjustment_22 "0.59,-10.44,14.52,-19.46,0.00,1.60,0.00"
seta vr_weapon_adjustment_4 "0.55,-8.72,8.28,-0.99,-1.00,-2.00,0.00"
seta vr_weapon_adjustment_5 "0.60,-8.44,6.16,-14.74,0.00,1.60,0.00"
seta vr_weapon_adjustment_8 "0.70,-9.34,8.60,-6.38,0.00,0.00,0.00"
seta vr_weapon_adjustment_14 "0.50,-11.57,16.65,-20.89,0.00,1.60,0.00"
seta vr_weapon_adjustment_19 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
seta vr_weapon_adjustment_20 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
seta vr_weapon_adjustment_11 "0.44,-9.55,12.79,-23.06,0.30,-1.40,-0.40"
seta vr_weapon_adjustment_20 "0.44,-13.55,12.79,-26.06,0.30,-1.40,-0.40"
seta vr_weapon_adjustment_12 "0.83,-7.61,10.14,-11.47,-2.60,-0.00,0.80"
seta vr_weapon_adjustment_13 "0.50,-9.48,10.08,0.56,-0.40,-1.80,1.10"
seta vr_weapon_adjustment_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40"
seta vr_weapon_adjustment_18 "0.49,-8.06,13.12,-5.63,-6.00,1.40,-3.20"
seta vr_weapon_adjustment_19 "0.50,-9.12,13.72,-20.60,-2.80,-4.60,0.00"
seta vr_weapon_adjustment_22 "0.64,-12.59,12.94,-20.44,11.30,26.60,-3.40"

BIN
assets/z_rtcwquest_vrmenu.pk3
View file

Binary file not shown.