Commit Graph

4870 Commits

Author SHA1 Message Date
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
Ylva Selling
bd5f4119b7 Make it possible to create multiple render copies at once and spread them out evenly on the azimuth coordinate 2022-03-31 17:36:48 -04:00
Ylva Selling
233d000aea Make all animations depend on system time instead of fps. This will make the animations robust with low fps. Add easing functions. 2022-03-31 15:58:38 -04:00
Malin E
0bdf82f156 Merge branch 'master' into feature/jwst-update 2022-03-31 09:37:14 +02:00
Ylva Selling
badd2e2ff2 Create animation class to clean up animation code 2022-03-30 16:06:09 -04:00
Ylva Selling
4063a49297 Change browser and targets starting position. Make browser larger than target by default 2022-03-30 14:48:36 -04:00
Ylva Selling
0f81a738db Pass the image fov to the GUI 2022-03-30 11:17:13 -04:00
Malin E
8eb34d3209 Tiny clean up 2022-03-30 16:56:19 +02:00
Malin E
e6c56cd6d0 Merge branch 'master' into feature/horizons-framework 2022-03-30 13:52:03 +02:00
Alexander Bock
5ea93cdd7b Prevent crash in DashboardItemInstruments when using dates before 2000 (closes #1878). Remove the padding images from New Horizons that screw up the instruments timing 2022-03-30 10:45:01 +02:00
Ylva Selling
85f3ac4bd9 Add check for if image data folder is empty. This fixes issue #1933 2022-03-29 18:03:06 -04:00
Ylva Selling
7781c7c10d Fix issue with roll and right-click drag. This fixes issue #1932 2022-03-29 16:18:01 -04:00
Ylva Selling
90e1b05b76 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-03-29 14:35:11 -04:00
Micah Acinapura
8dd7bd9314 update cef and a few calls for it (#1916)
* update cef and a few calls for it

* fixing ref ptf for cef

* fixes for macos cef update; fixes #1114

* roll back cef version to 91

* remove print from cmake
2022-03-29 13:09:13 -04:00
Alexander Bock
acfb5d76ef Fix error introduced in the Lua function codegen update that accidentally changed some function names 2022-03-29 17:31:48 +02:00
Malin E
134a9056a9 Enable depth testing for renderable labels, fixes #1915 2022-03-29 15:46:36 +02:00
Emma Broman
f7d3d3bad1 Fix problems with precision of new bounding spheres
glm::length => squared computation => we need the double precision in the computation. Got bounding sphere values of "inf" for a few large renderables (the DU grids)...
2022-03-28 19:53:14 +02:00
Ylva Selling
ef79b73ec5 Merge branch 'feature/cef-update' into thesis/2021/skybrowser 2022-03-28 13:38:14 -04:00
Emma Broman
3c4f13c650 Add bounding spheres to a bunch of renderable types (#1957)
*  RenderabeDUMeshes (And reimplement reading of vertex info from speck, to make it easier to compute sphere. The plan is to phase out this renderable anyways)

* RenderablePoints

* Grids: RenderableGrid, RenderableBoxGrid, RenderableRadialGrid & RenderableSphericalGrid

* RenderableGalaxy
2022-03-28 16:10:56 +02:00
Malin E
109c52f33d Make it clear to the user when a horizons file was failed to be read 2022-03-28 12:56:03 +02:00
Ylva Selling
82ae56ee88 Fix the "hideChromeInterface" call (will work as soon as the server wwt dist is updated) 2022-03-25 17:11:16 -04:00
Ylva Selling
0df6261fa0 Make fovs doubles instead of floats and use the target as for the roll calculation instead of the camera. This is however still not correct (need the up vector for the target) 2022-03-25 16:54:44 -04:00
Ylva Selling
50d509b294 Correct the rendering of the fov (was too large) 2022-03-25 16:52:21 -04:00
Malin E
45ed5b6e69 Some optimization on Horizons reading and writing 2022-03-25 16:31:27 +01:00
Micah
ecfc9975eb roll back cef version to 91 2022-03-24 11:00:48 -04:00
Micah Acinapura
3ec6d84b89 fixes for macos cef update; fixes #1114 2022-03-23 22:32:08 -04:00
Ylva Selling
680cdc4b8f Move the hover circle with lua script instead of C++ code to make it work in a dome environment 2022-03-23 18:46:19 -04:00
Ylva Selling
33ddd94426 Fix issues with fading by using the system time instead of fps 2022-03-23 18:45:57 -04:00
Ylva Selling
aed059a147 Fix precision issue that led to nan values. This fixes #1934 2022-03-23 16:19:10 -04:00