Malin E
202cf4b5b6
Fix opacity issue with model vs trails + small clean up
2022-10-06 11:41:15 +02:00
Malin E
11981138f8
Move Model to render bin Post deffered if transparent
2022-10-06 09:53:25 +02:00
Malin E
c5f6f72b77
Fix depth issues
2022-10-04 14:34:36 +02:00
Malin E
115d4f4f81
Fix issue with starts dissapearing
2022-09-27 15:08:53 +02:00
Malin E
5c3838f335
WIP Model is visible
...
* Opacity issues
* "Clearing" issues
2022-09-27 14:45:22 +02:00
Malin E
eac9f9fc50
Merge branch 'master' into feature/model-opacity
2022-09-27 09:22:41 +02:00
Alexander Bock
f502922338
CMake cleanup ( #2246 )
...
* Simplification of the DLL copying mechanism on Windows
* Only deploy Qt on Windows
* Use set_target_properties function
2022-09-21 10:52:05 +02:00
Gene Payne
ae84f1b120
Renderable prop change updates buffers without reinitializing GL ( #2241 )
2022-09-20 15:40:12 -06:00
Emma Broman
57dc7dd6b8
Add some missing includes
2022-09-16 08:18:54 +02:00
Malin E
3b5c3c51d6
Fix OpenGL error for model opacity shader program
2022-09-14 16:52:58 +02:00
Malin E
77beb4c3af
WIP First attempt at a solution
2022-09-14 14:36:33 +02:00
Gene Payne
7946a93ee5
Fix for linux crashing when reading OMM files
...
Linux doesn't use the '\r' line ending, so it doesn't recognize a line with only '\r' as being empty.
2022-09-13 16:10:03 -06:00
Malin E
75fd08246c
Switch from floats to doubles for the grids
...
* Avoids jittering problems when close to SSB
2022-09-08 09:41:00 +02:00
Malin E
0055d331f2
Merge branch 'master' into feature/grids-update
2022-09-07 16:22:39 +02:00
Malin E
bb638faf10
Move the scaling into the size parameter of the grids
2022-08-31 13:58:08 +02:00
Malin E
7b4b0ab202
Make the constellation lines data file a property
2022-08-31 13:44:31 +02:00
Malin E
a095c62579
Merge branch 'master' into feature/grids-update
2022-08-31 11:00:19 +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
Malin E
0ce7874b90
Address more PR comments
2022-08-31 09:10:18 +02:00
Malin E
f247b500c0
Address some more PR comments
2022-08-30 18:03:47 +02:00
Emma Broman
47b36e5036
Add multiply color to renderableorbitdisc
2022-08-30 13:06:14 +02:00
Malin E
3e142e5f2f
Change default to not use highlight in grids
2022-08-29 13:57:40 +02:00
Malin E
4b88c5d308
Merge branch 'master' into feature/grids-update
2022-08-29 13:22:57 +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
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
Malin E
d1259c83a2
Small clean up
2022-08-26 14:10:02 +02:00
Malin E
767f6aa547
Use highlight feature on large grids
2022-08-26 13:46:33 +02:00
Malin E
7427544243
Add initial version of highlight feature
...
* Note that it currently does not work well if the number of segments are odd
2022-08-26 11:22:47 +02:00
Malin E
40267804bd
Some clean up
2022-08-25 13:48:48 +02:00
Malin E
6aef6ebde4
Merge branch 'master' into feature/du-meshes-selection
2022-08-24 15:02:18 +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
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
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
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
Malin E
9c39874efc
Load spaeck file in initialize instead of initialiseGL
2022-08-02 14:05:39 +02:00