FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-23 10:20:08 +01:00
Code Issues 2 Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SDLash3D/xash3d-android-project

Browse Source
This commit is contained in:
mittorn 2016-08-12 13:16:55 +00:00
commit 12e6b7a9ab
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -4,7 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="in.celest.xash3d.hl"
android:versionCode="0"
android:versionCode="1"
android:versionName="0.18"
android:installLocation="auto">

2
jni/src/NanoGL/nanogl

@ -1 +1 @@
Subproject commit fba28cfff8c488b83b052b92a9f58678c90f2afe
Subproject commit 536202427f3391d23f28e6a81443523da0ac1051

10
src/in/celest/xash3d/XashActivity.java
View File

@ -980,12 +980,18 @@ class JoystickHandler_v12 extends JoystickHandler
switch( range.getAxis() )
{
// typical axes
// move
case MotionEvent.AXIS_X: prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE, prevSide, dead); break;
case MotionEvent.AXIS_Y: prevFwd = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD, prevFwd, dead); break;
case MotionEvent.AXIS_Z: prevPtch = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
case MotionEvent.AXIS_RZ: prevYaw = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead); break;
// rotate. Invert, so by default this works as it's should
case MotionEvent.AXIS_Z: prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break;
case MotionEvent.AXIS_RZ: prevYaw = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead); break;
// trigger
case MotionEvent.AXIS_RTRIGGER: prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT, dead); break;
case MotionEvent.AXIS_LTRIGGER: prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT, dead); break;
// hats
case MotionEvent.AXIS_HAT_X: prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX); break;
case MotionEvent.AXIS_HAT_Y: prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY); break;

2
src/org/json

@ -1 +1 @@
Subproject commit 9a81b40334ff2eba531478d013654c5d1b12ad24
Subproject commit 4e8e24d49de6e9fa1afeaa992a6b06272858b160