Commit Graph

6813 Commits

Author SHA1 Message Date
Micah 0bc8bd5593 fix spaces and url 2020-01-26 09:18:10 -05:00
Micah ad29ea53f5 csv bookmark files 2020-01-26 09:13:48 -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 4440a2a554 Update Ghoul reference 2020-01-24 21:41:06 +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
Alexander Bock 32caf0ab8c Update location of SGCT repository 2020-01-24 19:51:24 +01:00
Alexander Bock 182857cfb8 Update Ghoul and SGCT repositories 2020-01-24 19:38:27 +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 f481ff78b3 Merge pull request #1046 from OpenSpace/feature/touch-improvements
Feature/touch improvements
2020-01-15 10:36:16 +01:00
GPayne 2a99bf02fc Corrected SBDB position using SPICE ECLIPJ2000 frame for sun 2020-01-14 13:49:13 -07: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
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
GPayne 1ac68f8236 Fixed profile parser so it gets the profile input file first 2020-01-10 15:22:26 -07:00
Alexander Bock d125694062 Reset SGCT to a commit that exists 2020-01-10 16:16:42 +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
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
GPayne 3ef1b8d511 Fixes to allow using temp directory for profile-to-asset conversion 2020-01-03 12:31:20 -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 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
GPayne 797c674f12 Moved profile-to-asset conversion to openspaceengine and using temp dir 2019-12-20 14:12:25 -07:00
Lovisa Hassler b2861183ae Distance label hack, needs cleanup and replacement 2019-12-20 10:15:12 +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