Commit Graph

3294 Commits

Author SHA1 Message Date
Emma Broman fdb9903713 Provide path position function, to use for rendering of path 2020-01-30 16:16:51 -05:00
Lingis 9709a9c171 Merge 2020-01-26 17:39:24 -05:00
Lingis c1c96cd81d Bezier3 with more special cases handled and lookAt rotation 2020-01-26 17:22:25 -05:00
Emma Broman e209e7cd6a Add funciton and keybinding to stop playing a path 2020-01-26 16:30:20 -05:00
Emma Broman da8a773122 Prevent steppnig out of bounds for t=1.0 in piecewise interpolation 2020-01-26 16:07:04 -05:00
Emma Broman c44fff4b22 Temporary solution for handling pauses in instruction 2020-01-24 11:07:25 -05:00
Emma Broman 965ce2a6a7 Prototype solution to provide curve type (kinda ugly) 2020-01-24 10:30:25 -05:00
Emma Broman aa8a2a98b3 Move path instruction class to its own file 2020-01-23 17:36:06 -05:00
Emma Broman 4ef577adf5 Resolve merge conflict in PathSegment constructor 2020-01-23 16:11:29 -05:00
Emma Broman 5fb34e24f8 Add posibility to include a start navigation state in path spec 2020-01-23 16:07:56 -05:00
Lingis 88b7dbe3eb merge conflict fix 2020-01-23 15:48:55 -05:00
Lingis 4507ac69fe Bezier3 added and set as default curve 2020-01-23 15:37:10 -05:00
Emma Broman 98d8c0159c Update current time before we start stepping along the curve. Did not reach end before 2020-01-23 14:46:30 -05:00
Emma Broman a12aec668b Merge branch 'thesis/2019/camera-paths' into path-segments 2020-01-22 11:32:51 -05:00
Emma Broman a9492c426f Merge branch 'master' into thesis/2019/camera-paths 2020-01-22 11:28:15 -05:00
Emma Broman 54dac17bfc Minor refactor 2020-01-22 11:17:40 -05:00
Emma Broman a197ed0e7f Member variable for curve length and prepare for duration to be based on curve length 2020-01-22 11:09:05 -05:00
Emma Broman 146fc4ce8d Approximate curve length 2020-01-22 11:02:34 -05:00
Emma Broman b528c6d4ab Refactor helper interpolating functions a bit 2020-01-16 14:38:12 -05:00
Emma Broman b9a34cd0f0 Fix issues with circular dependencies 2020-01-16 14:21:50 -05:00
Emma Broman f8cf415ad3 Merge branch 'thesis/2019/camera-paths' into path-segments 2020-01-16 11:06:27 -05:00
Emma Broman adae43c68f Update error checks, since ghoul_assert only runs in Debug 2020-01-16 11:03:51 -05:00
Emma Broman 6a6d2ca973 Split path curve code into separate file 2020-01-16 10:30:13 -05:00
Emma Broman b15fff68c3 Fix so all paths return a value 2020-01-15 18:39:43 -05:00
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
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
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
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