Commit Graph

517 Commits

Author SHA1 Message Date
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 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 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
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
Alexander Bock 167222c814 Feature/dashboard (#431)
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
Emil Axelsson 1417db5ed7 Let assets control their own lifecycle 2017-12-12 14:55:30 +01:00
Alexander Bock 2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -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
Emil Axelsson 3968961434 Show resource sync progress in gui 2017-12-08 14:37:34 +01:00
Jonathas Costa 5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -05:00
Emil Axelsson f33b24d551 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-07 11:44:14 +01:00
Alexander Bock 6be6149e02 Remove deprecation warning from camera functions
Fix compile warning
2017-12-06 17:00:50 -05:00
Emil Axelsson fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Jonathas Costa a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock 38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Jonathas Costa 6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00
Alexander Bock 026f51735b Show distance from current focus object
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Jonathas Costa 0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa 67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00
Emil Axelsson c52ce23156 Asset management 2017-11-15 22:53:04 +01:00
Emil Axelsson 27823e9af6 Asset syncing 2017-11-15 13:12:10 +01:00
Emil Axelsson 6a4f938bac Thread safety in http requests 2017-11-14 13:47:22 +01:00
Emil Axelsson c032e4a66e Add missing constructors 2017-11-14 11:26:23 +01:00