Commit Graph

1744 Commits

Author SHA1 Message Date
Gene Payne 5a23ae35c8 Added file extensions for session recording files 2020-07-15 13:04:39 -06:00
Gene Payne 273e044647 Added handling of playback file that is too large for memory 2020-07-15 08:39:31 -06:00
Gene Payne cd7be9b870 Conversion task working for both directions 2020-07-14 17:19:24 -06:00
GPayne 1c108f99d3 Merged master into branch 2020-06-30 16:22:15 -06:00
Alexander Bock 89f1835994 Add the option to add vertical offset to the on-screen log
Set the default vertical offset when using the user interface
2020-06-22 22:15:34 +02:00
Alexander Bock 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z)
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
2020-05-12 15:27:24 +02:00
Alexander Bock 3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
Alexander Bock f605ea9422 Some more cleanup 2020-05-10 14:03:42 +02:00
Alexander Bock d1e5670ce5 More cleanup of asset ownership 2020-05-09 18:33:01 +02:00
Alexander Bock d3cce906c1 Memory hygiene cleanup 2020-05-07 13:08:34 +02:00
Alexander Bock befef58e80 More cleanup 2020-05-06 21:54:02 +02:00
Alexander Bock 340444ce0d Cleanup AssetManager class 2020-05-06 21:40:23 +02:00
Alexander Bock 01f0a864dc Yet more cleanup of Asset-related files 2020-05-06 20:33:27 +02:00
Alexander Bock fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
Alexander Bock 5a41084027 Add loading of meta information from assets 2020-05-05 00:29:46 +02:00
Alexander Bock 875404246f Add meta information to Asset class 2020-05-05 00:00:48 +02:00
Alexander Bock b4eb168c76 Turning shared_ptr into pointers (part 1) 2020-05-04 23:21:18 +02:00
Alexander Bock c8dff5c217 First pass of asset cleanup 2020-05-04 22:56:12 +02:00
Alexander Bock 498d125547 Merge pull request #1146 from OpenSpace/feature/sgct
Merging the changes to make the new SGCT version the default one
2020-05-04 10:48:48 +02:00
Alexander Bock 0fcd71be71 Add the ability to invert mouse buttons for OrbitalNavigator (closes #697) 2020-04-27 15:08:01 +02:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock 0dc2fc9430 Make OpenSpace work with the new SGCT version 2020-04-10 17:38:18 +02:00
Alexander Bock c6d3a181b7 Merge pull request #1115 from OpenSpace/feature/continuous-pinch
Feature/continuous pinch
2020-03-28 20:34:33 +01:00
Mikael 1c57f8ad21 Added more explanatory comments of the Touch-implementation 2020-03-25 10:01:56 +01:00
Mikael Pettersson fd0a9743a2 Touch: Added a firstInput so that if we ever get more than
max amount of inputs in our Deque, we will still have our
first point stored (for pinching around a start-centroid mainly)
2020-03-10 10:25:31 +01:00
Mikael Pettersson b9210a65fd Changed (and simplified) some internal logic of the touch class 2020-03-10 09:52:30 +01:00
GPayne 9ba31ee082 Added code for conversion to binary format 2020-03-04 09:55:51 -07:00
GPayne 97e393b0f6 Added task code for conversion to ascii 2020-02-27 13:35:10 -07:00
Stefan Seibert 6f63da86b4 Exposed linear flight factor as property 2020-02-18 10:59:29 +01:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock de24e81bda Fix copyright header information
Remove TimelineView application
2020-02-12 22:36:11 +01:00
Alexander Bock b09b936293 Add property to disable all mouse input (closes #1022) 2020-02-12 21:19:01 +01:00
Alexander Bock 81fda6c8db Update Ghoul repository
Adapt to changes in Ghoul
2020-02-12 00:01:24 +01:00
Alexander Bock 126f2ac4cf Check for selfinclusion of assets (closes #1032)
Make sure that OpenSpace doesn't crash when bailing out early
2020-02-11 14:09:14 +01:00
Alexander Bock c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock 9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Micah Acinapura db8a0d16c9 Merge branch 'master' into bug/macosbuild 2020-02-10 15:43:44 -05:00
Alexander Bock 9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +01:00
Alexander Bock 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Mikael Pettersson b96fa43b27 Changed glm include path 2020-02-07 13:25:08 +01:00
Micah Acinapura 12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -05:00
Alexander Bock 6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
GPayne f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
eriksunden e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +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
GPayne 1ac68f8236 Fixed profile parser so it gets the profile input file first 2020-01-10 15:22:26 -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