mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 00:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,998 Commits 84 Branches 48 Tags
787e91a892c8bc74fa1cd668b5913d2b92984182
Commit Graph

312 Commits

Author SHA1 Message Date
Ylva Selling 787e91a892 Merge remote-tracking branch 'origin/master' into feature/getting-started-tour 2022-07-21 12:26:20 -04:00
Alexander Bock 1a052f3c8c Update to C++20 2022-07-19 15:42:31 +02:00
Alexander Bock 173b22c7d2 Remove compiler warnings 2022-07-19 10:20:11 +02:00
Ylva Selling 5ed02f9dd8 Merge branch 'master' into feature/getting-started-tour 2022-07-12 15:09:00 -04:00
Emma Broman e44d5e0b39 Disable hover circle per default when setting renderable (fixes #2153) 
and throw warning if setting to non-existing node
 2022-06-30 11:57:41 +02:00
Ylva Selling b6e4f6dcaf Merge branch 'master' into feature/getting-started-tour 
# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp
 2022-06-29 05:21:45 -04:00
Ylva Selling bcb5c7bd28 Merge branch 'master' into feature/gamma-correction 2022-06-29 04:21:46 -04:00
Alexander Bock 9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163) 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
 2022-06-28 00:46:01 +02:00
Ylva Selling d23969b8d3 Add gamma correction to screen space renderable (SSR) shader, property for SSR and default value gamma = 2.2 for sky browser display copies 2022-06-21 10:47:44 -04:00
Ylva Selling c9a63274a8 Move presync callback functionality from SkyBrowserModule to ServerModule in order to expose the functionality to other topics as well 2022-06-01 15:06:40 -04:00
GPayne 243f6d3ada Fixes gcc error with missing 'template <>' headers on specializations 2022-05-13 11:30:40 -06:00
Alexander Bock b136a3a308 Fix of bug that images don't load after reload sometimes (#2090) 
Co-authored-by: Ylva Selling <ys5140@nyu.edu>
 2022-05-06 17:48:29 -04:00
Ylva Selling 4aa317ec6d Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-05-05 14:58:12 -04:00
Emma Broman 3ebb439d72 Add documentations and remove unused input argument 2022-05-05 18:26:05 +02:00
Ylva Selling 8474116a48 Rename getPair function to pair 2022-05-05 11:18:25 -04:00
Ylva Selling da4f1026ce Remove doxygen style comments for the lua functions 2022-05-05 09:59:37 -04:00
Ylva Selling 18cc19416d Add lua function for stopping animations 2022-05-04 16:13:44 -04:00
Ylva Selling ae6f59c8c3 Add parameters to sky browser module in internal initialize 2022-05-04 13:10:49 -04:00
Ylva Selling 28393a9523 Rename RenderCopy to DisplayCopy 2022-05-04 13:00:25 -04:00
Ylva Selling 323fea8ec6 Make resizing of gui window only affect the browser ratio, not the scale 2022-05-04 12:40:21 -04:00
Ylva Selling d3a955e6be Add scale to topic 2022-05-04 12:27:44 -04:00
Ylva Selling 9a49966fb6 Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-05-03 10:51:19 -04:00
Ylva Selling 00cc4fc0f1 Cleanup - remove unused variables and highlight 2022-05-03 10:51:00 -04:00
Emma Broman 7a05c44ce1 Update some property names for more consistent capitalization 2022-05-03 15:29:03 +02:00
Ylva Selling 7c3e47df09 Merge remote-tracking branch 'origin/master' into feature/skybrowser 2022-04-29 18:03:06 -04:00
Ylva Selling 83bcbfb74f Add property to show and hide display copies 2022-04-29 15:51:15 -04:00
Ylva Selling cb766f8f96 Add WorldWide Telescope image collection url as property to sky browser module 2022-04-29 14:42:13 -04:00
Ylva Selling db7c5ee23f Add property to set space craft animation time 2022-04-29 11:05:36 -04:00
Ylva Selling 89bd33d7eb Store opacities for the selected images and pass to GUI in topic 2022-04-29 10:50:45 -04:00
Ylva Selling 53f19a6aa8 Cleanup - remove remnants from mouse interaction code 2022-04-28 11:55:10 -04:00
Ylva Selling 8aec879677 Fix bug with creating a target with an identifier that already exists 2022-04-28 11:54:43 -04:00
Ylva Selling 4692c4d74b Fix comments on pull request 2022-04-28 11:33:54 -04:00
Emma Broman 19507981b4 Make skybrowser a default module (issue #2052) 2022-04-28 14:35:07 +02:00
Emma Broman 8896b92f82 Only send skybrowser topic message if data changed 
Maybe a little ugly to check the jsonString, but it does the job for now. Later we should probably make a nicer implementation
 2022-04-28 12:40:52 +02:00
Emma Broman 9d0e9c84d4 Removed some unused functions 2022-04-28 11:35:36 +02:00
Ylva Selling c998fc5439 Add check to make sure browser is intialized before passing messages to wwt. This removes error messages upon startup 2022-04-27 17:20:27 -04:00
Ylva Selling f89301a70a Move check for image collection is loaded in order to improve interaction 2022-04-27 17:13:24 -04:00
Ylva Selling 673b7f2325 Create property in module for inverse zoom direction 2022-04-27 17:00:31 -04:00
Ylva Selling 6605bfcd07 Create property in sky browser module for hiding the targets and browsers when minimizing gui 2022-04-27 16:44:14 -04:00
Emma Broman b7256a2c27 Fix typo 2022-04-27 19:35:58 +02:00
Emma Broman d8313eebe0 Add property to hide SkyBrowser title and hide per default 2022-04-27 19:19:46 +02:00
Emma Broman de68e406b0 Send topic on presync instead of from itmemanager (closes #2037) 2022-04-27 18:20:51 +02:00
Ylva Selling fc10f627cf Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-04-27 10:44:32 -04:00
Ylva Selling 8ba2976859 Update image collection 2022-04-27 10:44:19 -04:00
Emma Broman 1116e092b6 Mini refactor 2022-04-27 16:03:31 +02:00
Ylva Selling 939dfae319 Add lua function to dispatch point spacecraft event 2022-04-26 18:39:31 -04:00
Ylva Selling 62222c2f5b Add descriptions of lua functions 2022-04-26 17:39:38 -04:00
Ylva Selling 24b6383afb Create lua function to show or hide all targets and browsers 2022-04-26 17:37:05 -04:00
Ylva Selling a2d5aae21a Merge branch 'feature/skybrowser' of https://github.com/OpenSpace/OpenSpace into feature/skybrowser 2022-04-26 14:39:09 -04:00
Ylva Selling 19103a1540 Add browser ratio to the skybrowser topic 2022-04-26 14:37:35 -04:00