Commit Graph

69 Commits

Author SHA1 Message Date
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
Alexander Bock
190952e4f5 Feature/jenkins fixes (#634)
Jenkins compile fixes
2018-06-26 16:53:22 -04: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
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Emil Axelsson
0fcd3d9fab Send view scaling over parallel connection 2018-03-20 14:23:46 +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
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -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
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
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
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Alexander Bock
f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Emil Axelsson
5589de995b Feature/domecasting (#288)
* Improve dome casting feature. Add basic GUI for domecasting.

* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.

* Do not try to reconnect to parallel connection forever

* Fix interpolation bug for dome casting with globe browsing interaction mode

* Show parallel connection properties in correct GUI

* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.

* Update header file

* Clean up dome casting code

* Remove obsolete lua functions from ParallelConnection.
2017-04-13 23:16:00 +02:00
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock
6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190 Move network status into parallel connection class 2016-09-30 13:36:35 +02:00
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Emil Axelsson
41fafcb5df begin refactor parallel connection 2016-09-08 18:04:06 +02:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock
65ddeba70c Add SGCT as submodule
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock
824da2199f Include file cleanup 2016-06-27 15:02:21 +02:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Joakim Kilby
2f801a4171 adding a password check when changing hosts 2015-07-07 15:29:56 +02:00
Joakim Kilby
75b1e806ed including the header file missing from last commit... 2015-07-07 13:24:42 +02:00
Joakim Kilby
9cdc9c30d2 code cleanup and optimisation in the way threads are handled 2015-07-07 12:49:48 +02:00
Joakim Kilby
2a0787386e adding a forced time jump to trigger recomputation of trails when an init message is received 2015-07-07 08:21:10 +02:00
Joakim Kilby
987af4fb76 removing more obsolete functions 2015-07-06 18:55:49 +02:00
Joakim Kilby
b0eef21a2c removing obsolete functions and lua scripts 2015-07-06 18:49:17 +02:00
Joakim Kilby
51bab14dcc adding initialization messages functionality 2015-07-06 14:06:54 +02:00
Joakim Kilby
d475d89b93 fixed a bug in deserialising of time message 2015-07-06 11:26:49 +02:00
Joakim Kilby
d76e18d9ee more work on scripting synchronization and state saving 2015-07-05 17:21:23 +02:00
Joakim Kilby
b53efe4f0e changed how time keyframes are used 2015-07-05 16:41:38 +02:00
Joakim Kilby
93e4a9b526 redesigning the communication protocol and message types.
also added time keyframes which are sent on a per-frame basis
2015-07-05 16:09:57 +02:00
Joakim Kilby
a9824dabc1 Merge branch 'develop' into feature/remote 2015-07-03 16:18:59 +02:00
Joakim Kilby
8c2b5bb199 Tons of stability improvements to threading of parallel connection.
changed name of variables and functions to reflect more what they do.
removed obsolete functions.
parallel connection is no longer in contact with main thread unless to be deleted
2015-07-03 14:43:48 +02:00
Joakim Kilby
cb9bd514f6 added message type saying if initialisation is done and lua function + script
added current time and current delta time to initialisation scripts
2015-07-02 14:01:54 +02:00
Alexander Bock
bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +02:00