Commit Graph

3251 Commits

Author SHA1 Message Date
Alexander Bock
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
Alexander Bock
d58df51cc5 Merge pull request #1025 from OpenSpace/feature/planetlabels
Feature/planetlabels
2019-12-16 11:04:21 +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
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
Jonathas Costa
5509fb0a6b Added more units to refine fading controls. Updated Sun fading values. 2019-12-11 15:38:11 -05: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
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
Jonathas Costa
b41edb9c02 Added more control over shadow generation. Added documentation. Merged Master. 2019-12-08 14:50:19 -05:00
Jonathas Costa
10c1ff03e9 Merge branch 'master' into feature/RingShadows 2019-12-08 14:40:23 -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
099488106a Fixed issues in Shadows and improved quality. 2019-11-26 16:13:46 -05:00
Jonathas Costa
53595ba045 Merge branch 'master' into issue/981 2019-11-26 11:14:15 -05:00
Jonathas Costa
dfb08b98e5 Removed unused code. 2019-11-25 13:15:31 -05:00
Jonathas Costa
c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05:00
Jonathas Costa
74c754d923 Viewing Map. 2019-11-15 17:32:43 -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
6ca3047247 Updated ToyVolume. Add downscaling controls. 2019-11-11 14:39:28 -05:00
Jonathas Costa
86bd05276f Added slide control for downscaling factor. 2019-11-11 13:29:32 -05:00
Jonathas Costa
fe09060640 Merge branch 'master' into feature/RingShadows 2019-11-11 09:57:53 -05:00
Jonathas Costa
2537b9e16b Fixed shadow's dependency. 2019-11-11 09:57:46 -05:00
Jonathas Costa
9aba885b15 Merge branch 'master' into feature/FastVolume 2019-11-10 14:50:59 -05:00
Jonathas Costa
0fce6a8d26 Super-fast volume (aka Downscaled Volume Rendering). 2019-11-10 14:17:23 -05:00
Alexander Bock
c3510948fd Add script function to easily add GIBS image layers to Earth 2019-11-10 13:52:45 +01:00
Emil Axelsson
afb889ff82 Feature/serve screenshots (#1003)
* Take screnshots using lua function, returning screenshot number. Add screenshot endpoint.
* Change capitalization from screenShot to screenshot
* Fix screenshot filename collision bug when using multiple windows.
2019-11-01 10:41:59 +01:00
Emil Axelsson
c96794bf27 Update modules to call InteractionMonitor.markInteraction 2019-10-30 16:20:26 +01:00
liuloppan
da8beff8e9 Feature/interaction monitor (#999)
* interaction monitor first commit

* Renaming some member variables with underscore

* Interaction monitor registering mouse events and touch events

* Added setIdleTime

* Adding to CMakeLists

* Moved interactionmoitor.cpp to correct locatioN

* Cleanup after review. Removed interaction type string and fixed indentation

* Changed documentation description

* Renamed hasNewWebInput to processNewWebInput

* Some cleanup

* Rename registerInteraction to markInteraction
Add markInteraction calls to mouse and keyboard event sin OpenSpaceEngine
2019-10-30 13:18:46 +01:00
Jonathas Costa
eee55bc68f Added Percentage Closer Filter. 2019-10-16 18:06:02 -04:00
Jonathas Costa
76375c5087 Merge branch 'master' into issue/981 2019-10-14 21:36:26 -04:00
Jonathas Costa
2df5a4c9bc Improved shadows quality and added planet shadows. 2019-10-14 12:17:14 -04:00
Jonathas Costa
b591af3c2a Initial tests for performance improvements. 2019-10-11 18:11:22 -04:00
Jonathas Costa
d4ad7c3394 Improved performance. Clean up. 2019-10-11 17:17:06 -04:00
Jonathas Costa
0c0e3e47f3 Fixing acne. 2019-10-10 18:02:19 -04:00
Jonathas Costa
e8d623053b Improved code. 2019-10-09 17:10:13 -04:00
Jonathas Costa
ab076fd3d2 Added shadow and ring components to Globebrowsing and shaders for shadows. 2019-10-08 16:38:12 -04:00
Jonathas Costa
5d1a217936 Changed star speck file reading to work with problematic getline function in Windows. 2019-09-27 15:30:19 -04:00
Lovisa Hassler
f205a82cb1 Minor cleanup 2019-09-24 09:22:41 +02:00
Jonathas Costa
2694810e27 Clean up. 2019-09-23 13:12:07 -04:00
Jonathas Costa
ee800cee89 Fixed star rendering cuts on cubemap borders. 2019-09-23 13:08:23 -04:00