Skip to content

Small improvements to RealtimeDataSource and Replicator #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danieljharris wants to merge 8 commits into
base: icg_fleck_realtime_datasource_and_replicator
Choose a base branch
from
Open

Small improvements to RealtimeDataSource and Replicator #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70de4fb
Merge pull request #7 from philfleck/icg_fleck_realtime_datasource_an…
danieljharris Aug 18, 2021
497caca
Moved images from iatkrunner to github user content
danieljharris Aug 18, 2021
a39f34d
Removed the now unused iatkrunner folder
danieljharris Aug 18, 2021
4f1769f
Removed unused .meta file
danieljharris Aug 18, 2021
35834a1
Fixes to RealtimeDataDemo
danieljharris Aug 18, 2021
744ff51
Small improvements to RealtimeDataSource.cs
danieljharris Aug 18, 2021
92d0a50
Small cleanups of replicator and replicator demo
danieljharris Aug 19, 2021
cbc4e6a
auto boundary scaling is now set per dimension
danieljharris Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/IATK/Editor/VisualisationEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ static void CreateCSVDataSourcePrefab()
[MenuItem("GameObject/IATK/Realtime Data Source", false, 10)]
static void CreateRealtimeDataSourcePrefab()
{
GameObject obj = new GameObject("[IATK] New Data Source");
GameObject obj = new GameObject("[IATK] New Realtime Data Source");
obj.AddComponent<RealtimeDataSource>();
Selection.activeGameObject = obj;
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/IATK/Scenes/ReatimeDataDemoScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,6 @@ MonoBehaviour:
m_GameObject: {fileID: 522362264}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1ec03e67883d44248b0c15d6342fe69e, type: 3}
m_Script: {fileID: 11500000, guid: d34400e3345d47e40ab2c99948614677, type: 3}
m_Name:
m_EditorClassIdentifier:
213 changes: 97 additions & 116 deletions Assets/IATK/Scripts/Controller/Replicator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//20210708, initial working version

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

Expand Down Expand Up @@ -290,136 +289,118 @@ public void UpdateReplicas(string uid, string payload)
public void UpdateDatasource(string uid, string payload)
{
Debug.Log("Replicator::UpdateDatasource uid= " + uid + ", payload=" + payload);
if (uid.Length > 0)
if (uid.Length <= 0 || !replicas.ContainsKey(uid) || payload.Length <= 0) return;

var vis = replicas[uid].vis;
//TODO apply ds hee to vis
var dsInfo = JsonUtility.FromJson<DataSourceInfo>(payload);
Debug.Log("Replicator::UpdateDatasource dsInfo => " + dsInfo);
if (dsInfo == null || dsInfo.dataSourceDefinitions.Count <= 0) return;

var dsName = dsInfo.dataSourceName;
var dsTypeStr = dsInfo.dataSourceType;
Type dsType = Type.GetType(dsTypeStr);

Debug.Log("Replicator::UpdateDatasource type " + dsTypeStr + " vs " + dsType);
if (dsType == null || !dsType.Equals(typeof(RealtimeDataSource))) return;



var dsGo = GameObject.Find("replique-" + dsName); //TODO check if it already exists
if (dsGo == null)
{
if (replicas.ContainsKey(uid))
dsGo = new GameObject("replique-" + dsName);
dsGo.AddComponent(dsType);
}
Component ds = dsGo.GetComponent(dsType);



Debug.Log("Replicator::UpdateDatasource created ds ...");

vis.dataSource = ds as RealtimeDataSource;
Debug.Log("Replicator::UpdateDatasource set ds to vis ...");

Debug.Log("Replicator::UpdateDatasource found #defs = " + dsInfo.dataSourceDefinitions.Count);
foreach (var dsdef in dsInfo.dataSourceDefinitions)
{
if (dsdef.isSetUp)
{
var vis = replicas[uid].vis;
if (payload.Length > 0)
{
//TODO apply ds hee to vis
var dsInfo = JsonUtility.FromJson<DataSourceInfo>(payload);
Debug.Log("Replicator::UpdateDatasource dsInfo => " + dsInfo);
continue;
}
var dKey = dsdef.accessKey;
var dDimName = dsdef.dimensionName;
var dPayload = dsdef.payload;

if (dsInfo != null)
{
var dsName = dsInfo.dataSourceName;
var dsTypeStr = dsInfo.dataSourceType;
Type dsType = Type.GetType(dsTypeStr);
Debug.Log("Replicator::UpdateDatasource adding defs => " + dKey + ", " + dDimName);

Debug.Log("Replicator::UpdateDatasource type " + dsTypeStr + " vs " + dsType);
var rtds = ds as RealtimeDataSource;
vis.dataSource = rtds;

if (dsType != null)
{
Component ds = null;
var dsGo = GameObject.Find("replique-" + dsName); //TODO check if it already exists
if (dsGo == null)
{
dsGo = new GameObject("replique-" + dsName);
ds = dsGo.AddComponent(dsType);
}
ds = dsGo.GetComponent(dsType);
//rtds.AddDefaultIdDimension();
rtds.AddDimension("id", 0, 100);
for (var i = 0; i < 100; i++)
{
rtds.SetData("id", i);
}
rtds.AddDimension(dDimName, 0, 100); //was dKey
vis.updateView(0);

Debug.Log("Replicator::UpdateDatasource created ds ...");
Debug.Log("Replicator::UpdateDatasource before calling GetStreamData");

if (dsType.Equals(typeof(RealtimeDataSource)))
{
vis.dataSource = ds as RealtimeDataSource;
Debug.Log("Replicator::UpdateDatasource set ds to vis ...");

Debug.Log("Replicator::UpdateDatasource found #defs = " + dsInfo.dataSourceDefinitions.Count);
if (dsInfo.dataSourceDefinitions.Count > 0)
{
foreach (var dsdef in dsInfo.dataSourceDefinitions)
{
if (dsdef.isSetUp)
{
continue;
}
var dKey = dsdef.accessKey;
var dDimName = dsdef.dimensionName;
var dPayload = dsdef.payload;

Debug.Log("Replicator::UpdateDatasource adding defs => " + dKey + ", " + dDimName);

var rtds = ds as RealtimeDataSource;
vis.dataSource = rtds;

//rtds.AddDefaultIdDimension();
rtds.AddDimension("id", 0, 100);
for (var i = 0; i < 100; i++)
{
rtds.SetData("id", i);
}
rtds.AddDimension(dDimName, 0, 100); //was dKey
vis.updateView(0);

Debug.Log("Replicator::UpdateDatasource before calling GetStreamData");

if (GetStreamData != null)
{
GetStreamData(dPayload, (string topic, string content) =>
{
try
{
Debug.Log("Replicator::UpdateDatasource OnNewData => " + content);
//TODO add here json parser of your choice
if (GetStreamData == null) return;
GetStreamData(dPayload, (string topic, string content) =>
{
try
{
Debug.Log("Replicator::UpdateDatasource OnNewData => " + content);
//TODO add here json parser of your choice
#if true
var parsed = new Dictionary<string, string>(); //this is only a placeholder for a json parser
var parsed = new Dictionary<string, string>(); //this is only a placeholder for a json parser
#else
object parsed = Json.JSON.Parse(content);
object parsed = Json.JSON.Parse(content);
#endif
var val = parsed[dKey];

Debug.Log("Replicator::UpdateDatasource OnNewData parsed[" + dKey + "]=" + val);

if (val != null && val.ToString().Length > 0)
{
double fVal;
bool isNum = double.TryParse(val.ToString(), out fVal);
if (isNum)
{
if (rtds != null)
{
//rtds.AddDataByStr(dDimName, (float)fVal);
rtds.SetData(dDimName, (float)fVal);
}
else
{
Debug.Log("Replicator::UpdateDatasource rtds is NULL!");
}
}
else
{
//TODO handle string types here
}

if (vis != null)
{
vis.updateView(0);
}
else
{
Debug.Log("Replicator::UpdateDatasource vis is NULL!");
}
}
}
catch (Exception err)
{
Debug.Log("Replicator::UpdateDatasource ERROR => " + err);
}
return "";
});
}
dsdef.isSetUp = true;
}
}
var val = parsed[dKey];

Debug.Log("Replicator::UpdateDatasource OnNewData parsed[" + dKey + "]=" + val);

if (val != null && val.ToString().Length > 0)
{
double fVal;
bool isNum = double.TryParse(val.ToString(), out fVal);
if (isNum)
{
if (rtds != null)
{
rtds.SetData(dDimName, (float)fVal);
}
else
{
Debug.Log("Replicator::UpdateDatasource rtds is NULL!");
}
}
else
{
//TODO handle string types here
}

if (vis != null)
{
vis.updateView(0);
}
else
{
Debug.Log("Replicator::UpdateDatasource vis is NULL!");
}
}
}
}
catch (Exception err)
{
Debug.Log("Replicator::UpdateDatasource ERROR => " + err);
}
return "";
});
dsdef.isSetUp = true;
}
}

Expand Down
4 changes: 2 additions & 2 deletions Assets/IATK/Scripts/Controller/Visualisation Util Classes/CreationConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void Serialize(string serializedObjectPath, CreationConfiguration cf)
VisualisationHeight = cf.VisualisationHeight;
VisualisationDepth = cf.VisualisationDepth;

//added for replication hook
// Replication hook
this.UID = cf.uid;
if (cf.ReplicationNotification != null) {
cf.ReplicationNotification?.Invoke(cf.uid, JsonUtility.ToJson(this));
Expand Down Expand Up @@ -162,7 +162,7 @@ public enum Axis
Z
}

//added report to replication function
// Report to replication function
public Func<string, string, string> ReplicationNotification = null;
public string uid;

Expand Down
10 changes: 8 additions & 2 deletions Assets/IATK/Scripts/Controller/Visualisations/ScatterplotVisualisation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ public override void CreateVisualisation()
{
for (int i = 0; i < viewList.Count; i++)
{
viewList[i].SetColors(mapColoursPalette(visualisationReference.dataSource[visualisationReference.colorPaletteDimension].Data, visualisationReference.coloursPalette));
if (viewList[i] != null && visualisationReference?.dataSource[visualisationReference?.colorPaletteDimension]?.Data != null)
{
viewList[i].SetColors(mapColoursPalette(visualisationReference.dataSource[visualisationReference.colorPaletteDimension].Data, visualisationReference.coloursPalette));
}
}
}
else if (viewList.Count > 0 && visualisationReference.colour != null)
Expand Down Expand Up @@ -212,7 +215,10 @@ public override void UpdateVisualisation(PropertyType propertyType){
{
for (int i = 0; i < viewList.Count; i++)
{
viewList[i].SetColors(mapColoursPalette(visualisationReference.dataSource[visualisationReference.colorPaletteDimension].Data, visualisationReference.coloursPalette));
if (viewList[i] != null && visualisationReference?.dataSource[visualisationReference?.colorPaletteDimension]?.Data != null)
{
viewList[i].SetColors(mapColoursPalette(visualisationReference.dataSource[visualisationReference.colorPaletteDimension].Data, visualisationReference.coloursPalette));
}
}
}
else
Expand Down
10 changes: 4 additions & 6 deletions Assets/IATK/Scripts/Demo/RTDS_Replicator_Test.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -96,7 +96,6 @@ LightmapSettings:
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
Expand Down Expand Up @@ -146,9 +145,8 @@ Light:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 115723569}
m_Enabled: 1
serializedVersion: 10
serializedVersion: 9
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
Expand Down Expand Up @@ -229,7 +227,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &343646976
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -355,7 +353,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &522362265
Transform:
m_ObjectHideFlags: 0
Expand Down
Loading