Commit Graph

6730 Commits

Author SHA1 Message Date
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
liuloppan 4d500fc6dc Reset cef web gui scale
Resetting to use the default GUI scale of 1
2020-02-06 15:06:18 +01:00
Alexander Bock 1c35459ba9 Update SGCT and Ghoul repository to newest stable version 2020-02-04 09:46:43 +01:00
Lovisa Hassler 4cb9587522 Removed unused satellite image 2020-02-04 09:13:22 +01:00
ElonOlsson 11aa87bd36 fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
2020-01-30 19:39:48 -05:00
Alexander Bock 04ce540102 Merge pull request #870 from OpenSpace/issue/848
Bring back stars to the Earth's night.
2020-01-30 14:56:39 -05:00
Gene Payne 199ddb6292 Added missing sun marker asset to osiris-rex asset 2020-01-27 16:26:55 -07:00
Your Name 55ecf2f6ef Changing conflicting keybindings in rosetta scene 2020-01-27 18:18:58 -05:00
Jonathas Costa 8d5edea6fb Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:24:24 -05:00
Alexander Bock aa5e4c05ff Use the default scene instead of the profile again 2020-01-27 23:23:42 +01:00
Jonathas Costa bfa64a6aae Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:23:13 -05:00
Jonathas Costa 607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05:00
Your Name f560224143 GetProperty filter on groupname and update in base.asset 2020-01-27 16:49:36 -05:00
Alexander Bock 6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Alexander Bock 8a8748daaa Small fixes 2020-01-27 22:17:08 +01:00
Jonathas Costa 947a78a204 Changed night color behavior. 2020-01-27 14:58:05 -05:00
Jonathas Costa 6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Jonathas Costa bf9df85327 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 12:21:53 -05:00
Alexander Bock 160790c03b Merge pull request #1051 from OpenSpace/feature/csv-bookmarks
Feature/csv bookmarks
2020-01-27 18:20:37 +01:00
Alexander Bock 975e46e4b2 Move local bookmarks file to new global asset folder 2020-01-27 18:20:17 +01:00
Jonathas Costa e2f0321e7a Commented gui size again. 2020-01-27 12:18:30 -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 bba51efd70 Cleanup of asset files 2020-01-27 18:01:01 +01: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
Gene Payne f0a304dd19 Added option for using Utah Sync server (commented-out) 2020-01-27 10:45:21 -05:00
Micah 9be53ef77f adding bounding sphere to renderabeltrailtrajectory 2020-01-26 16:31:44 -05:00
Micah 2332d6199e update local and fix openspace 2020-01-26 12:24:43 -05:00
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
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