Commit Graph

536 Commits

Author SHA1 Message Date
Alexander Bock
5c9e65c7f2 Add strange units to the distance conversion (closes #703) 2018-08-24 03:37:22 -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
Alexander Bock
381dbf576d Display current delta time when interpolation is happening 2018-07-18 14:19:04 -04: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
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Alexander Bock
190952e4f5 Feature/jenkins fixes (#634)
Jenkins compile fixes
2018-06-26 16:53:22 -04:00
Alexander Bock
f4d67893b4 Add support for checking of OpenGL extensions to provide better error messages 2018-06-26 11:51:21 -04:00
Alexander Bock
0f5fd2c4bc Feature/torrent removal (#630)
* Remove torrent-based synchronization downloads
 * Add download URL to error message if HTTPSynchronization download fails
 * Add a grace factor to the distance conversion
 * Don't use scientific notation when displaying distances
2018-06-23 22:20:03 -04:00
Alexander Bock
158f99e0a5 Linux compile fix 2018-06-21 14:46:28 -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
f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
Alexander Bock
818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Alexander Bock
ae7e22dfe0 Adapt to typesafe ghoul::Boolean parameters 2018-03-30 13:03:17 -04: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
Jonathas Costa
cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -04:00
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Alexander Bock
31cdee1fa1 Make URLSynchronization and HTTPSynchronization download into temporary files and if the download succeeds, transactionally move the temporary file into the correct destination 2018-03-10 05:08:14 -05:00
Alexander Bock
1193e14c14 Feature/sync cleanup (#535)
* Cleanup in Sync module
 * Correctly name mar097 asset name
2018-02-24 14:18:14 -05:00
Emil Axelsson
5a23a3e93f Fix atmosphere stereo bugs 2018-02-19 22:11:12 +01:00
Jonathas Costa
4b3a11c4aa Initial fixes in ATM for stereo rendering. 2018-02-14 11:35:58 -05: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
Alexander Bock
cddde1c307 Fix DistanceConversion 2018-02-12 15:46:36 -05:00
Alexander Bock
5fe6c89b98 Try to make Jenkins happy 2018-02-12 13:06:15 -05:00
Alexander Bock
6723cda7c9 Make use of new constexpr MissingCaseException 2018-02-12 11:36:46 -05:00
Alexander Bock
539c0d7554 Fixing correct C++17 specification in CMake (trying to fix #501) 2018-02-12 10:12:56 -05:00
Alexander Bock
baa73f2af1 Partial compile fix for Jenkins 2018-02-12 08:52:16 -05:00
Alexander Bock
cd33ec06c9 Cleanup of distance and time conversion classes, Modifies GuiSpaceTimeComponent
Changed previous slider into text field + dropbox
Added acceleration slider
Added shuffle slider (closes #479)
2018-02-08 17:42:22 -05:00
Alexander Bock
d5f158ad0b Add the ability to DashboardItemSimulationIncrement and DashboardItemDistance to specify fixed unit 2018-02-08 12:18:38 -05:00
Alexander Bock
51551bc291 Move VRT specification into separate customization asset
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
Alexander Bock
cac2f24b40 Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary 2017-12-31 17:32:40 -05:00
Alexander Bock
53cfc7dd91 Cleanup GPUData and remove confusing UniformLocation class 2017-12-31 17:31:41 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
8c7d220335 Some fixes for Jenkins build 2017-12-28 16:58:19 +01:00
Alexander Bock
1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
Alexander Bock
fac3780ce9 Remove warnings on MacOS 2017-12-26 23:06:11 +01:00
Alexander Bock
7920c97767 Fix the map configurations for Mars
Include hotfix for limiting the number of concurrent downloads
2017-12-24 18:23:18 +01:00
Emil Axelsson
fd2568fdab Let http synchronizations overwrite files 2017-12-23 17:54:22 +01:00
Emil Axelsson
624167744d Report failure for http requests with response code different from 200 2017-12-23 17:37:55 +01:00
Jonathas Costa
3ea918b818 Multiples fixes and added max text size for grids. 2017-12-19 17:49:30 -05:00
Emil Axelsson
09182c9274 Cleanup code 2017-12-19 11:48:30 +01:00
Emil Axelsson
f7dc598f60 Small code cleanup 2017-12-19 11:17:56 +01:00
Emil Axelsson
90243cf388 Improve loading screen 2017-12-18 15:00:57 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00