Commit 0fdd20c3 authored by Albert Vaca Cintora's avatar Albert Vaca Cintora

Merge branch 'pointer-delta'

parents 4ed2d4f4 01cb7381
......@@ -56,16 +56,12 @@ public class PresenterActivity extends AppCompatActivity implements SensorEventL
private PresenterPlugin plugin;
private SensorManager sensorManager;
private float xPos, yPos;
static final float SENSITIVITY = 0.05f; //TODO: Make configurable?
static final float SENSITIVITY = 0.03f; //TODO: Make configurable?
public void gyroscopeEvent(SensorEvent event) {
xPos += -event.values[2] * SENSITIVITY;
yPos += -event.values[0] * SENSITIVITY;
xPos = clamp(xPos, -1.f, 1.f);
yPos = clamp(yPos, -1.f, 1.f);
float xPos = -event.values[2] * SENSITIVITY;
float yPos = -event.values[0] * SENSITIVITY;
plugin.sendPointer(xPos, yPos);
}
......@@ -89,13 +85,12 @@ public class PresenterActivity extends AppCompatActivity implements SensorEventL
findViewById(R.id.pointer_button).setVisibility(View.VISIBLE);
findViewById(R.id.pointer_button).setOnTouchListener((v, event) -> {
if(event.getAction() == MotionEvent.ACTION_DOWN){
yPos = 0;
xPos = 0;
sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE), SensorManager.SENSOR_DELAY_GAME);
v.performClick(); // The linter complains if this is not called
}
else if (event.getAction() == MotionEvent.ACTION_UP) {
sensorManager.unregisterListener(this);
plugin.stopPointer();
}
return true;
});
......
......@@ -24,6 +24,7 @@ package org.kde.kdeconnect.Plugins.PresenterPlugin;
import android.app.Activity;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Network;
import android.os.Handler;
import android.os.Message;
import android.view.KeyEvent;
......@@ -116,11 +117,23 @@ public class PresenterPlugin extends Plugin {
device.sendPacket(np);
}
public void sendPointer(float percentX, float percentY) {
NetworkPacket np = new NetworkPacket(PACKET_TYPE_PRESENTER);
np.set("px", percentX);
np.set("py", percentY);
public void sendPointer(float xDelta, float yDelta) {
NetworkPacket np = device.getAndRemoveUnsentPacket(NetworkPacket.PACKET_REPLACEID_PRESENTERPOINTER);
if (np == null) {
np = new NetworkPacket(PACKET_TYPE_PRESENTER);
} else {
xDelta += np.getInt("dx");
yDelta += np.getInt("dy");
}
np.set("dx", xDelta);
np.set("dy", yDelta);
device.sendPacket(np, NetworkPacket.PACKET_REPLACEID_PRESENTERPOINTER);
}
public void stopPointer() {
device.getAndRemoveUnsentPacket(NetworkPacket.PACKET_REPLACEID_PRESENTERPOINTER);
NetworkPacket np = new NetworkPacket(PACKET_TYPE_PRESENTER);
np.set("stop", true);
device.sendPacket(np);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment