Commit Graph

6641 Commits

Author SHA1 Message Date
Alexander Bock 4cef2be366 Small cleanup 2020-01-24 21:40:09 +01:00
Jonathas Costa 18ed125851 Merge branch 'master' into feature/AALines2 2020-01-22 12:41:28 -05:00
Jonathas Costa 8ae8d53629 Fixed blinking (precision) problems. 2020-01-22 11:33:19 -05:00
Mikael Pettersson f481ff78b3 Merge pull request #1046 from OpenSpace/feature/touch-improvements
Feature/touch improvements
2020-01-15 10:36:16 +01:00
Mikael Pettersson f3659c2249 Forgot to add the property 2020-01-14 08:07:23 +01:00
Mikael Pettersson ebf3672bab Reworked zoom in boundaries in touch navigation
Should be able to focus a larger body and go back to a smaller one now.
2020-01-13 15:48:49 +01:00
Mikael Pettersson 629597f3d0 Added TouchActive as a field in TouchModule
This can be used to inactivate navigational touch input
2020-01-13 15:48:38 +01:00
Mikael Pettersson 4e75b161db Feature/internal touchhandling (#1038)
* Removal of dead code and compiler warnings

* Added basic internal touch

This commit only adds the description-shell of the touch implementation

* Added callbacks and first WIP of internal touch

Makes use of the TouchInput/TouchInputs class in the TouchModule.
Internally we cache the TouchInputs as an input deque and utilizes it
for motion-vectors.
This commit has bugs and issues, which will be worked upon.

* Happy new year!

Bumped year on branch-local files

* Improvements to internal touch

Almost reached feature-parity with tuio-handled touch events

- Added most of the touch-logic to touchinteraction
- Added helper functions to new TouchInput/TouchInputs classes

* Naming changes to touch interface

* Translate TUIO to TouchInput

This commit translates TUIO messages to an internal TouchInput structure
while still trying to keep feature parity.
Removed TUIO-dependencies from many files.
Changed behavior on tuioear to lock-swap its content.

* Minor cleanup and fixes

- Should fix touch roll
- Simplified some functions

* Build fix

* Use internal touch in webgui

- Added consume-logic to touch callbacks
- Constrained touch-input to either webgui or 3D application as mouse is
  - This fixes some flaws with previous implementation,
    such as ghost inputs

- Initialize touchmodule through init-functions rather than constructor

* Cleanup of comments

* Simplified touch classes

Added timestamp through constructor meaning no more sprinkled timestamps
Renamed TouchInputs to TouchInputHolder for clarity
Added helper functions to the Holder to see if it holds an input
Remade addInput as tryAddInput which return true on successful insertion
+ other cleanup

* Code style cleanup and tweaks

Removed avoidable zero-comparison for code clarity
Cleanup of code style

* Added comments to DirectInputSolver

Clarifying the use of the DirectInputSolver.

* Changes for coding style
Change SGCT version to make it checkout-able

* Clarify magic bitmask

* const -> constexpr const for magic bitmasks

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-01-13 08:27:13 +01:00
Alexander Bock a1a4e56b5b Merge pull request #1037 from sa5bke/master
support curl version < 7.32.0, i.e. rhel/centos 7
2020-01-11 20:21:52 +01:00
Alexander Bock d125694062 Reset SGCT to a commit that exists 2020-01-10 16:16:42 +01:00
Jonathas Costa a4352edcf2 Merge branch 'master' into feature/AALines2 2020-01-06 09:43:04 -05:00
Alexander Bock e3afd82c47 Move the mapping target->frame from SpiceManager to SpacecraftInstrumentModule (#closes 21) 2019-12-28 00:25:17 +01:00
Alexander Bock 207db3c824 Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere (closes #4) 2019-12-27 23:29:28 +01:00
Alexander Bock a51cee1f36 Add a method for creating a unique name for screenspace renderable (closes #652) 2019-12-27 21:25:22 +01:00
Alexander Bock ce7795a67b Do not assume that the GuiName or a DashboardItem is provided (closes #1006)
Do not try to load an empty URL as it triggers an assert
2019-12-27 20:10:48 +01:00
Alexander Bock 0ea77f56c3 Merge pull request #1036 from OpenSpace/feature/galaxy-caching
Add caching to the star representation of the volumetric galaxy to improve load time
2019-12-27 19:53:30 +01:00
Alexander Bock 5f200d4394 Some cleanup 2019-12-27 19:51:33 +01:00
Alexander Bock c8106da25b First version of galaxy caching 2019-12-27 17:21:00 +01:00
Alexander Bock 02bf704c02 Update Kameleon repository 2019-12-26 19:01:01 +01:00
Eric Söderman 1343b206ab support curl version < 7.32.0, i.e. rhel/centos 7 2019-12-24 23:50:53 +01:00
Alexander Bock 88d005464f Merge pull request #1035 from sa5bke/master
fix case sensitive include file for linux compile
2019-12-20 09:03:41 +01:00
Eric Söderman 2d0eb703a4 fix case sensitive include file for linux compile 2019-12-20 08:07:28 +01:00
Alexander Bock a430883c1e Merge pull request #1034 from OpenSpace/issue/990
Issue/990
2019-12-17 11:05:41 +01:00
Alexander Bock 3051d71fea Small code cleanup 2019-12-17 11:05:14 +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 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
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 49c4593d73 Merge branch 'master' into feature/AALines2 2019-12-11 15:39:42 -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 8d186fbdfc Merged master. 2019-12-08 18:52:16 -05:00