Commit Graph

199 Commits

Author SHA1 Message Date
Matthew Territo
fa661381fd Merge commit 'b671ad35e6d6c58edaf8691357daf1922d61a7d3' into feature/websocketnavigation
* commit 'b671ad35e6d6c58edaf8691357daf1922d61a7d3':
  Feature/session recording (#737)
  Update libCurl to 7.63.0 Update GDAL to 2.3.2
  Trying another timeout method for GDAL GetCapabilities requests
  Remove LMMP globebrowsing server to increase resilience
  Fix longitude/latitude specification for size of GeodeticPatch

# Conflicts:
#	src/CMakeLists.txt
2018-11-01 22:30:36 -06:00
Gene Payne
b671ad35e6 Feature/session recording (#737)
* In progress with new version of session recording

* Session recording coding pass for both record and playback, not building yet.

* Working on getting first build of prototype

* Code changes to get playback working with all 3 timing modes

* Fixing session recording interactions with the timemanager

* Bug fixes for newly discovered timing issues, mothballing recording of timing updates

* Fixed camera jitter issue

* Updated new reference to latest ghoul

* Got session recording/playback working with changes made in master

* Added threshold for differences in camera movement as criteria for saving to recording file

* Added support for binary file for session recording/playback

* Minor changes with handling timeManager keyframes in playback

* New timeline structure & keyframes specific to session recording

* Fixed bug with fixed-script size

* Switched to new timeline specific to session recording, bug fixes, currently debugging camera position & rotation

* Formatting changes only

* Fixed scripts not working after timeline change

* Add session recording test scene

* Fixed problem with re-running the same playback multiple times

* Fixed problems with camera interpolation

* Fixed detection of camera playback finishing, and improved camera interpolation

* Added comments for interface of externInteraction include

* Fixed view frustum culling issues in session playback due to not appropiate camera scaling. Also made function in datamessagestructures to read and write this data to streams.

* Added camera scaling fix to code that supports Ascii format

* Added startPlayback default command for playing back while forcing simulation time to match the recording

* Fixed camera jump in sessionRecording after playback finished. Cleanup in playback of camera to re-use same functionality in keyframenavigator.

* Superb fix to sessionRecording. Realized focusNode of globalNavigationHandler needed to be activly update when camera change for either position of camera to be accurate or for rendered objects to be calculated without precision issues. Can now achieve a correct playback, even close to chunks/renderable, which was not possible before.

* sessionRecording cleanup, fixed all warnings and renamed files to lowercase to match current standards.

* Added error handling for bad input playback filename, protection from corrupted playback file

* Implemented code review changes on pull request #737 for sessionRecording
2018-11-01 18:24:10 -06:00
Matthew Territo
d48b5df268 Merge commit '4cfedf0f654ac41c3a955948cf1eae00c7f1818e' into feature/websocketnavigation
* commit '4cfedf0f654ac41c3a955948cf1eae00c7f1818e':
  Update Ghoul repository Prevent reference after delete of the scene when deinitializing the OpenSpaceEngine
  Update coding style to correctly ignore SGCT inline files in apps folder Update ghoul repository
  Compile fix to adapt to ghoul changes
2018-10-23 14:41:28 -06:00
Alexander Bock
700fd60295 Update coding style to correctly ignore SGCT inline files in apps folder
Update ghoul repository
2018-10-17 08:30:55 +00:00
Matthew Territo
d7dddf5352 Merge commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8' into feature/websocketnavigation
* commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8':
  Feature/alex is flying (#729)
  Update ghoul repository
  Reenable the atmosphere on master
  Remove Clang warnings
  Feature/cmake cleanup (#727)
  Fix TaskRunner related issues

# Conflicts:
#	src/CMakeLists.txt
2018-10-08 16:44:47 -06:00
Alexander Bock
8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Matthew Territo
4f0cffdc44 Merge remote-tracking branch 'origin/master' into feature/websocketnavigation
# Conflicts:
#	src/interaction/orbitalnavigator.cpp
2018-09-06 19:15:59 -06:00
Matthew Territo
b892642868 Merge commit '9f1c4e847d7c37e75f0e73d051c8f7c758f20147' into feature/websocketnavigation
* Update & cleanup WebsocketInputStates to be part of globals
* Update fmt library calls to handle non-standard objects (json, enum, etc.)

# Conflicts:
#	include/openspace/interaction/inputstate.h
#	src/interaction/inputstate.cpp
2018-09-06 18:54:40 -06:00
Emil Axelsson
43e115d651 Add shortcut to change focus interpolation time (#707)
Closes #707
2018-09-03 01:50:47 -04:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Matthew Territo
c23053aede Update new ghoul string conversions 2018-07-31 15:37:09 -06:00
Matthew Territo
aa6854a829 Merge commit '74fd38c260f852cf224877425c3a5027f12604d3' into feature/websocketnavigation
* commit '74fd38c260f852cf224877425c3a5027f12604d3':
  Adapt to Ghoul change (use ghoul::to_string instead of std::to_string)
2018-07-31 15:16:24 -06:00
Alexander Bock
74fd38c260 Adapt to Ghoul change (use ghoul::to_string instead of std::to_string) 2018-07-20 13:56:15 -04:00
Matthew Territo
f278072f97 * InputState: Memory for WebsocketInputStates now resides here as pointers to WebsocketInputState
* WebsocketInputStates: Change to an unordered_map
* WebsocketCameraStates: Skip updating if there are no states to processes
* FlightControllerTopic: Switch for processing different types of events (input, connection, disconnect, etc.)
* FlightControllerTopic: Stores memory for a single WebsocketInputState instead of all
2018-07-17 17:06:34 -06:00
Matthew Territo
615d32de2e Merge commit '2751ee327c986f32d036e54a6f7a1229e937682d' into feature/websocketnavigation
* commit '2751ee327c986f32d036e54a6f7a1229e937682d':
  Update Ghoul repository to show milliseconds in log timestamps Add log information to the SceneGraphnode to show initialization and OpenGL initialization of nodes
  Add missing files in multiresvolume
  OpenGL logging
  Code cleanup Remove warnings from multiresvolume module
  Feature/state machine (#673)
  Fix shader path
  Feature/time interpolation (#669)
  Feature/model lighting (#670)
  Fix issue #660 and provide percentage for http syncs (#671)
  Add BoolProperty to SpaceModule to control SpiceManager exception handling (closes #661) Add debugging indices to SceneGraphNodes Rename ImGui indices debugging definition
2018-07-17 08:26:04 -06:00
Emil Axelsson
902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Matthew Territo
5b4125f6ad Initial WebsocketInputStates and FlightControllerTopic
=========================================
* Initial pass at network navigation, based on Joysticks
* Need to figure out deceleration/when to reset the WebsocketInputStates
2018-07-11 17:25:59 -06:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Jonathas Costa
f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
Alexander Bock
db66084ad8 Fix warnings and coding style issues 2018-04-21 08:27:20 -04:00
Alexander Bock
a9b981d718 LLVM compile fixes
Updated to new Ghoul commit
2018-04-20 23:12:13 -04:00
Jonathas Costa
4197bb8200 Merged master. 2018-04-20 21:37:40 -04:00
Alexander Bock
3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
ae7e22dfe0 Adapt to typesafe ghoul::Boolean parameters 2018-03-30 13:03:17 -04:00
Emil Axelsson
e660699ca5 Do not interpolate stereo distance if there is no previous focus node 2018-03-22 17:14:04 +01:00
Emil Axelsson
0fcd3d9fab Send view scaling over parallel connection 2018-03-20 14:23:46 +01:00
Emil Axelsson
2eae7ac26d Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/PerformanceATM_and_Stereo 2018-03-20 13:45:15 +01:00
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Emil Axelsson
954e3a888d Interpolate stereoscopic depth when changing focus node 2018-02-16 13:52:42 +01:00
Emil Axelsson
b4a6fa2308 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/stereo 2018-02-14 15:06:12 +01:00
Emil Axelsson
499879c84e Start to implement stereo support with adaptive stereoscopic depth 2018-02-14 15:05:52 +01:00
Emil Axelsson
a85eddff4e Clean up lua stack and weak pointers 2018-02-09 16:44:34 +01:00
Alexander Bock
47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Alexander Bock
c9aedb084b Add Lua functions to query keyboard bindings and remove individual keybinds
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
f183b9536f Implement GUI button and featured elements on touchbar 2017-11-10 13:19:46 -05:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock
0f8adec9aa Show on-screen information about friction status 2017-10-30 14:28:03 -04:00
Alexander Bock
1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00
Alexander Bock
a016fd96a6 Fix duplicate property name error 2017-08-14 15:24:41 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
ad5ca816a9 Move friction properties into common subowner 2017-07-29 01:33:22 -04:00
Alexander Bock
1a475ef570 Started documenting properties
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00