Commit Graph

985 Commits

Author SHA1 Message Date
Alexander Bock 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
GPayne 0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock 3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
Alexander Bock d1e5670ce5 More cleanup of asset ownership 2020-05-09 18:33:01 +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 5a41084027 Add loading of meta information from assets 2020-05-05 00:29:46 +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
GPayne 1fbb9e8acf Completed code for detecting and storing changes made since startup 2020-04-23 12:06:34 -06:00
GPayne 83ef5ed245 Switched profile-to-scene conversion from lua script to Profile class 2020-04-15 16:31:05 -06: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
GPayne 207c7d5657 Profile file handler in progress 2020-03-27 15:10:46 -06:00
GPayne 6253a5cf2e First pass on tracking changed properties/assets since initialization 2020-03-22 20:59:15 -06:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +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 d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock 49c793d976 Update Ghoul version
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
Alexander Bock 8a8748daaa Small fixes 2020-01-27 22:17:08 +01:00
GPayne f682352b53 Merging with master 2020-01-27 09:14:35 -07: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
GPayne 3ef1b8d511 Fixes to allow using temp directory for profile-to-asset conversion 2020-01-03 12:31:20 -07: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
liuloppan da8beff8e9 Feature/interaction monitor (#999)
* interaction monitor first commit

* Renaming some member variables with underscore

* Interaction monitor registering mouse events and touch events

* Added setIdleTime

* Adding to CMakeLists

* Moved interactionmoitor.cpp to correct locatioN

* Cleanup after review. Removed interaction type string and fixed indentation

* Changed documentation description

* Renamed hasNewWebInput to processNewWebInput

* Some cleanup

* Rename registerInteraction to markInteraction
Add markInteraction calls to mouse and keyboard event sin OpenSpaceEngine
2019-10-30 13:18:46 +01:00
GPayne e3a842b53f Moving path to lua converter script 2019-10-21 15:38:45 -06:00
GPayne 18810384dc Initial commit of profiles, containing convert-to-scene script 2019-10-18 17:12:57 -06:00
liuloppan 78eb673611 Feature/gui for touch (#967)
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
2019-09-18 23:49:51 +02:00
Emil Axelsson a25106886b Cancel version check when application closes 2019-08-23 14:19:24 +02:00
Alexander Bock 8ce9fde91b Enable the user to specify a custom temporary folder to keep the OS's temp folder clean
Change the configuration file to point the temp folder into the OpenSpace folder
Update Ghoul to not overwrite default font files (closes #944)
2019-08-22 15:37:08 +02:00
Alexander Bock 87ce1925b9 Fixing issue displaying negative numbers when download sizes are bigger than 2 GB (closes #925) 2019-07-31 11:46:20 +02:00
Alexander Bock f2a0cb18b0 Feature/websocketnavigation (#882)
* Upgrade JSON Library
* Added support for navigation based on websocket communication
2019-07-31 11:07:25 +02:00
Alexander Bock 0426367572 Allow the user to abort the loading screen through ESC (closes #668) 2019-07-30 15:22:31 +02:00
Alexander Bock 8f112fa219 Compile and runtime fixes when running in Debug
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
2019-07-22 14:14:12 +02:00
Emil Axelsson f43bcadee3 Feature/navigation state (#930)
* Replace setCameraState with setNavigationState + equivalents
* Add documentation and verification of NavigationState-related interfaces
* Documentation and verification fixes
* Change reference frame behavior
* Scene fixes
* Replace earthrise recording with navigation state and time
2019-07-16 13:13:33 +02:00
Alexander Bock d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02:00
Alexander Bock 8f6520ea8f Feature/offline rendering (#906)
* Added functionality of saving out screenshots (with fixed FPS) from a recorded session during playback.
 * Test of feature to request if all data is ready to be rendered, primary used in GlobeBrowsing. Need to go over how chunkTiles are set to OK (some are never OK..).
 * Estimated having working request of checking if chunks with correct level have their color and height data loaded and ready to be rendered. Will re-enable frames saving and try making a movie.
 * Created adaptive LOD factor based on available/unavailable tile data (such that we don't run a lot of iterations with asking for a pile of data that does not fit in the tile cache).
 * Made it able to specify tile cache size in configurastion file. Renamed other Cache value to WMSCache, as we have the TileCache as well.
 * Fix for when focus node has nor renderable, when checking for if dersired data has been loaded. Should probably check all renderable/planets anyway, not just a focus object.
2019-06-18 10:15:35 +02:00
Micah Acinapura 1149a61dce resurrecting consolidated documentation (#897)
* Resurrecting consolidated documentation, lots to improve still but better then before
2019-06-03 06:19:45 -06:00
Alexander Bock a894e2cf5a Turn fade-in value into a property and move away from dedicated fadeIn, fadeOut methods (closes #869) 2019-05-22 22:08:54 -06:00
Emil Axelsson c08805745b Feature/check latest version (#876)
* Log latest version information
2019-05-20 16:13:56 -06:00
Alexander Bock 595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Emil Axelsson e78121febc Feature/screenspace renderables (#830)
* Add ability to position screen space renderables in 3D
  * Independent face camera setting
  * More intuitive local rotation
  * Cleanup
  * Introduce global and master rotation. Remove DisableSceneOnMaster. Revisit screenspace renderables.
2019-04-24 13:34:01 +02:00
Emil Axelsson 0dcf65ce4f Feature/cef speedup (#806)
* Improve cmake errors
  * Calling doMessageLoopWork more often to increase gui performance
  * Introduce frequent callbacks
  * Restructure browser update callbacks
  * Cleanup cef speedup
  * Add flag to toggle updating browser between renderable calls
  * CEF should not be used in single process mode
  * Update CEF version
  * Postbuild step for finding framework from web helper
  * Load libcef dynamically to fix issue with CEF update
  * Only include dynamic library loader on mac
  * Improve keyboard mapping support on MacOS
  * Add arrow keys
  * Rename manifest
  * Fix bug with missing blinking cursor in text fields
  * Bump minimum cmake version
  * CEF fixes: Runtime and correct helper path
  * Be true to actual sandbox compatibility specified by CEF
  * Cleanup
2019-04-24 10:53:46 +02:00
Emil Axelsson 53e07d90e1 Feature/documentation topic (#822)
- Implement documentation topic that can be used to query documentation using the network API.
- Implement a way to pass arguments to lua scripts using json (rather than formatting entire lua string clientside)
- Implement ability to attach callback to lua script executions
- Implement abillity to transport return values from lua scripts back to network API clients.
- Do not initialize server interface on slave nodes.
- Implement Dictionary -> json converter using nlohmann json library
2019-04-03 10:30:28 +02:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson 6b28bac054 Fix anchor-and-aim related errors 2019-03-04 22:59:06 +01:00