Commit Graph

10074 Commits

Author SHA1 Message Date
Malin E
c04bc24db9 Use new labels for billboards clounds 2022-09-02 14:54:01 +02:00
Malin E
a28814117e Use the new labels for the Constellations 2022-09-02 14:15:02 +02:00
Malin E
55a8d19935 Merge branch 'master' into feature/grid-labels 2022-09-02 13:26:17 +02:00
Malin E
c51c2ba12c Merge pull request #2213 from OpenSpace/feature/du-meshes-selection
Add ability to select constellations
2022-09-02 13:23:29 +02:00
Malin E
611bce55cd Fix capital letters in module define 2022-09-01 14:26:31 +02:00
Malin E
d76b3a902e Add generic Labels class 2022-09-01 14:15:20 +02:00
Malin E
bd5aceeff9 Fix RenderableLabel specification in assets 2022-08-31 17:07:51 +02:00
Malin E
14347cfaba Rename RenderableLabels to RenderableLabel
* Since it only creates one label and not several
2022-08-31 17:02:35 +02:00
Malin E
7b4b0ab202 Make the constellation lines data file a property 2022-08-31 13:44:31 +02:00
Malin E
719786452d Address some more PR commnets 2022-08-31 10:58:34 +02:00
Malin E
25782e25e9 Merge branch 'master' into feature/du-meshes-selection 2022-08-31 09:30:32 +02:00
Emma Broman
47b36e5036 Add multiply color to renderableorbitdisc 2022-08-30 13:06:14 +02:00
Malin E
fc27806acd Merge pull request #2214 from OpenSpace/issue/2194
Update the Ipac example asset
2022-08-30 11:52:07 +02:00
Malin E
dc55105000 Move loading of data error handling 2022-08-29 13:13:47 +02:00
Malin E
53b2d0e76c Address some more PR comments 2022-08-29 11:44:21 +02:00
Alexander Bock
3cf80e0fdc Linux compile fix 2022-08-29 08:09:33 +02:00
Malin E
41d52f7f04 Start addressing PR comments 2022-08-26 16:58:48 +02:00
Alexander Bock
664eb60f4f Increase the compile times by including more precompiled headers (#2217)
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Emma Broman
01eabd1b02 Consistent allocation of callback vectors 2022-08-26 09:13:02 +02:00
Malin E
bf0e2c3248 Merge branch 'master' into issue/2194 2022-08-25 14:38:55 +02:00
Malin E
40267804bd Some clean up 2022-08-25 13:48:48 +02:00
Malin E
b8f365e6de Name all constellations from the same source 2022-08-25 08:57:35 +02:00
Emma Broman
c7bf728be8 Fix interpolation parameter being out of range (closes #2211) 2022-08-25 08:44:31 +02:00
Malin E
a63a9c1ca9 Convert the extragalactic constellations to use new class 2022-08-24 16:56:54 +02:00
Malin E
6aef6ebde4 Merge branch 'master' into feature/du-meshes-selection 2022-08-24 15:02:18 +02:00
Malin E
49236e3a1a Update Ipac example asset to use actions 2022-08-24 12:02:39 +02:00
Emma Broman
06c1c13f78 Update compiler info to C++20 in readme 2022-08-23 13:54:57 +02:00
Alexander Bock
979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Alexander Bock
9ea284f6c6 Compile fix for MSVC 17.3 2022-08-22 14:17:04 +02:00
Malin E
5bdd3d0f8c Make the Constellations name file optional 2022-08-10 13:57:47 +02:00
Malin E
87a45e7376 Fix asset selection of constellations 2022-08-09 17:01:41 +02:00
Malin E
ceaf85f606 Some more cleanup 2022-08-09 14:28:16 +02:00
Malin E
844c4ffb84 Merge branch 'master' into feature/du-meshes-selection 2022-08-09 09:02:16 +02:00
Malin E
54dcdcf0f1 Some clean up 2022-08-09 08:54:41 +02:00
Ylva Selling
160eab1c1e Remove display copy properly. Close #2200 2022-08-08 17:23:44 -04:00
Ylva Selling
cfb4504f61 Clarify info for the the Dim In Atmosphere property 2022-08-08 16:22:28 -04:00
Malin E
8c01d536b6 Restore RenderableDUMeshes class 2022-08-05 17:01:12 +02:00
Malin E
6efb99e551 Fix constellation bounds render issue 2022-08-05 16:59:04 +02:00
Malin E
a2938c8384 Update label file cache format 2022-08-05 15:12:43 +02:00
Malin E
62aaa45ff5 Move file reading to initialize instead of constructor 2022-08-05 14:08:36 +02:00
Malin E
ca203c425a Merge branch 'master' into feature/du-meshes-selection 2022-08-05 13:19:09 +02:00
Malin E
94a85ec719 Fix constellation label rendering 2022-08-05 13:05:36 +02:00
Emma Broman
b0aedd1225 Update SGCT (for isGuiWindow check) 2022-08-05 11:50:10 +02:00
Emma Broman
0cc5704b6a Add isGuiWindow check for mouse and keyboard callbacks
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)

Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup

Now, the GUI modules check to see if the clicked window is actually an interaction window
2022-08-05 11:41:10 +02:00
Emma Broman
0161d514b7 Fix collision between ImGui and WebGui
The callbacks of WebGui (which is on top) now gets priority
2022-08-05 11:41:10 +02:00
Malin E
e98e9fe4a3 WIP initiali version of new constellation classes 2022-08-05 11:05:57 +02:00
Emma Broman
885eb74dc5 Update faulty description in DU asset for Open Star Clusters
Had the description for OB Associations. Changed to the correct one from the Digital Universe Data Profiles document
2022-08-02 14:25:59 +02:00
Malin E
9c39874efc Load spaeck file in initialize instead of initialiseGL 2022-08-02 14:05:39 +02:00
Malin E
39b8914917 Fix bug when constellations have several words in its name 2022-08-02 13:34:31 +02:00
Alexander Bock
811c4a3138 Add the ability to pass a boolean value into the require function that gets passed into the loaded asset as a enabled property (#2187)
* Add the ability to pass a boolean value into the require function that gets passed into the loaded asset as a `enabled` property
2022-08-02 13:12:07 +02:00