fdfad19476
Coding style fixes
2019-12-16 11:27:53 +01:00
d6bdc2519e
Merge remote-tracking branch 'origin/master' into feature/RingShadows
...
# Conflicts:
# data/assets/scene/solarsystem/planets/saturn/saturn.asset
2019-12-16 11:09:47 +01:00
d58df51cc5
Merge pull request #1025 from OpenSpace/feature/planetlabels
...
Feature/planetlabels
2019-12-16 11:04:21 +01:00
4f2883034b
Rename labels assets to globe_labels
2019-12-16 10:51:38 +01:00
bfc2da3475
Make a defaut keybind for toggling the labels
2019-12-16 10:38:10 +01:00
dfa25b28e6
Disable labels on default
...
Some small code cleanup
2019-12-16 10:26:42 +01:00
c3b1e938e8
Merge pull request #1024 from OpenSpace/issue/1019
...
Issue/1019 - Fixed rotation matrices in touch
2019-12-16 10:12:02 +01:00
2f1805b651
Some general cleanup of the code
2019-12-16 10:09:41 +01:00
92517d4316
Merge pull request #1012 from OpenSpace/feature/FastVolume
...
Feature/fast volume
2019-12-16 09:52:00 +01:00
cf3a641103
Some small cleanup
...
Remove virtual attribute from some of the raycaster functions
2019-12-16 09:50:34 +01:00
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
a8d65e5456
Merge pull request #987 from OpenSpace/issue/981
...
Issue/981 - Star Rendering Cuts
2019-12-12 12:39:44 -05:00
cca438262b
Merge branch 'feature/venusatm'
2019-12-11 16:35:11 -05:00
fba204a51f
Added Venus atm.
2019-12-11 15:59:26 -05:00
6e4c7c0329
Merge branch 'master' into feature/RingShadows
2019-12-11 15:46:07 -05:00
016d314cf9
Merge branch 'master' into feature/FastVolume
2019-12-11 15:44:58 -05:00
87b79c1d8c
Merge branch 'master' into feature/planetlabels
2019-12-11 15:38:28 -05:00
5509fb0a6b
Added more units to refine fading controls. Updated Sun fading values.
2019-12-11 15:38:11 -05:00
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
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
140de3d808
Added automatic documentation and Sun's label.
2019-12-10 12:55:58 -05:00
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
9a50b27b27
Update frontend hash
...
Updated to latest frontend hash
2019-12-09 18:01:59 +01:00
6432f484c4
Changed to accpet text label updating. Added super-fine controls for fading effects.
2019-12-08 18:44:08 -05:00
63470f03ec
Merge branch 'master' into feature/planetlabels
2019-12-08 14:51:39 -05:00
cce620a663
Merge branch 'master' into feature/FastVolume
2019-12-08 14:51:00 -05:00
b41edb9c02
Added more control over shadow generation. Added documentation. Merged Master.
2019-12-08 14:50:19 -05:00
10c1ff03e9
Merge branch 'master' into feature/RingShadows
2019-12-08 14:40:23 -05:00
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
ede1a9dd42
Use a StaticTranslation to position the Milky Way ( #1007 )
2019-12-04 09:48:35 +01:00
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
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
e2e86c12ab
Ops. Cleaning depth buffer now.
2019-11-26 17:07:27 -05:00
099488106a
Fixed issues in Shadows and improved quality.
2019-11-26 16:13:46 -05:00
53595ba045
Merge branch 'master' into issue/981
2019-11-26 11:14:15 -05:00
60813e3209
Final version with volume depth interpolation.
2019-11-26 11:06:39 -05:00
ef2d14d7fa
Changed default label's orientation.
2019-11-25 13:30:39 -05:00
dfb08b98e5
Removed unused code.
2019-11-25 13:15:31 -05:00
747e699d5f
Added other planets.
2019-11-25 13:10:11 -05:00
c6b460ab74
Added planet label rendering. Added Earth's label.
2019-11-22 18:11:49 -05:00
74c754d923
Viewing Map.
2019-11-15 17:32:43 -05:00
7a893e04c5
Merge branch 'master' into feature/RingShadows
2019-11-13 16:13:47 -05:00
aaa73415e9
Final touches in MW volume.
2019-11-13 15:36:13 -05:00
caa02ca20a
Clean up. Added the raycasting number of steps as a slider for user's control.
2019-11-12 17:19:23 -05:00
b0ad104bc8
Merge branch 'master' into feature/FastVolume
2019-11-12 13:16:27 -05:00
7e8cae4a51
Improved volume border color.
2019-11-11 14:48:35 -05:00
6ca3047247
Updated ToyVolume. Add downscaling controls.
2019-11-11 14:39:28 -05:00
86bd05276f
Added slide control for downscaling factor.
2019-11-11 13:29:32 -05:00
fe09060640
Merge branch 'master' into feature/RingShadows
2019-11-11 09:57:53 -05:00
2537b9e16b
Fixed shadow's dependency.
2019-11-11 09:57:46 -05:00
Alexander Bock