More data

This commit is contained in:
loucass003 committed 2022-04-02 08:39:31 +02:00
1 parent c54298709f
commit 5fbac9d861
26 files changed
+547 -430

No files matched your search

@@ -4,10 +4,10 @@ import com.google.flatbuffers.FlatBufferBuilder;
import com.jme3.math.Quaternion;
import com.jme3.math.Vector3f;
import dev.slimevr.VRServer;
import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue;
import dev.slimevr.vr.trackers.IMUTracker;
import dev.slimevr.vr.trackers.ReferenceAdjustedTracker;
import dev.slimevr.vr.trackers.Tracker;
import dev.slimevr.bridge.ProtobufBridge;
import dev.slimevr.platform.windows.WindowsNamedPipeBridge;
import dev.slimevr.vr.trackers.*;
import dev.slimevr.vr.trackers.TrackerRole;
import io.eiren.util.ann.ThreadSafe;
import io.eiren.util.logging.LogManager;
import org.java_websocket.WebSocket;
@@ -17,12 +17,15 @@ import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer;
import slimevr_protocol.datatypes.Quat;
import slimevr_protocol.datatypes.Vec3f;
import slimevr_protocol.misc.Acknowledgement;
import slimevr_protocol.server.*;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap;
import java.util.function.Supplier;
import java.util.stream.Stream;
public class WebsocketAPI extends WebSocketServer {
@@ -64,19 +67,118 @@ public class WebsocketAPI extends WebSocketServer {
try {
switch (inboundPacket.packetType()) {
case InboundUnion.HandshakeRequest: {
case InboundUnion.ConnectionRequest: {
HandshakeRequest req = (HandshakeRequest) inboundPacket.packet(new HandshakeRequest());
if (req != null) this.onHandshakeRequest(conn, req);
break;
}
case InboundUnion.AssignTrackerRequest: {
AssignTrackerRequest req = (AssignTrackerRequest) inboundPacket.packet(new AssignTrackerRequest());
if (req != null) this.onAssignTrackerRequest(conn, req);
break;
}
case InboundUnion.ResetRequest: {
ResetRequest req = (ResetRequest) inboundPacket.packet(new ResetRequest());
if (req != null) this.onResetRequest(conn, req);
break;
}
case InboundUnion.SettingsRequest: {
SettingsRequest req = (SettingsRequest) inboundPacket.packet(new SettingsRequest());
if (req != null) this.onSettingsRequest(conn, req);
break;
}
case InboundUnion.ChangeSettingsRequest: {
ChangeSettingsRequest req = (ChangeSettingsRequest) inboundPacket.packet(new ChangeSettingsRequest());
if (req != null) this.onChangeSettingsRequest(conn, req);
break;
}
default:
LogManager.log.warning("[WebSocketAPI] Received unknown packet type: " + inboundPacket.packetType());
}
} catch (Exception e) {
LogManager.log.severe("[WebSocketAPI] Failed to parse packet: " + inboundPacket.packetType(), e);
}
if (inboundPacket.acknowledgeMe()) {
FlatBufferBuilder fbb = new FlatBufferBuilder(40);
int acknowledgement = Acknowledgement.createAcknowledgement(fbb, inboundPacket.packetCounter());
int outbound = this.createOutboundPacket(fbb, OutboundUnion.slimevr_protocol_misc_Acknowledgement, acknowledgement);
fbb.finish(outbound);
conn.send(fbb.dataBuffer());
}
}
public void onSettingsRequest(WebSocket conn, SettingsRequest req) {
FlatBufferBuilder fbb = new FlatBufferBuilder(40);
WindowsNamedPipeBridge bridge = this.server.getVRBridge(WindowsNamedPipeBridge.class);
int steamvrTrackerSettings = SteamVRTrackersSetting.createSteamVRTrackersSetting(fbb,
bridge.getShareSetting(TrackerRole.WAIST),
bridge.getShareSetting(TrackerRole.CHEST),
bridge.getShareSetting(TrackerRole.LEFT_FOOT) && bridge.getShareSetting(TrackerRole.RIGHT_FOOT),
bridge.getShareSetting(TrackerRole.LEFT_KNEE) &&bridge.getShareSetting(TrackerRole.RIGHT_KNEE),
bridge.getShareSetting(TrackerRole.LEFT_ELBOW) && bridge.getShareSetting(TrackerRole.RIGHT_ELBOW)
);
int filterSettings = FilteringSettings.createFilteringSettings(
fbb,
TrackerFilters.valueOf(this.server.config.getString("filters.type", "NONE")).id,
(int)(server.config.getFloat("filters.amount", 0.3f) * 100),
server.config.getInt("filters.tickCount", 2)
);
int settings = SettingsResponse.createSettingsResponse(fbb, steamvrTrackerSettings, filterSettings);
int outbound = this.createOutboundPacket(fbb, OutboundUnion.SettingsResponse, settings);
fbb.finish(outbound);
conn.send(fbb.dataBuffer());
}
public void onChangeSettingsRequest(WebSocket conn, ChangeSettingsRequest req) {
if (req.steamVrTrackers() != null) {
WindowsNamedPipeBridge bridge = this.server.getVRBridge(WindowsNamedPipeBridge.class);
bridge.changeShareSettings(TrackerRole.WAIST, req.steamVrTrackers().waist());
bridge.changeShareSettings(TrackerRole.CHEST, req.steamVrTrackers().chest());
bridge.changeShareSettings(TrackerRole.LEFT_FOOT, req.steamVrTrackers().legs());
bridge.changeShareSettings(TrackerRole.RIGHT_FOOT, req.steamVrTrackers().legs());
bridge.changeShareSettings(TrackerRole.LEFT_KNEE, req.steamVrTrackers().knees());
bridge.changeShareSettings(TrackerRole.RIGHT_KNEE, req.steamVrTrackers().knees());
bridge.changeShareSettings(TrackerRole.LEFT_ELBOW, req.steamVrTrackers().elbows());
bridge.changeShareSettings(TrackerRole.RIGHT_ELBOW, req.steamVrTrackers().elbows());
}
if (req.filtering() != null) {
TrackerFilters type = TrackerFilters.fromId(req.filtering().type());
if (type != null) {
this.server.updateTrackersFilters(type, (float)req.filtering().intensity() / 100.0f, req.filtering().ticks());
}
}
}
public void onResetRequest(WebSocket con, ResetRequest req) {
if (req.quick()) {
this.server.resetTrackersYaw();
} else {
this.server.resetTrackers();
}
LogManager.log.severe("[WebSocketAPI] Reset performed");
}
public void onAssignTrackerRequest(WebSocket con, AssignTrackerRequest req) {
Tracker tracker = this.server.getAllTrackers().get(req.id());
if (tracker == null)
return ;
tracker.setBodyPosition(TrackerPosition.getByRole(TrackerRole.getById(req.role())));
if (tracker instanceof IMUTracker) {
IMUTracker imu = (IMUTracker) tracker;
TrackerMountingRotation rot = TrackerMountingRotation.fromAngle(req.mountingRotation());
if (rot != null)
imu.setMountingRotation(rot);
}
this.server.trackerUpdated(tracker);
}
public void onHandshakeRequest(WebSocket con, HandshakeRequest req) {
APIApplication app = new APIApplication();
@@ -111,17 +213,16 @@ public class WebsocketAPI extends WebSocketServer {
DeviceStatus.addPosition(fbb, Vec3f.createVec3f(fbb, pos3f.x, pos3f.y, pos3f.z));
DeviceStatus.addRotation(fbb, Quat.createQuat(fbb, quatRot.getX(), quatRot.getY(), quatRot.getZ(), quatRot.getW()));
DeviceStatus.addComputed(fbb, tracker.isComputed());
DeviceStatus.addEditable(fbb, tracker.userEditable());
if (tracker.getBodyPosition() != null && tracker.getBodyPosition().trackerRole != null) {
DeviceStatus.addRole(fbb, tracker.getBodyPosition().trackerRole.id);
}
if (tracker instanceof IMUTracker) {
IMUTracker imu = (IMUTracker) tracker;
imu.getMountingRotation();
if (imu.getMountingRotation() != null)
DeviceStatus.addMountingRotation(fbb, (short)imu.getMountingRotation().angle);
// put back to 0 - 256 so we can fit it in a byte instead of float
DeviceStatus.addBattery(fbb, (int)((imu.getBatteryLevel() / 100) * 255));
DeviceStatus.addPing(fbb, imu.ping);