vel
/
VEL-Connect
mirror of https://github.com/velaboratory/VEL-Connect
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix velnet dependency version, don't require room data

pull/1/head
Anton Franzluebbers 2024-03-06 19:11:59 -05:00
parent 5d2e379205
commit 4c359345be
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unity_package/Runtime/VELConnectManager.cs
View File

@ -171,6 +171,7 @@ namespace VELConnect
private void Awake() private void Awake()
{ {
velConnectUrl = velConnectUrl.TrimEnd('/');
if (instance != null) Debug.LogError("VELConnectManager instance already exists", this); if (instance != null) Debug.LogError("VELConnectManager instance already exists", this);
instance = this; instance = this;
deviceId = CreateDeviceId(); deviceId = CreateDeviceId();
@ -259,7 +260,6 @@ namespace VELConnect
{ {
state = JsonConvert.DeserializeObject<State>(json); state = JsonConvert.DeserializeObject<State>(json);
if (state == null) return; if (state == null) return;
if (state.room == null) return;
bool isInitialState = false; bool isInitialState = false;
@ -405,7 +405,7 @@ namespace VELConnect
} }
// if (state.room.modified_by != DeviceId && state.room.data != null) // if (state.room.modified_by != DeviceId && state.room.data != null)
if (state.room.data != null) if (state.room?.data != null)
{ {
foreach (KeyValuePair<string, string> elem in state.room.data) foreach (KeyValuePair<string, string> elem in state.room.data)
{ {
@ -686,6 +686,11 @@ namespace VELConnect
); );
} }
public static void SetUserData(string key, string value)
{
SetUserData(new Dictionary<string, string> { { key, value } });
}
/// <summary> /// <summary>
/// Sets the 'data' object of the Device table /// Sets the 'data' object of the Device table
/// </summary> /// </summary>

4
unity_package/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "edu.uga.engr.vel.vel-connect", "name": "edu.uga.engr.vel.vel-connect",
"displayName": "VEL-Connect", "displayName": "VEL-Connect",
"version": "4.0.5", "version": "4.0.6",
"unity": "2019.1", "unity": "2019.1",
"description": "Web-based configuration for VR applications", "description": "Web-based configuration for VR applications",
"keywords": [], "keywords": [],
@ -13,6 +13,6 @@
"samples": [], "samples": [],
"dependencies": { "dependencies": {
"com.unity.nuget.newtonsoft-json": "3.0.0", "com.unity.nuget.newtonsoft-json": "3.0.0",
"edu.uga.engr.vel.velnet": "1.1.8" "edu.uga.engr.vel.velnet": "1.3.8"
} }
} }