archive
/
Brokenithm-Android
mirror of https://github.com/tindy2013/Brokenithm-Android
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add air input source 

Add Rotation Vector Sensor and Accelerometer as air input source.
Add more error handling.
pull/1/head
Tindy X 2021-03-15 21:07:29 +08:00
parent 95e177f0e5
commit 84b95e9610
No known key found for this signature in database
GPG Key ID: C6AD413169968D58
4 changed files with 184 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/github/brokenithm/BrokenithmApplication.kt
View File

@ -23,6 +23,16 @@ class BrokenithmApplication : Application() {
config.edit().putBoolean("enable_air", value).apply()
}
var airSource: Int
get() {
val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
return config.getInt("air_source", 3)
}
set(value) {
val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
config.edit().putInt("air_source", value).apply()
}
var simpleAir: Boolean
get() {
val config = getSharedPreferences(settings_preference, MODE_PRIVATE)

150
app/src/main/java/com/github/brokenithm/activity/MainActivity.kt
View File

@ -5,6 +5,10 @@ import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.Paint
import android.graphics.drawable.BitmapDrawable
import android.hardware.Sensor
import android.hardware.SensorEvent
import android.hardware.SensorEventListener
import android.hardware.SensorManager
import android.os.*
import android.util.DisplayMetrics
import android.view.*
@ -19,6 +23,7 @@ import java.net.*
import java.nio.ByteBuffer
import java.util.*
import kotlin.concurrent.thread
import kotlin.math.abs
class MainActivity : AppCompatActivity() {
private lateinit var senderTask: AsyncTaskUtil.AsyncTask<InetSocketAddress?, Unit, Unit>
@ -64,6 +69,7 @@ class MainActivity : AppCompatActivity() {
// view
private var mEnableAir = true
private var mAirSource = 3
private var mSimpleAir = false
private var mDebugInfo = false
private var mShowDelay = false
@ -72,6 +78,52 @@ class MainActivity : AppCompatActivity() {
private var windowWidth = 0
private var windowHeight = 0
// sensor
private var mSensorManager: SensorManager? = null
private var mSensorCallback: ((Float) -> Unit)? = null
private val listener = object : SensorEventListener {
val threshold = 2f
var current = 0
var lastAcceleration = 0f
override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {
return
}
override fun onSensorChanged(event: SensorEvent?) {
event ?: return
when (event.sensor.type) {
Sensor.TYPE_LINEAR_ACCELERATION -> {
if (mAirSource != 2)
return
if (lastAcceleration != 0f) {
val accelX = (lastAcceleration - event.values[0])
if (accelX >= threshold && current >= 0)
current --
else if (accelX <= -threshold && current <= 0)
current ++
if (current > 0)
mCurrentAirHeight = 0
else if (current < 0)
mCurrentAirHeight = 6
}
lastAcceleration = event.values[0]
}
Sensor.TYPE_ROTATION_VECTOR, Sensor.TYPE_GAME_ROTATION_VECTOR -> {
if (mAirSource != 1)
return
val rotationVector = FloatArray(9)
SensorManager.getRotationMatrixFromVector(rotationVector, event.values)
val orientation = FloatArray(3)
SensorManager.getOrientation(rotationVector, orientation)
mSensorCallback?.invoke(orientation[2])
return
}
}
}
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
@ -200,6 +252,7 @@ class MainActivity : AppCompatActivity() {
mVibrationQueue.clear()
}
mLastButtons = touchedButtons
if (mAirSource == 3)
mCurrentAirHeight = thisAirHeight
//mInputQueue.add(InputEvent(touchedButtons, mCurrentAirHeight))
if (mDebugInfo)
@ -257,6 +310,43 @@ class MainActivity : AppCompatActivity() {
app.enableAir = isChecked
}
isChecked = app.enableAir
checkSimpleAir.isEnabled = isChecked
}
mAirSource = app.airSource
findViewById<TextView>(R.id.text_switch_air).apply {
setOnClickListener {
mAirSource = when (mAirSource) {
0 -> {
text = getString(R.string.gyro_air)
mEnableAir = true
checkSimpleAir.isEnabled = true
1
}
1 -> {
text = getString(R.string.accel_air)
checkSimpleAir.isEnabled = false
2
}
2 -> {
text = getString(R.string.touch_air)
checkSimpleAir.isEnabled = true
3
}
else -> {
text = getString(R.string.disable_air)
checkSimpleAir.isEnabled = false
mEnableAir = false
0
}
}
app.airSource = mAirSource
}
text = getString(when (mAirSource) {
0 -> { checkSimpleAir.isEnabled = false; R.string.disable_air }
1 -> { checkSimpleAir.isEnabled = true; R.string.gyro_air }
2 -> { checkSimpleAir.isEnabled = false; R.string.accel_air }
else -> { checkSimpleAir.isEnabled = true; R.string.touch_air }
})
}
checkSimpleAir.apply {
setOnCheckedChangeListener { _, isChecked ->
@ -315,6 +405,42 @@ class MainActivity : AppCompatActivity() {
//mButtons.add(findViewById(id))
vibratorTask.execute(lifecycleScope)
mSensorCallback = {
val lowest = 0.8f
val highest = 1.35f
val steps = (highest - lowest) / numOfAirBlock
val current = abs(it)
mCurrentAirHeight = if (mSimpleAir) {
when (current) {
in 0f..lowest -> 6
else -> 0
}
} else {
when (current) {
in 0f..lowest -> 6
in lowest..highest -> {
((highest - current) / steps).toInt()
}
else -> 0
}
}
}
}
override fun onResume() {
super.onResume()
if (mSensorManager == null)
mSensorManager = getSystemService(Context.SENSOR_SERVICE) as SensorManager
val gyro = mSensorManager?.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR)
mSensorManager?.registerListener(listener, gyro, 10000)
val accel = mSensorManager?.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION)
mSensorManager?.registerListener(listener, accel, 10000)
}
override fun onPause() {
super.onPause()
mSensorManager?.unregisterListener(listener)
}
override fun onWindowFocusChanged(hasFocus: Boolean) {
@ -433,8 +559,15 @@ class MainActivity : AppCompatActivity() {
doInBackground = {
val address = it[0] ?: return@make
if (mTCPMode) {
mTCPSocket = Socket()
try {
mTCPSocket = Socket().apply {
tcpNoDelay = true
}
mTCPSocket.connect(address)
} catch (e: Exception) {
e.printStackTrace()
return@make
}
while (!mExitFlag) {
if (mShowDelay)
sendTCPPing()
@ -450,8 +583,21 @@ class MainActivity : AppCompatActivity() {
Thread.sleep(1)
}
} else {
val socket = DatagramSocket()
val socket = try {
DatagramSocket().apply {
reuseAddress = true
soTimeout = 1000
}
} catch (e: BindException) {
e.printStackTrace()
return@make
}
try {
socket.connect(address)
} catch (e: Exception) {
e.printStackTrace()
return@make
}
while (!mExitFlag) {
if (mShowDelay)
sendPing(address)

19
app/src/main/res/layout/activity_main.xml
View File

@ -118,9 +118,26 @@
android:layout_marginTop="8dp"
android:text="Enable Air"
android:textColor="@color/white"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/button_card"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/text_switch_air"
android:layout_width="90dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:background="#444444"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:padding="8dp"
android:text="Disable Air"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/button_card"
app:layout_constraintStart_toEndOf="@+id/button_card"
app:layout_constraintTop_toTopOf="@+id/button_card" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="195dp"
android:layout_height="wrap_content"
@ -228,7 +245,7 @@
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:padding="8dp"
android:text="UDP"
android:text="@string/udp"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"

5
app/src/main/res/values/strings.xml
View File

@ -21,4 +21,9 @@
<string name="tcp">TCP</string>
<string name="udp">UDP</string>
<string name="disable_air">Disable Air</string>
<string name="gyro_air">Gyro Air</string>
<string name="accel_air">Accel Air</string>
<string name="touch_air">Touch Air</string>
</resources>