Commit Graph

6614 Commits

Author SHA1 Message Date
Lovisa Hassler
07cc8d4a4f Working distance label 2020-01-09 12:19:59 +01:00
Lovisa Hassler
4ffc5595d9 WIP inheriting from renderablelabels 2020-01-09 09:59:38 +01:00
Lovisa Hassler
fb2ae7f18a Setup vislab module 2020-01-08 16:48:57 +01:00
Lovisa Hassler
b2861183ae Distance label hack, needs cleanup and replacement 2019-12-20 10:15:12 +01:00
Lovisa Hassler
0d00b6d9a5 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into project/spvl 2019-12-16 13:59:55 +01:00
liuloppan
04bd649bfe Update to use pluto_globelabels
Update to use the renamed filename
2019-12-16 13:50:44 +01:00
Alexander Bock
cf9bcec95d Merge pull request #1029 from OpenSpace/feature/FadeSatelliteTrails
Feature/fade satellite trails
2019-12-16 11:38:43 +01:00
Alexander Bock
f90fe90aae Also include Pluto in the change of labels to globelabels 2019-12-16 11:34:41 +01:00
Alexander Bock
d58df51cc5 Merge pull request #1025 from OpenSpace/feature/planetlabels
Feature/planetlabels
2019-12-16 11:04:21 +01:00
Alexander Bock
4f2883034b Rename labels assets to globe_labels 2019-12-16 10:51:38 +01:00
Alexander Bock
bfc2da3475 Make a defaut keybind for toggling the labels 2019-12-16 10:38:10 +01:00
Alexander Bock
dfa25b28e6 Disable labels on default
Some small code cleanup
2019-12-16 10:26:42 +01:00
Alexander Bock
c3b1e938e8 Merge pull request #1024 from OpenSpace/issue/1019
Issue/1019 - Fixed rotation matrices in touch
2019-12-16 10:12:02 +01:00
Alexander Bock
2f1805b651 Some general cleanup of the code 2019-12-16 10:09:41 +01:00
Alexander Bock
92517d4316 Merge pull request #1012 from OpenSpace/feature/FastVolume
Feature/fast volume
2019-12-16 09:52:00 +01:00
Alexander Bock
cf3a641103 Some small cleanup
Remove virtual attribute from some of the raycaster functions
2019-12-16 09:50:34 +01:00
Lovisa Hassler
c4a3293c81 Merge remote-tracking branch 'origin/feature/planetlabels' into project/spvl 2019-12-15 16:07:35 +01:00
Lovisa Hassler
82eec4efc4 Merge 2019-12-13 19:53:53 +01:00
Lovisa Hassler
b2d2039dc2 Trail fading for satellites and debris 2019-12-13 19:04:06 +01:00
Gene Payne
99c995565b Fix for issue 1023: prevents crash when using satellites and changing segments property, and fixes rendering errors. (#1028) 2019-12-13 07:47:05 -07:00
Jonathas Costa
a8d65e5456 Merge pull request #987 from OpenSpace/issue/981
Issue/981 - Star Rendering Cuts
2019-12-12 12:39:44 -05:00
GPayne
bc7d973e90 Fix for issue 1023: prevents crash when using satellites and changing segments property, and fixes rendering errors. 2019-12-11 16:03:55 -07:00
Jonathas Costa
cca438262b Merge branch 'feature/venusatm' 2019-12-11 16:35:11 -05:00
Jonathas Costa
fba204a51f Added Venus atm. 2019-12-11 15:59:26 -05:00
Jonathas Costa
016d314cf9 Merge branch 'master' into feature/FastVolume 2019-12-11 15:44:58 -05:00
Jonathas Costa
87b79c1d8c Merge branch 'master' into feature/planetlabels 2019-12-11 15:38:28 -05:00
Jonathas Costa
5509fb0a6b Added more units to refine fading controls. Updated Sun fading values. 2019-12-11 15:38:11 -05:00
Gene Payne
3e23e4323c Feature/venus magellan (#1020)
* Updated Venus asset and added wms for Magellan mosaic imagery

* Adding Magellan height layer
2019-12-11 13:30:52 -07:00
Mikael Pettersson
69fb1eec20 Fixed edge case and cleanup
Fixed picking edge case, where we now will sort our elements as before
Also used another ray-sphere intersect fn as we did not use everything
from the other one.
2019-12-11 09:56:45 +01:00
Jonathas Costa
140de3d808 Added automatic documentation and Sun's label. 2019-12-10 12:55:58 -05:00
Mikael Pettersson
43296979d8 Fixed rotation matrices in touch
Fixed rotation matrices in the touchmodule, while at it I also moved out
the lev-marq solver from the touchinteraction.cpp to its own file, in an
effort to make the code lighter to read.

Also changed some logic in how touch intersection is made with the
scenenodes.
2019-12-10 15:15:52 +01:00
liuloppan
9a50b27b27 Update frontend hash
Updated to latest frontend hash
2019-12-09 18:01:59 +01:00
Jonathas Costa
6432f484c4 Changed to accpet text label updating. Added super-fine controls for fading effects. 2019-12-08 18:44:08 -05:00
Jonathas Costa
63470f03ec Merge branch 'master' into feature/planetlabels 2019-12-08 14:51:39 -05:00
Jonathas Costa
cce620a663 Merge branch 'master' into feature/FastVolume 2019-12-08 14:51:00 -05:00
Stefan Seibert
a66e872e4e Improvements in Performance due to adopted usage of CEF Message Loop (#1017)
* Changing the way how we pump the CEF update loop to improve performance

* Updated Intervall description
2019-12-04 10:01:35 +01:00
Emil Axelsson
ede1a9dd42 Use a StaticTranslation to position the Milky Way (#1007) 2019-12-04 09:48:35 +01:00
liuloppan
386ce8bec6 Feature/nodelines (#1013)
* Setup line render between Mars and Earth

* Updating property handling

* Precision fix

* Cleanup and making functions and variables private

* Adding linewidth property

* Using opacity property for line color

* Cleanup from review
2019-12-02 15:10:11 +01:00
Mikael Pettersson
a33057d830 Feature/integrated touchserver (#1015)
* WINDOWS: Touch server integrated into module

The touch server functionality has been integrated into the touch module
which is enabled by-default when the touch module is used on a windows
build.
The touch-hook checks for a connected digitizer (pen or touchscreen, but
I haven't tested pen)

This commit should also fix two potential low-risk race conditions in
the tuioear.cpp file.

* Added comment regarding which window we use

* Added copyright notice on the win32_touch files

Also changed from #pragma to #ifndef

* Fixes based on review

- Added anonymous namespace
- Put win32hook in openspace namespace
- Fixed indentations and linebreaks
- Fixed an issue regarding global state deinitialization
2019-12-02 14:09:15 +01:00
Jonathas Costa
e2e86c12ab Ops. Cleaning depth buffer now. 2019-11-26 17:07:27 -05:00
Jonathas Costa
53595ba045 Merge branch 'master' into issue/981 2019-11-26 11:14:15 -05:00
Jonathas Costa
60813e3209 Final version with volume depth interpolation. 2019-11-26 11:06:39 -05:00
Jonathas Costa
ef2d14d7fa Changed default label's orientation. 2019-11-25 13:30:39 -05:00
Jonathas Costa
dfb08b98e5 Removed unused code. 2019-11-25 13:15:31 -05:00
Jonathas Costa
747e699d5f Added other planets. 2019-11-25 13:10:11 -05:00
Jonathas Costa
c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05:00
Jonathas Costa
aaa73415e9 Final touches in MW volume. 2019-11-13 15:36:13 -05:00
Jonathas Costa
caa02ca20a Clean up. Added the raycasting number of steps as a slider for user's control. 2019-11-12 17:19:23 -05:00
Jonathas Costa
b0ad104bc8 Merge branch 'master' into feature/FastVolume 2019-11-12 13:16:27 -05:00
Jonathas Costa
7e8cae4a51 Improved volume border color. 2019-11-11 14:48:35 -05:00