4943f01718
Merge branch 'master' into thesis/2018/dsn
2019-01-24 15:35:57 -05:00
99a43747e1
Update cfitsio to fix Jenkins
2019-01-24 16:02:58 +01:00
704df2eebf
made station fov follow the color of the site locations
2019-01-23 18:01:58 -05:00
dcf65fe784
changed rotation vector property to handle degrees instead of radians
2019-01-23 16:34:57 -05:00
4e8201e25e
moved angle property to stationsfov + overall improvements of the renderablecone and renderablestationsfov
2019-01-23 16:14:18 -05:00
d60017e25d
Implement fading distance in renderablestationfov, lifting out some functions in renderablecone to make inheritance easier
2019-01-23 12:41:57 -05:00
7fefaca345
Feature/jenkins ( #788 )
...
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
b05bbf643f
Merge branch 'master' into thesis/2018/dsn
2019-01-22 16:23:01 -05:00
147ad70a1c
small improvements to signal rendering
2019-01-22 16:15:54 -05:00
c1405379ea
renderablestationsfov added and compiling
2019-01-22 13:53:37 -05:00
17caade5b1
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-22 10:55:01 -05:00
4d25841c4b
renderablestationfov not working
2019-01-22 10:54:56 -05:00
8b396b6028
Fix gui scale bug
2019-01-22 10:53:26 +01:00
a904928c22
precission error work around
2019-01-21 15:36:47 -05:00
c3cc53f08d
Make it possible to rescale web gui
2019-01-19 19:16:56 -05:00
c7639adb15
Remove warnings in Clang
2019-01-19 14:49:31 +01:00
02c90263f7
wireframe mode
2019-01-18 16:31:23 -05:00
2031553a37
set color same as signals
2019-01-18 15:49:25 -05:00
f4d15f1434
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-18 14:18:28 -05:00
a3432f1484
Fixed the cone size-problem
2019-01-18 14:18:13 -05:00
f00a9ab7f1
small fixes
2019-01-17 18:12:01 -05:00
9bab7fb6c4
Added all cones
2019-01-17 16:46:26 -05:00
e7c5fddd31
Set angle instead of radius
2019-01-17 11:09:47 -05:00
c05105c2f5
added documentaion and properties to renderable cone
2019-01-16 17:52:49 -05:00
5c74fafd4c
clean up
2019-01-16 11:48:12 -05:00
0bf05635b5
Added renderableCone class that renders one cone
2019-01-16 11:32:07 -05:00
caa888e1e8
Focus node name instead of just focus
2019-01-14 17:56:05 -05:00
ed0df0319b
make labels follow timeframe of the node identifier
2019-01-14 17:07:05 -05:00
335528f73e
got rid of outdated/unnecessary comments
2019-01-10 18:02:01 -05:00
3ae60924bd
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-10 17:57:16 -05:00
96d960ec96
got rid of unnecessary logic in shader, added some functions in renderablesignals
2019-01-10 17:57:07 -05:00
0b7897fb8b
check if parsing is ready before using values
2019-01-10 17:16:28 -05:00
8e224e6111
got rid of stringstream and moved the position of the color marker
2019-01-10 12:37:26 -05:00
541ab3123d
got rid of unnecessary includes
2019-01-09 23:36:54 -05:00
b0073212d8
get rid of magic values
2019-01-09 23:36:21 -05:00
c39dd04c46
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-09 23:24:12 -05:00
bdf2ac1b13
added functionality to dashboard, functionality to show a color dot
2019-01-09 23:23:50 -05:00
b3d68d83ff
only render labels in the timeframe set in asset
2019-01-09 20:12:17 -05:00
05412ad9bf
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-09 11:31:56 -05:00
2ddb2a51eb
Added point to label to show where spacecrafts are
2019-01-09 11:30:53 -05:00
51016536d5
extended the range of flow speed property
2019-01-08 16:13:15 -05:00
0177f3915a
renamed renderablelabel
2019-01-08 15:37:14 -05:00
c5dbb5de49
fixed so that textcolor property works, only overrided by individual label color
2019-01-08 15:18:10 -05:00
8920f03053
Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn
2019-01-08 13:12:28 -05:00
a9bd05b5ef
fixed precision issues for stations, handled similar to spacecrafts
2019-01-08 13:12:18 -05:00
775e176e59
:Merge remote-tracking branch 'origin' into thesis/2018/dsn
2019-01-08 10:59:51 -05:00
5fbe5cf269
clean up and remove testRADEC
2019-01-08 10:56:15 -05:00
e262829812
Clean up and possible to set individual colors for the labels
2019-01-07 11:46:47 -05:00
4a41bba748
changed to read data as double instead of string
2019-01-07 11:01:33 -05:00
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
Lovisa Hassler