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

63 Commits

Author SHA1 Message Date
Micah Acinapura
1fd62cbe88 more merge fixes and sgct update 2025-02-03 18:10:45 -05: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
f032e9423c Cmake cleanup and uppdate Copyright 2023-06-11 23:53:06 +02: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
c0b4fdb4df Folder restructuring in software integration module 2022-06-22 18:52:47 -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
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
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
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
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
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
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
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
Emma Broman
4d6f66f179 Minor shader cleanup 2021-02-19 08:22:15 +01:00
Emma Broman
8c0182c69f Remove explicit blend equation 2021-02-17 15:49:32 +01:00
Emma Broman
ad7455152f Very large datasets can now be loaded 
Use a centralized storage in the module if a dataset is too large to be feasible to pass in the dictionary
 2021-02-11 16:09:11 +01:00
Emma Broman
dafa7157eb Update renderable to codegen change 2021-02-10 11:15:48 +01:00
Emma Broman
e18f106084 Fix for handling nan values in data 2021-02-08 16:30:24 +01:00
Emma Broman
c4c24bc6a3 Clean up renderable points cloud a bit 
* Remove unused luminosity and velocity
* Add documentation of data
 2021-02-02 08:38:52 +01:00
Emma Broman
8fb955ab85 Opacity fix and some cleanup 2021-02-01 17:10:16 +01:00
Emma Broman
09768054e9 Update to new dictionary 2021-01-29 14:15:37 +01:00
aniisaaden
3dea76ac73 removed solution for opacity issue - caused subsets to render behind original data 2020-10-26 10:33:23 +01:00
aniisaaden
d2f5076977 Updated format of global::renderengine to pointers 2020-10-22 18:04:31 +02:00
aniisaaden
7b1ae50918 Fixed opacity issue 2020-10-22 17:38:34 +02:00
aniisaaden
1460d30a21 Cleaned and structured code 2020-10-20 09:48:35 +02:00
aniisaaden
e109c64081 Fixed issue with pointscloud asset. Changed pointData to be a dictionary in pointsCloudRenderable. Changed name of message type "DATA" to "PDAT" 2020-10-19 13:52:47 +02:00
Johanna Granström
42889906cc wip 2020-10-13 13:50:55 +02:00
aniisaaden
c428f097ea Started expanding the module and renderable to include luminosity and velocity 2020-10-13 10:15:09 +02:00
aniisaaden
064a01281b Point data has correct postion in OpenSpace. Speckfile code removed from module and renderable. 2020-10-08 15:02:32 +02:00
aniisaaden
c71465f507 Added if-statements for onChange-messaging. Renderable updated to receive point data, position is wrong. 2020-10-08 14:20:05 +02:00
aniisaaden
2eb943110c Refractor code in pointscloud 2020-10-08 08:56:03 +02:00
Johann Granström
5413ca7ddf Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 
# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
 2020-09-24 11:47:21 +02:00
Johann Granström
2401ee5b26 Refractor and clean code 2020-09-24 11:41:00 +02:00
aniisaaden
9eb33f6775 Toggling visibility of SGN works from Glue and from OpenSpace 2020-09-22 15:33:44 +02:00