steam-frame/astromaddie--lambda1-vr
1
0 Fork 0
mirror of https://github.com/astromaddie/lambda1-vr.git synced 2026-10-23 10:00:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

some tweaks..

Browse Source
This commit is contained in:
Simon committed 2019-07-12 17:33:47 +01:00
1 parent 26974ceacb
commit d3e9dfff45
5 files changed
+21 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+10 -10
View File
@@ -119,10 +119,10 @@ char **argv;
int argc=0;
extern cvar_t *cl_forwardspeed;
extern convar_t *r_lefthand;
//Define our own cvars
convar_t *cl_snapturn_angle;
convar_t *cl_righthanded;
/*
@@ -1092,12 +1092,13 @@ static void ovrApp_HandleInput( ovrApp * app )
}
}
ovrInputStateTrackedRemote *dominantTrackedRemoteState = cl_righthanded->flags ? &rightTrackedRemoteState_new : &leftTrackedRemoteState_new;
ovrInputStateTrackedRemote *dominantTrackedRemoteStateOld = cl_righthanded->flags ? &rightTrackedRemoteState_old : &leftTrackedRemoteState_old;
ovrTracking *dominantRemoteTracking = cl_righthanded->flags ? &rightRemoteTracking : &leftRemoteTracking;
ovrInputStateTrackedRemote *offHandTrackedRemoteState = !cl_righthanded->flags ? &rightTrackedRemoteState_new : &leftTrackedRemoteState_new;
ovrInputStateTrackedRemote *offHandTrackedRemoteStateOld = !cl_righthanded->flags ? &rightTrackedRemoteState_old : &leftTrackedRemoteState_old;
ovrTracking *offHandRemoteTracking = !cl_righthanded->flags ? &rightRemoteTracking : &leftRemoteTracking;
ovrInputStateTrackedRemote *dominantTrackedRemoteState = r_lefthand->integer ? &rightTrackedRemoteState_new : &leftTrackedRemoteState_new;
ovrInputStateTrackedRemote *dominantTrackedRemoteStateOld = r_lefthand->integer ? &rightTrackedRemoteState_old : &leftTrackedRemoteState_old;
ovrTracking *dominantRemoteTracking = r_lefthand->integer ? &rightRemoteTracking : &leftRemoteTracking;
ovrInputStateTrackedRemote *offHandTrackedRemoteState = !r_lefthand->integer ? &rightTrackedRemoteState_new : &leftTrackedRemoteState_new;
ovrInputStateTrackedRemote *offHandTrackedRemoteStateOld = !r_lefthand->integer ? &rightTrackedRemoteState_old : &leftTrackedRemoteState_old;
ovrTracking *offHandRemoteTracking = !r_lefthand->integer ? &rightRemoteTracking : &leftRemoteTracking;
//Hacky menu control - Does the trick for now though
if (useScreenLayer())
@@ -1200,7 +1201,7 @@ static void ovrApp_HandleInput( ovrApp * app )
handleTrackedControllerButton(&rightTrackedRemoteState_new,
&rightTrackedRemoteState_old, ovrButton_A, K_SPACE);
if (cl_righthanded->flags) {
if (!r_lefthand->integer) {
//Fire
handleTrackedControllerButton(&rightTrackedRemoteState_new,
&rightTrackedRemoteState_old,
@@ -1254,7 +1255,7 @@ static void ovrApp_HandleInput( ovrApp * app )
remote_movementSideways = v[0];
remote_movementForward = v[1];
if (cl_righthanded->flags) {
if (!r_lefthand->integer) {
//Run
handleTrackedControllerButton(&leftTrackedRemoteState_new,
&leftTrackedRemoteState_old,
@@ -1550,7 +1551,6 @@ void initialize_gl4es();
static void initializeVRCvars()
{
cl_snapturn_angle = Cvar_Get( "cl_snapturn_angle", "45", CVAR_ARCHIVE, "Sets the angle for snap-turn, set to < 10.0 to enable smooth turning" );
cl_righthanded = Cvar_Get( "cl_righthanded", "1", CVAR_ARCHIVE, "Sets right-handed mode" );
}
void * AppThreadFunction( void * parm )
Projects/Android/jni/src/Xash3D/xash3d/mainui/Android.mk
+1 -1
View File
@@ -12,7 +12,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
endif
LOCAL_MODULE := menu
LOCAL_CPPFLAGS := -std=gnu++11 -DMAINUI_USE_STB -DMAINUI_USE_CUSTOM_FONT_RENDER -DNO_STL -fno-rtti -fno-exceptions
LOCAL_CPPFLAGS := -std=gnu++11 -DMAINUI_USE_STB -DMAINUI_USE_CUSTOM_FONT_RENDER -DNO_STL -fno-rtti -fno-exceptions -DVR
LOCAL_C_INCLUDES := \
$(SDL_PATH)/include \
Projects/Android/jni/src/Xash3D/xash3d/mainui/menus/Configuration.cpp
+4
View File
@@ -58,18 +58,22 @@ void CMenuOptions::_Init( void )
AddItem( background );
AddItem( banner );
#ifndef VR
AddButton( "Controls", "Change keyboard and mouse settings",
PC_CONTROLS, UI_Controls_Menu, QMF_NOTIFY );
#endif
AddButton( "Audio", "Change sound volume and quality",
PC_AUDIO, UI_Audio_Menu, QMF_NOTIFY );
AddButton( "Video", "Change screen size, video mode and gamma",
PC_VIDEO, UI_Video_Menu, QMF_NOTIFY );
#ifndef VR
AddButton( "Touch", "Change touch settings and buttons",
PC_TOUCH, UI_Touch_Menu, QMF_NOTIFY );
AddButton( "Gamepad", "Change gamepad axis and button settings",
PC_GAMEPAD, UI_GamePad_Menu, QMF_NOTIFY );
AddButton( "Update", "Check for updates",
PC_UPDATE, msgBox.MakeOpenEvent(), QMF_NOTIFY );
#endif
AddButton( "Done", "Go back to the Main menu",
PC_DONE, VoidCb( &CMenuOptions::Hide ), QMF_NOTIFY );
}
Projects/Android/jni/src/hlsdk-xash3d/cl_dll/input_xash3d.cpp
+2 -2
View File
@@ -197,14 +197,14 @@ void FWGSInput::IN_Move( float frametime, usercmd_t *cmd )
viewangles[YAW] -= old_yaw;
viewangles[YAW] += rel_yaw;
#ifndef VR
if( fLadder )
{
#ifndef VR
if( cl_laddermode->value == 1 )
viewangles[YAW] -= ac_sidemove * 5;
#endif
ac_sidemove = 0;
}
#endif
if( gHUD.m_MOTD.m_bShow )
gHUD.m_MOTD.scroll += rel_pitch;
Projects/Android/jni/src/hlsdk-xash3d/cl_dll/view.cpp
+4
View File
@@ -293,6 +293,10 @@ void V_CalcGunAngle( struct ref_params_s *pparams )
viewent->angles[YAW] = pparams->rcontrollerangles[YAW];
viewent->angles[PITCH] = pparams->rcontrollerangles[PITCH];
viewent->angles[ROLL] = pparams->rcontrollerangles[ROLL];
//Special case for gun origin
VectorAdd( pparams->rcontrollerorg, pparams->vieworg, viewent->curstate.origin );
VectorAdd( pparams->rcontrollerorg, pparams->vieworg, viewent->latched.prevorigin );
#else
viewent->angles[YAW] = pparams->viewangles[YAW] + pparams->crosshairangle[YAW];
viewent->angles[PITCH] = -pparams->viewangles[PITCH] + pparams->crosshairangle[PITCH] * 0.25;