mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 09:41:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,943 Commits 99 Branches 46 Tags
project/software-integration-merge
Commit Graph

136 Commits

Author SHA1 Message Date
Micah Acinapura
1fd62cbe88 more merge fixes and sgct update 2025-02-03 18:10:45 -05:00
VLLindqvist
87e2de0798 Change name of velocityNanMode enum in shader 2023-06-19 23:46:27 +02:00
VLLindqvist
384eb8b0d1 Remove addPropery(_fade). Already done in Renderable-class 2023-06-16 13:03:43 +02:00
Emma Broman
40df21cce7 Use new fade property for opacity of points 
And remove a bunch of trailing whitespaces... (done on save)
 2023-06-15 18:16:58 +02:00
VLLindqvist
65ebfada83 Update frontend hash and most logs to debug instead of info 2023-06-13 17:20:33 +02:00
VLLindqvist
d2299f4042 Fix assertion error 2023-06-12 17:56:27 +02:00
VLLindqvist
08f3a0790c New method name in Property class for string value 2023-06-12 00:27:02 +02:00
VLLindqvist
f032e9423c Cmake cleanup and uppdate Copyright 2023-06-11 23:53:06 +02:00
Victor Lindquist
10724bb362 Fixes build errors and warnings 2022-06-29 15:56:55 -06:00
Jacob Molin
0322d12425 Adds STRING_NOT_SET constant for not set string properties 2022-06-24 14:43:27 -06:00
Jacob Molin
562ff42520 Adds log for amount of NaN values loaded for point data + cleanup 2022-06-24 14:41:19 -06:00
Jacob Molin
539715f49c Adds date recorded to velocity (used as t=0 in renderable) + cleanup 2022-06-23 12:55:36 -06:00
Victor Lindquist
b4bb560bf1 fixes formatting 2022-06-22 18:57:51 -06:00
Victor Lindquist
c0b4fdb4df Folder restructuring in software integration module 2022-06-22 18:52:47 -06:00
Victor Lindquist
e304a13d66 bugfixes in inl files 2022-06-22 16:35:28 -06:00
Victor Lindquist
59d7274e5c [WIP] SIMP version 1.9.1. Breaking changes. Refactor of entire softwareintegration module. Updates SGCT submodule to fix bug with long transfer times on sync connections. 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-06-22 13:49:52 -06:00
Victor Lindquist
c05e41a2f5 Fixes error with thread.join when exiting 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-06-17 15:00:37 -06:00
Victor Lindquist
f5dc566c1e Merge branch 'thesis/2022/software-integration_dod' and 'thesis/2022/software-integration_save-session' into thesis/2022/software-integration_velocity-support 2022-06-16 23:24:39 -06:00
Jacob Molin
a2352c9824 Merge branch 'thesis/2022/software-integration_velocity-support' of github.com:OpenSpace/OpenSpace into thesis/2022/software-integration_velocity-support 2022-06-15 19:22:20 -06:00
Jacob Molin
e68cb04454 Adds time unit support for VDAT SIMP messages 2022-06-15 19:17:20 -06:00
Victor Lindquist
c011986794 Added 'hasLoaded' bool in the syncable storage so that enabling properties in the renderable occurs at the correct time 2022-06-15 19:14:49 -06:00
Victor Lindquist
b6a79ec5ef Refactored NetworkEngine and PointDataMessageHandler into Data-Oriented Design to simplify development 2022-06-15 18:41:57 -06:00
Jacob Molin
53aa2c5737 Sets large deltaTimeSteps on received VDAT message 2022-06-15 12:29:17 -06:00
Jacob Molin
dfe97d348c Fixes intial properties not being set according to SIMP message 2022-06-15 11:26:11 -06:00
Jacob Molin
e538e992c6 Adds NaN mode for velocity + moves distance conversion to renderable for velocity 2022-06-15 10:39:17 -06:00
Victor Lindquist
7b2aafcc28 Merge branch 'thesis/2022/software-integration_velocity-support' into thesis/2022/software-integration_dop_test 2022-06-14 03:07:02 -06:00
Victor Lindquist
f7e5dcf2e2 Added save session feature in the Software Integration module 2022-06-14 02:00:00 -06:00
Jacob Molin
ffba872244 [WIP] (Temp) Velocity NaN mode 2022-06-11 13:41:37 -06:00
Jacob Molin
d3d831a7e3 Bugfix: softwareconnection is destroyed when ext. software is disconnecting 2022-06-11 13:16:15 -06:00
Jacob Molin
78991e6640 Changes name on SIMP mesage type Disconnection to InternalDisconnection (diconnection should only be used internally) 2022-06-10 17:00:46 -06:00
Jacob Molin
170ef5639e [WIP] Velocity works but something's off with the units 2022-06-10 16:51:13 -06:00
Jacob Molin
0bc6036beb Adds feature to choose via SIMP how colormap attribute NaN values should be rendered 2022-06-08 13:56:24 -06:00
Victor Lindquist
77421f1b31 Fixed problem with point disappearing when too far away 2022-06-01 02:49:58 -06:00
Jacob Molin
5970aaba28 Fixes ColormapAttrData not always syncing + ColormapEnabled-script being executed 2022-05-27 22:28:35 -06:00
Victor Lindquist
033800ff58 Quick fix of issue with enabling colormap. Changed data structure in syncabledatastorage. 2022-05-25 03:01:16 -06:00
Jacob Molin
83379d481c ColormapEnable needs to be turned on/off in GUI for renderable after transfer from Glue. Not rendering points w/ nan attr val. 2022-05-24 22:50:18 -06:00
Jacob Molin
df79184faf [WIP] ColormapEnable not working 
Co-authored-by: Victor Lindquist <VLLindqvist@users.noreply.github.com>
 2022-05-24 17:07:57 -06:00
Victor Lindquist
193c7cdf3e Simp 1.9. Added linear size. 2022-05-21 13:34:03 -06:00
Victor Lindquist
47a5c8e299 Full support of colormaps. Revamp of entire softwareintegration module. Update to SIMP version 1.8. 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-05-20 01:29:03 -06:00
JACOB MOLIN
d62b9a49e5 Enabled ability to receive a colormap via SIMP and syncing to nodes 2022-05-10 14:14:47 -06:00
Victor Lindquist
69f83cc8fa SIMP version 1.6: revamp of entire message structure with separator between values and sending hexadecimal representation of numbers instead of 'length_of_value+stringified_value'. Also fixed a reasource lock error when calling thread.join on peer threads. 2022-05-06 09:40:21 -06:00
Victor Lindquist
f1b14356e0 Added geometry shader to renderablepointscloud. An added bonus is that you can now scale the points non-uniformly using the SizeOption property in the GUI, i.e so the points aren't the same size on screen regardless of distance from camera (default is still uniform size) 2022-05-05 09:56:20 -06:00
Victor Lindquist
b5e819c3fe Changed to SIMP version 1.5 which includes connection handshake. Reverted so that SGNs does not get removed when disconnecting. Other refactoring. 2022-05-02 21:29:13 -06:00
JACOB MOLIN
3e5dd25da6 SI GUI appears by updating WebGUI after new SGN is added 2022-04-21 13:41:17 -04:00
JACOB MOLIN
188481245b Fixes viability toggling from Glue 2022-04-20 17:46:12 -04:00
JACOB MOLIN
8f54e62775 Update for glue-openspace plugin 
Co-authored-by: Victor Lindquist <VLLindqvist@users.noreply.github.com>
 2022-04-20 16:02:55 -04:00
Victor Lindquist
8361d53505 Added support for script engine to sync renderablepointscloud properties to client nodes 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-04-13 16:14:26 -06:00
Victor Lindquist
f033cf16dc Datasets now syncs over to clients in a cluster, regardless of dataset size 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-04-07 18:37:15 -06:00
Victor Lindquist
752408a9f9 SyncableMessageQueue in progress 
Co-authored-by: Jacob Molin <jacobmolin@users.noreply.github.com>
 2022-04-07 18:28:41 -06:00
Emma Broman
a60042ef2f Adapt to updates in master 2021-12-03 14:21:10 +01:00