Commit Graph

5001 Commits

Author SHA1 Message Date
Malin E
d5b94ec935 Merge branch 'master' into issue/1607 2022-06-28 13:26:25 +02:00
Malin E
d130682d43 Add interpolation for TimelineRotation
* Same way as TimelineTranslaiton already have
2022-06-28 10:43:58 +02: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
Alexander Bock
d6dd157591 Adapt the ImGui GIBS panel to the new tileprovider format (closes #2108) 2022-06-18 19:05:53 +02:00
Gene Payne
e6bbcbbd02 Fix for Linux GNU Make build problem with CEF (#2123)
* Linux CEF Helper removes space in filename but re-adds space post-build

* Call lua helper functions from session recording to match node names

* Revert "Call lua helper functions from session recording to match node names"

This reverts commit f052f58776, which was
accidentally made to the wrong branch.

* Restrict the CEF Helper file renaming fix to GNU Make builds only

* Typo fix
2022-05-25 11:42:20 -06:00
Emma Broman
aac510f860 Make it possible to individually set the base radius for RenderablePrism shape
The prism can now be a cone, a pyramid, or any other weird shape that you might want!
2022-05-20 17:24:24 +02:00
Gene Payne
c18c554c2b Merge pull request #2113 from OpenSpace/issue/1479
Fixes for WebGUI Running on Linux OpenSpace
2022-05-18 10:39:52 -06:00
Gene Payne
7893210eff Removed superfluous X11 error handler code in CEF process helper 2022-05-16 15:09:03 -06:00
GPayne
77833f86fd Added CMake copy of CEF resource files to avoid linux CEF runtime error 2022-05-15 13:59:15 -06:00
GPayne
ecef586883 Use relative paths for CMake webbrowser module helper 2022-05-14 22:25:23 -06:00
GPayne
8e699790d4 Adjust linker order to link CEF libraries after webgui modules 2022-05-14 19:53:48 -06:00
Gene Payne
db2d2b85d0 Disable CEF sandbox and force module libs to be dependent on CEF libs 2022-05-13 12:25:53 -06:00
GPayne
243f6d3ada Fixes gcc error with missing 'template <>' headers on specializations 2022-05-13 11:30:40 -06:00
GPayne
6af8c004e0 Merging master in to sync with new release 2022-05-12 14:59:15 -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
ElonOlsson
9f463ed09f a new profile for the 2012 solar storm event, with looping hotkeys (#2071)
* a new profile for the 2012 solar storm event, with looping hotkeys

* added interaction spheres, profile cleanup + better discription

* better actions and moved to assets instead of in profile

* Set unique names for the different fieldline data synchronizations

* single dataset in sequence now rendered before its associated timestamp

* fix read access violation + added redundancy

* load at start up instead of on runtime

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2022-05-06 10:23:45 -04:00
Micah Acinapura
bdda36b41e Protect against crash when changing colormaps (#2082) 2022-05-06 08:52:32 -04:00
Alexander Bock
9715d22af0 Include the version number in the uid of the HttpSynchronization (closes #2081) 2022-05-06 00:53:56 -07:00
Alexander Bock
2816ad4d8d Make the connection a shared_ptr and let the LuaScriptTopic return lambda keep a copy of it (closes #1940) 2022-05-06 00:32:25 -07:00
Alexander Bock
452cc9b739 Merge pull request #2050 from OpenSpace/feature/skybrowser
Feature/skybrowser
2022-05-05 14:00:58 -07:00
Micah Acinapura
43c674a64e Change RenderOption to RenderMode for RenderableGaiaStars (#2078) 2022-05-05 13:26:41 -07: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
Emma Broman
679e2994f3 FixedRotation that depends on other nodes now updates correctly even if time is paused (#2069)
* Update fixed rotation every frame if it depends on another sgn (closes #1751)

This guards against any weird edge cases, where a node the rotation depends on is moved independently of simulation time

* Fix faulty indentation
2022-05-05 09:39:17 +02:00
Emma Broman
9a18e6f9ab Add missing codegen::color check 2022-05-05 08:52:57 +02:00
ElonOlsson
9bdc9af3de small fix with reading from file of seedpoints 2022-05-04 21:01:54 -07:00
Alexander Bock
bc2466f116 Don't convert the Period of the RenderableTrailOrbit to seconds when extracting the value from the asset file (closes #1860) 2022-05-04 20:15:27 -07:00
Ylva Selling
18cc19416d Add lua function for stopping animations 2022-05-04 16:13:44 -04:00
ElonOlsson
510e2795de small fix with reading from file of seedpoints 2022-05-04 15:57:39 -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
ce555ebacc Merge remote-tracking branch 'origin/master' into feature/skybrowser 2022-05-04 12:42:22 -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
ElonOlsson
ce0c1737e0 Feature/2012 fieldlines (#2042)
* Added 2012 July solar storm event assets + renderer improvement

* solving unzipping issues

* flow properties added
2022-05-04 10:53:03 -04:00
Emma Broman
89908d8890 Bring back the opacity of RenderableOrbitalKepler
And some other properties that seems to have been accidentally removed in 9e69300642
2022-05-04 11:35:56 +02: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
Alexander Bock
0c04236993 Report correct line number when encountering errors in Speck loading; Correctly parse NaN values in Speck file (closes #2054) 2022-05-02 14:59:46 -04:00
Emma Broman
5362c58db6 Define that server module depends on skybrowser 2022-05-02 10:13:26 +02:00
Emma Broman
0f0313972e Merge branch 'master' into feature/skybrowser 2022-05-02 10:09:06 +02:00
Emma Broman
06ea668225 Prevent crash from using colormap without entries
Can happen if all colormap variables were set, but the file didn't exist or couldn't be loaded
2022-05-02 09:51:26 +02:00
Alexander Bock
cf582054dc Update to the RenderableBIllboardCloud
- Add the color mapping to the DU Quasar dataset  (closes #1584)
 - Add the ability to turn off a colormap
 - Add the ability to change the static color even when a colormap is present
2022-04-30 15:33:43 +02:00
Alexander Bock
69c8750921 Feature/imgui (#2060)
* Some cleanup of the ImGUI code
* Reorder the panels
* Make StringPropertys work without losing value on context loss
* Add a new ImGui compoment that shows the status of the scene graph
2022-04-30 13:54:36 +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