Commit Graph

4899 Commits

Author SHA1 Message Date
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
Malin E
84df643b86 Merge pull request #2047 from OpenSpace/issue/1989
Issue/1989
2022-04-29 17:35:17 +02:00
Marco Silva
4499e783b0 wrong var was used for drawBuffer 2022-04-28 13:51:18 +01:00
Emma Broman
19507981b4 Make skybrowser a default module (issue #2052) 2022-04-28 14:35:07 +02:00
Malin E
046213dd31 Merge branch 'master' into issue/1989 2022-04-28 10:04:57 +02:00
Malin E
860d4c30d2 Address PR comments + fix issue with refocus button on joysticks 2022-04-27 10:49:17 +02:00
Malin E
966cbf8e66 Merge branch 'master' into issue/1964 2022-04-26 10:55:54 +02:00
Emma Broman
92eefa8189 Add enabled property to Exoplanets and Skybrowser module (#1945)
* Add enabled property to exoplanets and sky browser module

* Create assets for default settings and restructure assets into a components folder

* Update exoplanets data

* Set sky browser enabled to true per default and include hover circle asset

* Add name and description of hover circle, and used synced version of ring image
2022-04-25 15:10:08 +02:00
ElonOlsson
c82101ffcf Merge pull request #2040 from OpenSpace/issue/1994
interaction sphere and brightness/opacity fixes. (Closes #1994)
2022-04-22 09:53:16 -04:00
ElonOlsson
db96faf2af typo 2022-04-22 09:52:03 -04:00
Malin E
9babbb7014 Address PR comments 2022-04-22 15:07:23 +02:00
ElonOlsson
cf6e50d166 interaction sphere and brightness/opacity fixes. (Closes #1994) 2022-04-21 13:03:26 -04:00
Alexander Bock
dd272ddf3c Move the disabling of the touch module to the beginning of the PreSync function to hopefully prevent errant inputs 2022-04-21 11:54:19 +02:00
Malin E
497314668a Apply color map also outside data range 2022-04-21 11:30:06 +02:00
Malin E
6ec1a56c6a Merge branch 'master' into issue/1964 2022-04-21 09:03:28 +02:00
Malin E
425b771d8d Fix issue with imgui joystick sliders being coupled
* The identifiers for the gui components were not unique, now they are
2022-04-20 13:30:17 +02:00
Malin E
0bf1fa3845 Merge branch 'master' into issue/1989 2022-04-19 11:33:18 +02:00
Alexander Bock
989f7143fa Prevent a crash when running in Debug mode, Make the RenderableFluxNodes check all files first before failing 2022-04-17 16:57:48 +02:00
Alexander Bock
5751fe26d3 Cleanup handling of warnings (#2030) 2022-04-16 20:57:29 +02:00
ElonOlsson
6a51d3c748 brightness multiplied by fade and opacity 2022-04-15 10:42:48 -04:00
ElonOlsson
ab6f10e423 .0 for float 2022-04-14 16:55:54 -04:00
ElonOlsson
89dd91a40a fix opacity issue with volume rendering, opacity changed to brightness in raycaster 2022-04-14 16:11:38 -04:00
Malin E
7165eeb8e1 Remove cap on number of axes and buttons for joysticks 2022-04-14 13:58:34 +02:00
Alexander Bock
d360f2ae59 Address Visual Studio analyzer warnings 2022-04-12 00:58:11 +02:00
Alexander Bock
99d2bddf7c Address coding style and remove compiler warnings in many places 2022-04-11 18:31:45 +02:00
Alexander Bock
c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02:00
Micah Acinapura
5917ac598a Feature/location measure (#1987)
* wip commit for measuring

* wip;fixing for codegene change

* adding asset file

* clean up comments

* pr comment cleanup
2022-04-08 14:13:23 -04:00
sylvass
15def75dc3 Merge pull request #1894 from OpenSpace/thesis/2021/skybrowser
Thesis/2021/skybrowser
2022-04-08 12:12:01 -04:00
Ylva Selling
c9bbb4a533 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	include/openspace/rendering/screenspacerenderable.h
#	src/rendering/screenspacerenderable.cpp
2022-04-08 11:46:09 -04:00
Ylva Selling
9e86447b85 Remove mouse interaction for skybrowser and make default position of the skybrowser to be outside of the normal field of view 2022-04-08 11:43:32 -04:00
Malin E
5121495702 Merge branch 'master' into feature/jwst-update 2022-04-08 17:24:16 +02:00
Malin E
5a1e330024 Merge branch 'master' into feature/horizons-framework 2022-04-08 17:16:50 +02:00
Malin E
9dab943999 PR comments 2022-04-08 16:49:48 +02:00
Alexander Bock
53d34c8dfe Add documentation to RenderablePlaneProjection, remove unused parameters 2022-04-08 13:39:54 +02:00
Malin E
46aec2c63c Move static functions in HorizonsFile to be free functions + PR comments 2022-04-08 11:41:16 +02:00
Ylva Selling
1f8b31bab3 Update so that WWT is loaded in the gui 2022-04-07 16:28:17 -04:00
Malin E
45c776b7ba Address PR comments 2022-04-07 13:22:06 +02:00
Malin E
8dcd950ce2 Address more PR comments 2022-04-07 11:14:23 +02:00
Malin E
af0a6d61cb Clean up fmt::format useage 2022-04-07 09:34:52 +02:00
Malin E
7d04fee0ab Address more PR comments 2022-04-06 17:27:26 +02:00
Malin E
df46bcfcc1 Merge branch 'master' into feature/jwst-update 2022-04-06 13:37:17 +02:00
Alexander Bock
02adcf570e Add a hidden "Fade" property that modifies the effective opacity to enable other functionality (closes #1970) 2022-04-05 23:53:33 +02:00
Ylva Selling
68b19ba703 Remove non ascii characters before printing info message. Fix issue #1917 2022-04-05 15:58:07 -04:00
Ylva Selling
f6763eeeeb Merge branch 'master' into thesis/2021/skybrowser
# Conflicts:
#	modules/webbrowser/CMakeLists.txt
2022-04-04 16:14:50 -04:00
Ylva Selling
1eb4fc5879 Change lua function to be set with "setPropertyValueSingle" instead 2022-04-04 10:16:51 -04:00
Ylva Selling
f14e482ff1 Create lua function to move render copies 2022-04-01 17:06:51 -04:00
Malin E
f68e735e6d Address more PR comments 2022-04-01 16:15:06 +02:00
Malin E
d3528c3342 Address some PR comments 2022-04-01 14:51:50 +02:00