mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-31 08:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,985 Commits 83 Branches 46 Tags
fcb991b98695972be55d074e9db0746f5c9d2a14
Commit Graph

5985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lovisa Hassler
fcb991b986 making the loaded signal data buffer larger 2018-11-27 16:55:31 -05:00
Lovisa Hassler
c8cbdbbc1a changed deprecated projectionMatrix 2018-11-27 10:59:58 -05:00
Lovisa Hassler
cd81474f5e updated error messages 2018-11-26 14:06:18 -05:00
Lovisa Hassler
c0c6d706eb deleted unnecessary debug message 2018-11-26 13:38:29 -05:00
Lovisa Hassler
01bc66a2a3 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-26 13:22:39 -05:00
Lovisa Hassler
19a6e801d5 added the depth correction again to combat coloring issues with signal within the atmosphere, still temporary tweak 2018-11-26 12:35:42 -05:00
Lovisa Hassler
1e1e1d0896 changed standard colors for madrid and canberra 2018-11-26 12:29:40 -05:00
Agnes Heppich
e4a6e7c459 check if correct positioning data is already loaded 2018-11-21 16:41:33 -05:00
Agnes Heppich
be71ed7707 renamed jsonHelper to dataFileHelper 2018-11-20 13:52:08 -05:00
Lovisa Hassler
c1f5c1df0c corrected some error messages, added a TODO 2018-11-19 19:27:34 -05:00
Lovisa Hassler
ba7b865324 added equatorial sphere labels to the keybinding e 2018-11-19 19:00:23 -05:00
Lovisa Hassler
1052e58ab0 changed the siteColorMapping to include the work cColor which makes the purpose of the property more clear 2018-11-19 18:58:14 -05:00
Lovisa Hassler
b9ea98efdc changed default values of line width property 2018-11-19 18:03:08 -05:00
Lovisa Hassler
5169e96d7d cleanup, divided som long code lines and renamed _linerenderinformation.count 2018-11-19 17:14:07 -05:00
Lovisa Hassler
ce7471cdbb created a separate updateVertexAttributes function 2018-11-19 16:40:10 -05:00
Lovisa Hassler
7900b56441 differentiate between uplink and downlink, todo handle case both 2018-11-19 15:57:05 -05:00
Lovisa Hassler
c5fe377806 made smooth transitions for the signal segment in shader. 2018-11-19 15:28:43 -05:00
Lovisa Hassler
73a8039c8e Merge branch 'master' into thesis/2018/dsn 2018-11-16 16:08:58 -05:00
Lovisa Hassler
8622f4354d merge 2018-11-16 16:07:15 -05:00
Lovisa Hassler
e56e879ab3 taking light travel time into consideration for signal activity 2018-11-16 15:31:09 -05:00
Lovisa Hassler
05a9fcb240 adding functionality to watch signal travel through space with speed of light, multiple todo left 2018-11-16 12:24:26 -05:00
Agnes Heppich
e8cac515cb reading the ra dec from files and finding the right file with a binary search 2018-11-15 15:53:43 -05:00
Emil Axelsson
916e42f2bb Remove opacity parameter from timevaryingvolume 2018-11-15 12:00:34 +01:00
Emil Axelsson
35252ec3df Improve backwards compatibility of layer support 2018-11-15 09:23:22 +01:00
Emil Axelsson
52060ab006 Fix nullpointer dereference error caused by unset callback handle 2018-11-14 22:45:31 +01:00
Emil Axelsson
3243316e79 Change default keybinding for toggling rendering 2018-11-14 22:34:28 +01:00
Emil Axelsson
57b8ab6ef6 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-14 17:07:56 +01:00
Emil Axelsson
a5e8a5a4d2 Deactivate event handler when webgui is hidden 2018-11-14 17:07:17 +01:00
Alexander Bock
9d0ef13cb5 Add missing constructor 2018-11-14 10:17:20 -05:00
Alexander Bock
45f5183683 Add constexpr constructor to PropertyInfo to silence GCC error 2018-11-14 09:52:31 -05:00
Agnes Heppich
32b6d5a62f Merge 2018-11-13 18:32:59 -05:00
Agnes Heppich
2adfe0551f Added jsonHelper and EadecManager 2018-11-13 18:26:36 -05:00
Lovisa Hassler
8b881ae89e renamed communicationlines asset file 
renamed the communicationlines asset to signals fix
 2018-11-13 12:42:20 -05:00
Lovisa Hassler
dbe90fd94b cleanup and renaming some variables 2018-11-13 11:51:48 -05:00
Lovisa Hassler
760eff56f8 merge master 2018-11-13 11:35:26 -05:00
Alexander Bock
9a368ede25 Fix issue that causes atmosphere to show up on the other side of a planet if the shading is disabled (closes #677) 2018-11-13 08:27:07 -05:00
Alexander Bock
6e3dfa6db8 Merge remote-tracking branch 'origin/feature/find-configuration' 2018-11-13 08:10:57 -05:00
Alexander Bock
e57b064309 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-11-13 08:10:08 -05:00
Emil Axelsson
1632c09af3 Coordinate Axes 
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
 2018-11-13 08:09:14 -05:00
Alexander Bock
1d12c82cf9 Update Ghoul 2018-11-13 08:03:38 -05:00
Lovisa Hassler
0a0703aa82 fix merge conflict 2018-11-12 18:33:06 -05:00
Lovisa Hassler
5a49c66204 moved the color mapping to the asset files 2018-11-12 18:26:12 -05:00
Agnes Heppich
c3d031e6a5 reduced data struct, clean up 2018-11-12 18:14:32 -05:00
Agnes Heppich
2bdb7fece9 clean up 2018-11-12 18:05:37 -05:00
Agnes Heppich
9aefc203a3 ra dec translation 2018-11-12 17:30:33 -05:00
Emil Axelsson
989304835d Only update part of gui that was updated by CEF (#760) 2018-11-12 11:05:30 +01:00
Emil Axelsson
32226fe560 Use bin folder instead of cwd to find configuration file (#761) 2018-11-09 16:17:02 -05:00
Agnes Heppich
89e0b20cc4 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into 
thesis/2018/dsn merge
 2018-11-09 14:09:54 -05:00
Agnes Heppich
648e763abe rename dsnData 2018-11-09 14:09:24 -05:00
Lovisa Hassler
1f27da6778 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-09 12:30:19 -05:00