3000 Commits

Author	SHA1	Message	Date
Lovisa Hassler	ed0df0319b	make labels follow timeframe of the node identifier	2019-01-14 17:07:05 -05:00
Lovisa Hassler	335528f73e	got rid of outdated/unnecessary comments	2019-01-10 18:02:01 -05:00
Lovisa Hassler	3ae60924bd	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2019-01-10 17:57:16 -05:00
Lovisa Hassler	96d960ec96	got rid of unnecessary logic in shader, added some functions in renderablesignals	2019-01-10 17:57:07 -05:00
Agnes Heppich	0b7897fb8b	check if parsing is ready before using values	2019-01-10 17:16:28 -05:00
Lovisa Hassler	8e224e6111	got rid of stringstream and moved the position of the color marker	2019-01-10 12:37:26 -05:00
Lovisa Hassler	541ab3123d	got rid of unnecessary includes	2019-01-09 23:36:54 -05:00
Lovisa Hassler	b0073212d8	get rid of magic values	2019-01-09 23:36:21 -05:00
Lovisa Hassler	c39dd04c46	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2019-01-09 23:24:12 -05:00
Lovisa Hassler	bdf2ac1b13	added functionality to dashboard, functionality to show a color dot	2019-01-09 23:23:50 -05:00
Agnes Heppich	b3d68d83ff	only render labels in the timeframe set in asset	2019-01-09 20:12:17 -05:00
Agnes Heppich	05412ad9bf	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2019-01-09 11:31:56 -05:00
Agnes Heppich	2ddb2a51eb	Added point to label to show where spacecrafts are	2019-01-09 11:30:53 -05:00
Lovisa Hassler	51016536d5	extended the range of flow speed property	2019-01-08 16:13:15 -05:00
Lovisa Hassler	0177f3915a	renamed renderablelabel	2019-01-08 15:37:14 -05:00
Lovisa Hassler	c5dbb5de49	fixed so that textcolor property works, only overrided by individual label color	2019-01-08 15:18:10 -05:00
Lovisa Hassler	8920f03053	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2019-01-08 13:12:28 -05:00
Lovisa Hassler	a9bd05b5ef	fixed precision issues for stations, handled similar to spacecrafts	2019-01-08 13:12:18 -05:00
Agnes Heppich	775e176e59	:Merge remote-tracking branch 'origin' into thesis/2018/dsn	2019-01-08 10:59:51 -05:00
Agnes Heppich	5fbe5cf269	clean up and remove testRADEC	2019-01-08 10:56:15 -05:00
Agnes Heppich	e262829812	Clean up and possible to set individual colors for the labels	2019-01-07 11:46:47 -05:00
Agnes Heppich	4a41bba748	changed to read data as double instead of string	2019-01-07 11:01:33 -05:00
Emil Axelsson	0c6b5e95c6	Introduce ability to configure ports etc for external applications. (#785) ... Introduce ability to configure ports etc for external applications, including webgui	2019-01-04 10:23:28 +01:00
Agnes Heppich	60071a0401	light travel hours in struct	2018-12-27 20:05:18 -05:00
Agnes Heppich	920759132d	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-27 19:31:45 -05:00
Agnes Heppich	6a17e85d47	Added Gaia and changed speed offlow particles	2018-12-27 19:30:33 -05:00
Lovisa Hassler	e2299eecd2	renamed variables	2018-12-27 18:39:39 -05:00
Lovisa Hassler	6705286d64	bug fix, no position updated sometimes	2018-12-27 18:38:39 -05:00
Lovisa Hassler	79c408f438	got rid of DataStart and DataEnd, replaced the logic so some data is always loaded, no warning thrown if there is no data outside the bounds	2018-12-27 15:50:07 -05:00
Agnes Heppich	feded18dd0	speed up, check if previous index is same as current	2018-12-27 12:14:49 -05:00
Agnes Heppich	16242f34ef	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-27 10:18:06 -05:00
Agnes Heppich	9f16e0919e	added light travel hours to struct	2018-12-27 10:17:54 -05:00
Lovisa Hassler	71f975c7d0	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-26 19:27:55 -05:00
Lovisa Hassler	5554868897	changed the handling of the indexing of signal segments	2018-12-26 19:27:42 -05:00
Agnes Heppich	bea4de82ac	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-26 18:07:15 -05:00
Agnes Heppich	333806009e	don't parse if same index	2018-12-26 18:01:58 -05:00
Lovisa Hassler	b55f43a175	fix, line spacing can now be set to 0 opacity with color property	2018-12-26 17:00:29 -05:00
Lovisa Hassler	f004c229fb	made the flow segment size dependant on light travel time. Also renamed 'signal speed' to 'flow speed'	2018-12-26 16:39:11 -05:00
Agnes Heppich	e18d5571a6	added size for the stations dishes so that signal is rendered to the top instead of its foot	2018-12-21 18:26:19 -05:00
Agnes Heppich	0343f5bd2d	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-19 19:15:13 -05:00
Agnes Heppich	408958436b	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-19 19:13:38 -05:00
Lovisa Hassler	b9b64ddd2b	changed labels so that they are dynamically updated with the spacecraft identifiers	2018-12-19 19:12:48 -05:00
Agnes Heppich	d20caa6380	Property for rotation	2018-12-19 19:11:38 -05:00
Lovisa Hassler	e0454e5cc9	adding error handle and messages for the spacecraftIdMap	2018-12-19 17:18:17 -05:00
Lovisa Hassler	190021f803	added a mapping of the dsn signal data to spacecraft identifiers, and added identifiers for the spacecrafts	2018-12-19 16:38:38 -05:00
Lovisa Hassler	cd07f51c2e	got rid of duplicated commented code	2018-12-18 18:09:29 -05:00
Lovisa Hassler	4c63a5f183	adding unit AU	2018-12-18 17:46:59 -05:00
Lovisa Hassler	9a6d79ce8c	added fading functionalities for the labels	2018-12-18 14:59:15 -05:00
Lovisa Hassler	bed63c8e4e	Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn	2018-12-17 17:41:00 -05:00
Lovisa Hassler	f352ef7a75	moved comment to correct place, changed vec3 to dvec3	2018-12-17 17:39:48 -05:00