Commit Graph
404 Commits
Author SHA1 Message Date
lucas lelievre 3a80ad0632 Change the formating to tabs 2022-04-28 03:44:24 +02:00
lucas lelievre ad3b697517 New formatting rules 2022-04-27 22:40:03 +02:00
lucas lelievre 7ac7f7d424 New formatting rules 2022-04-27 22:29:09 +02:00
lucas lelievre ba58f4df6a Reformat the formatter 2022-04-27 22:25:28 +02:00
lucas lelievreandTheDevMinerTV 297bfddf6c Update src/main/java/dev/slimevr/NetworkProtocol.java
Co-authored-by: TheDevMinerTV <[email protected]>
2022-04-27 22:21:09 +02:00
lucas lelievreandTheDevMinerTV e4d0aca744 Update src/main/java/dev/slimevr/bridge/BridgeThread.java
Co-authored-by: TheDevMinerTV <[email protected]>
2022-04-27 22:21:05 +02:00
lucas lelievreandTheDevMinerTV 8b5ac226c3 Update src/main/java/dev/slimevr/bridge/BridgeThread.java
Co-authored-by: TheDevMinerTV <[email protected]>
2022-04-27 22:21:00 +02:00
lucas lelievreandTheDevMinerTV cfc264fa33 Update src/main/java/dev/slimevr/bridge/BridgeThread.java
Co-authored-by: TheDevMinerTV <[email protected]>
2022-04-27 22:20:49 +02:00
lucas lelievre 9e12958ca6 reformat all 2022-04-27 21:39:54 +02:00
lucas lelievre 9f3f34ce70 Reformat protocol 2022-04-26 02:07:45 +02:00
lucas lelievre 23f9b3b276 Sync with lastest server 2022-04-25 00:21:32 +02:00
lucas lelievre 1e74deede3 Current progress 2022-04-24 19:53:56 +02:00
loucass003 2317ad94f5 Update submodule to solarxr-protocol 2022-04-24 01:20:55 +02:00
Louka de101b3576 Fix hip when not using legs
disables pelvis averaging if user isn't using knee trackers.
2022-04-20 21:26:36 -04:00
lucas lelievre 9fbfc43655 Clean packages 2022-04-16 16:40:30 +02:00
loucass003 e3e37023e8 More rpc stuff 2022-04-15 01:17:16 +02:00
Michael Gschwandtner 0bcaed719b Merge branch 'SlimeVR:main' into main 2022-04-14 16:06:17 +02:00
Michael Gschwandtner c77d73c460 Rename configPath variable 2022-04-14 16:04:37 +02:00
loucass003 9fc5d41e1b protocol rework Sets -> Map 2022-04-14 09:15:01 +02:00
Eiren Rain ac0cb9e9cb Merge pull request #149 from Louka3000/hand-tracking
Hand tracking support + elbows without controllers
2022-04-12 20:22:32 +03:00
lucas lelievre 52fa670293 Datafeed almost done 2022-04-12 09:07:18 +02:00
Louka 0b2491ead5 Properly handle elbows with hand tracking
Instead of moving the controller chains to the slimevr hand, now just make the computed elbows affected by the elbow from the slimevr hand chain.

Also refactored some stuff to replace "upper arm distance" by "elbow offset". Idek if it's useful but it may be so I'm keeping it.
2022-04-11 18:39:30 -04:00
Michael Gschwandtner 1723d19882 Make VRServer config path variable
Add a constructor that accepts a path to the config file
2022-04-12 00:37:46 +02:00
Louka 416f96fe44 Merge branch 'main' into hand-tracking 2022-04-11 17:41:32 -04:00
Eiren Rain 7b700b4a0c Merge pull request #154 from mgschwan/main
Make WebSocketVRBridge compatible with Android
2022-04-11 21:37:50 +03:00
Eiren Rain bde578fb9d Merge pull request #151 from Louka3000/neck-tracking
Neck tracking support owo
2022-04-11 21:05:37 +03:00
Michael Gschwandtner c41dc490ed Make WebSocketVRBridge compatible with Android
Change JSONObject.optFloat (does not exist on Android) to optDouble
2022-04-11 16:00:42 +02:00
Erimel 8f19afee88 Merge branch 'SlimeVR:main' into hand-tracking 2022-04-07 01:18:50 -04:00
Louka 784ec877d8 Make filter dependent on tracker tps
Why was this in the wrong place wth
2022-04-06 20:35:47 -04:00
Eiren Rain 48c509ef54 Merge pull request #152 from mgschwan/main
Add full reset command to WebSocket bridge
2022-04-06 15:43:56 +03:00
Louka ecbeaf10ed Remove unnecessary code
Also makes my code a whole lot clearer damn.
Now I can understand it myself!!! :P
2022-04-05 18:02:30 -04:00
Michael Gschwandtner c8e4918b4e Merge branch 'SlimeVR:main' into main 2022-04-05 22:17:55 +02:00
Michael Gschwandtner 4ab5609dbd Add full reset command to WebSocket bridge 2022-04-05 22:11:40 +02:00
Louka cfe8eb62e7 Neck tracking support owo
This is not a joke.
As I suspected, adding a neck tracker does help with reducing sliding. I tested it in VRChat myself.
Think of it like adding a fourth spine tracker.
Anyway, this can be useful to mocap suits and furries, pls merge ty owo.
2022-04-05 00:11:43 -04:00
Erimel f2ceb84969 Null check on designation I forgor
sowwy, this completely breaks the server whenever a new tracker (never connected before) connects.  

;-;
2022-04-04 23:41:51 -04:00
Louka 039628d7e4 Hand tracking support + elbows without controllers
This extends the HMD skeleton to support arm tracking. We do end up with kinda duplicate bones tho.

If user has controllers: elbows go from controllers with tracker on lower arm and possibility for upper arm tracker.

If user has no controller (or no feeder app) and enables Elbow SteamVR trackers: elbows go from chest.

If user has no controllers and enables Hand SteamVR trackers: SteamVR trackers on the users hand appear using upper arm, forearm and hand trackers. Use chest tracker as well for more precision.

This also adds a lot of body proportions...
2022-04-04 22:21:18 -04:00
Eiren Rain 91fb4bc035 Merge pull request #146 from Louka3000/legs-fix
Fix ambiguous usage of "Legs"
2022-04-04 16:07:59 +03:00
loucass003 7ab9a37989 Started implementing new protocol 2022-04-04 07:37:26 +02:00
TheDevMinerTV cf7054b6da Fix "could not parse packet" warning for PingPongPackets 2022-04-04 00:29:22 +02:00
Louka 758f9e8f2f support old configs + rename in skeleton 2022-04-03 11:44:40 -04:00
Louka fef21906f5 Fix ambiguous usage of "Legs"
- Leg in tracker roles is now knee
- Legs in SteamVR trackers to enable is now Feet
2022-04-03 11:18:44 -04:00
loucass003 aaed8fbd49 Body proportions 2022-04-02 22:33:32 +02:00
loucass003 5fbac9d861 More data 2022-04-02 08:39:31 +02:00
lucas lelievre b7d1637b18 Add more tracker data 2022-04-01 04:57:51 +02:00
lucas lelievre 281810dfbb begin websocket api 2022-03-31 16:00:13 +02:00
Eiren Rain 38b8e65d53 Merge pull request #137 from Louka3000/main
Basic Interpolation and Extrapolation
2022-03-28 16:56:05 +03:00
Louka 74ccaa6cf1 fix size/capacity of circle buffer 2022-03-28 00:07:43 -04:00
Louka 4d2083df27 Use circle buffer to get previous rotations
Should help with performance.
2022-03-27 23:58:23 -04:00
Louka 98068232a6 don't create as many quaternions 2022-03-27 06:33:36 -04:00
Eiren Rain 60711df671 Merge pull request #128 from ButterscotchV/autobone-work
Consolidate PoseFrames functionality and add documentation
2022-03-24 14:05:55 +02:00