Commit Graph

244 Commits

Author SHA1 Message Date
Emma Broman
887fe5572d Merge pull request #1302 from OpenSpace/issue/1285
Issue/1285 - Add delta time steps to profiles and generate keybindings for number keys
2020-10-12 08:35:36 +02:00
Alexander Bock
d89c1e5c36 Some small code cleanups 2020-10-09 22:27:28 +02:00
Alexander Bock
de97a5520a Merge branch 'master' into feature/session-recording-improvements
# Conflicts:
#	include/openspace/network/messagestructures.h
#	src/interaction/sessionrecording.cpp
2020-10-09 22:10:40 +02:00
Emma Broman
ec1fbb09f8 Warn if multiple keys are bound to a key on removal 2020-10-09 18:52:38 +02:00
Emma Broman
64a09b50c3 Reset keybindings when delta times are changed 2020-09-21 13:37:31 +02:00
Alexander Bock
a6d8d0e735 Small coding style fixes 2020-08-17 22:50:27 +02:00
Micah
edb7d9ba1d adding option to not reset velocity on anchor change 2020-08-13 20:16:46 -04:00
Alexander Bock
e3699a43a8 Update Ghoul and SGCT
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
Gene Payne
3ee1a11257 Added support for comment line in ascii session recording file 2020-07-16 09:49:21 -06:00
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
Alexander Bock
ea95054bd2 Add the ability to render out the current recording time during a session recording 2020-07-02 16:37:11 +02:00
GPayne
1c108f99d3 Merged master into branch 2020-06-30 16:22:15 -06: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
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
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +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
GPayne
88135c1db0 Fixed compile issues, now needs testing 2019-10-31 14:48:26 -06:00
Emil Axelsson
98079cea3c Feature/get navigation state (#1001)
Implement lua function getNavigationState
2019-10-30 14:26:53 +01: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
37924c2734 Finished separating script messages into separate read & parse steps 2019-10-29 19:23:34 -06:00
GPayne
ae5da23b04 Separated writing of time keyframes into separate read & parse steps 2019-10-28 15:56:27 -06:00
GPayne
915eefbf11 Working on separating writing of recording keyframes into separate read & parse steps 2019-10-24 13:06:52 -06:00
GPayne
a549993727 Finished time and script keyframe types into separate read & parse steps 2019-10-23 18:02:20 -06:00
GPayne
27ef369338 Separated playback keyframe extraction into steps (file read & parse) 2019-10-17 18:20:37 -06:00
GPayne
299c4f10c4 Added some file handling to record conversion tasks 2019-10-11 11:45:55 -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
GPayne
c03f98717a Initial non-working version of convert recording format task. 2019-08-30 16:28:22 -06:00
Emil Axelsson
13cb950480 Fix bug with camera following anchor node 2019-08-22 10:29:03 +02:00
Emil Axelsson
e06993332c Cancel follow anchor node rotation interpolation when the anchor is changed 2019-08-13 18:35:22 +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
f7fafa5255 Add scripts to manipulate the camera
Add example asset using the new scripts for an IPAC
2019-07-29 13:13:16 +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
e9fdd31c56 Feature/flying fixes (#924)
* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
2019-07-04 09:28:42 +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
Alexander Bock
9f6733ed72 Misc cleanup in session recording 2019-05-23 03:03:04 -06:00
Micah Acinapura
0eabffe752 exposed renderable type to gui, fixed path for milkyway items (#866)
* exposed renderable type to gui, fixed path for miklyway items
* Changes to session recording topic
* Update webgui
2019-05-18 17:00:31 +02:00
Alexander Bock
514d6e6a78 Some minor cleanups in the session recording 2019-05-17 10:18:33 -06:00
Gene Payne
32ebea9e06 Latest changes to session recording with support for new webGUI record/playback controls (#840)
* Added separate directory for session recording files
* Changed recording & playback paths to use RECORDINGS dir and prevent absolute or relative paths in filename.
* Updated .gitignore so that recordings directory is ignored.
* Added session recording topic for synchronization of rec/play state with web gui.
* Added support to sessionRecording for providing a list of available playback files to web GUI.
* Fixed problem with playback filenames in list
* Fixed problem with occasional large jump in camera pos/rotation after playback finishes.
* Fixed the remaining post-playback problem that was causing a jump in position and rotation.
* Fix path issue on mac
* Fixed bug with bad scale values in recordings saved in ascii format.
2019-05-17 14:05:03 +02:00
Alexander Bock
595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Emil Axelsson
a504486568 Remove duplicate code 2019-04-24 13:35:59 +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