Commit Graph

3518 Commits

Author SHA1 Message Date
Emma Broman 83037f8c47 Refactor path curve generation in PathSegment 2020-01-15 18:36:10 -05:00
Emma Broman 42c797093a minor cleanup 2020-01-15 14:23:28 -05:00
Emma Broman d1b3e4e7ce cleanup path segment creation and move duration default to PathSegment 2020-01-15 14:12:04 -05:00
Emma Broman a34d3473b8 Resolve merge conflict and make accessors in PathSegement read-only 2020-01-15 11:56:18 -05:00
Emma Broman d4c1bb5199 Remove risk of access violation and add a comment 2020-01-15 11:47:08 -05:00
Emma Broman 6213d8713d read stop at targets setting from path spec 2020-01-15 10:55:04 -05:00
Emma Broman 2810bbdde2 Add possiblity to add pauses in path spec (just a duration) 2020-01-14 17:17:01 -05:00
Emma Broman 76ed9f594d Add first prototype of pause/continue behavior 2020-01-14 15:36:53 -05:00
Emma Broman 1b2fb0d06a Minor cleanup
Compute paht duration on the fly rather than storing a variable
2020-01-14 09:25:07 -05:00
Emma Broman d1969a7943 Fix inconsistent naming of variables 2020-01-14 08:50:47 -05: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 76240c3edd Coding style updates 2020-01-11 21:07:38 +01:00
Emma Broman 24d916a03e Remove code that should not have been part of previous commit
Forgot to merge master into this branch before setting up the new and
cleaned repo. The code that was removed from this commit shall not be
	part of the changes in this branch.
2020-01-10 17:11:54 -05:00
Emma Broman 0a984df58c Add code for different path segments from Ingelas old branch 2020-01-10 15:48:37 -05:00
Emma Broman 3e283d1630 Add code for camera path generation module
Add all code in the state it was in Jan 10 2020 when branch cleanup was performed
2020-01-10 14:59:08 -05:00
Lovisa Hassler 18f012dd62 Moving includes to cpp, removing unused logmanager 2020-01-10 00:33:55 +01:00
Lovisa Hassler 311be5ac6a Adding nullptr check, error throwing to log, cleanup 2020-01-10 00:25:37 +01:00
Lovisa Hassler b99bcf9490 Adding validation check for _start and _end 2020-01-10 00:22:49 +01:00
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
GPayne 48a65f8b5f Fixed csv telemetry file parsing and copied line fade changes from satellites 2020-01-06 15:35:12 -07:00
Jonathas Costa a4352edcf2 Merge branch 'master' into feature/AALines2 2020-01-06 09:43:04 -05:00
Jonathas Costa 684ba237ec Fixed Sun's shadow below rings. 2020-01-06 09:17:11 -05:00
Jonathas Costa e8f2fa56f3 Merge branch 'master' into feature/RingShadows 2020-01-06 08:47:54 -05:00
GPayne 425ed3fef6 Added handling a telemetry file read exception 2020-01-03 14:11:57 -07: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 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
Lovisa Hassler b2861183ae Distance label hack, needs cleanup and replacement 2019-12-20 10:15:12 +01:00
Eric Söderman 2d0eb703a4 fix case sensitive include file for linux compile 2019-12-20 08:07:28 +01:00
GPayne bd8ade16f4 Fixed order of parsing elements from csv file 2019-12-18 17:53:17 -06: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
Alexander Bock 8feb6d1d2b Small cleanup
Make sure OpenSpace compiles in debug mode
2019-12-17 10:57:37 +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 fdfad19476 Coding style fixes 2019-12-16 11:27:53 +01:00
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