Commit Graph

3314 Commits

Author SHA1 Message Date
GPayne
9d34a8d39e Added final tests for checking start time 2020-02-11 07:20:29 -07:00
GPayne
016baa7ce7 Added checks on resolution & start time restrictions, and tests for them 2020-02-10 22:07:39 -07:00
GPayne
99021221e9 Added comment headers (no functional changes) 2020-02-09 20:01:24 -07:00
GPayne
27c2a33ee4 Added unit testing for timequantizer and improved quantizer solver 2020-02-07 01:46:41 -07:00
GPayne
24d744c5fe Fixed datetime string bug and improved solver performance 2020-02-05 15:47:40 -07:00
GPayne
fa12ab7339 Algorithm bug fixes 2020-02-03 20:49:44 -07:00
GPayne
bf8d724642 Fixed compile errors 2020-01-31 10:17:06 -07:00
GPayne
1ba505d8cc Additional work on time quantizer 2020-01-31 02:55:26 -07:00
GPayne
685579cd4f Work in progress for new quantization scheme 2020-01-30 16:16:06 -07:00
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Jonathas Costa
47e89d2d74 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 12:08:08 -05:00
Jonathas Costa
b19147fba7 Fixed bug was making atm disapear when night/water layer weren't active. 2020-01-27 12:07:15 -05:00
Alexander Bock
b545ab5c5b Merge pull request #1050 from OpenSpace/issue/1049
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
2020-01-27 17:32:56 +01:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
Micah
9be53ef77f adding bounding sphere to renderabeltrailtrajectory 2020-01-26 16:31:44 -05:00
Alexander Bock
b73b4270ed Merge pull request #1026 from OpenSpace/feature/AALines2
Feature/aa lines2
2020-01-24 21:41:24 +01:00
Alexander Bock
4cef2be366 Small cleanup 2020-01-24 21:40:09 +01:00
Alexander Bock
49b6124dba Merge pull request #1027 from OpenSpace/feature/RingShadows
Feature/ring shadows
2020-01-24 21:23:59 +01:00
Alexander Bock
9901d2b6fc Merge pull request #1048 from OpenSpace/feature/distancelabels
Feature/distancelabels
2020-01-24 21:09:16 +01:00
Alexander Bock
87805f1db8 Coding style fixes 2020-01-24 21:08:54 +01: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
Jonathas Costa
18ed125851 Merge branch 'master' into feature/AALines2 2020-01-22 12:41:28 -05:00
Jonathas Costa
c2d98983c1 Merge branch 'master' into feature/RingShadows 2020-01-22 12:40:42 -05:00
Jonathas Costa
8ae8d53629 Fixed blinking (precision) problems. 2020-01-22 11:33:19 -05:00
Jonathas Costa
904350d89b Improved shadow blending. 2020-01-22 09:50:16 -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
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
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
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
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