Commit Graph

636 Commits

Author SHA1 Message Date
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
Emil Axelsson 81f45aed71 Work on http synchronization 2017-11-13 23:01:22 +01:00
Emil Axelsson c171e6ae86 Work on http download interface 2017-11-13 19:03:58 +01:00
Emil Axelsson 27f36209fa Improve implementation and interface of http downloads 2017-11-13 14:59:39 +01:00
Emil Axelsson 2fa42859cd Decentralize resource synchronization. Remove notion of SynchronizationJob. 2017-11-12 19:09:16 +01:00
Emil Axelsson 19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Emil Axelsson a73f2e0d00 Work on asset synchronization 2017-11-11 18:48:07 +01:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Emil Axelsson cb07af4a2b Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-10 16:07:58 +01: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
Jonathas Costa 929bd9ae05 Merged. 2017-11-09 15:46:46 -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
Emil Axelsson 3d9481a4fc Make screen log thread safe 2017-11-07 00:14:50 +01:00
Emil Axelsson e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +01:00
Emil Axelsson 1f33359697 Cleanup and better configuration of resource syncs 2017-11-05 23:17:51 +01:00
Emil Axelsson 03aab55a1f Asset synchronization using HTTP 2017-11-05 19:02:31 +01:00
Emil Axelsson c7f16189d8 Compile fix for macOS 2017-11-01 14:31:14 +01:00
Emil Axelsson a7a0715200 Restructure sync directories and change sync API 2017-11-01 12:31:40 +01:00
Emil Axelsson 2313a275d3 Resource syncing infrastructure 2017-10-31 17:46:48 +01:00
Emil Axelsson 19393feac8 Work on syncing and initialization of assets 2017-10-31 10:04:02 +01:00
Emil Axelsson 157d91d631 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-26 13:43:49 +02:00
Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
Alexander Bock e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Jonathas Costa d36e32e560 Merged master into NewAtmosphere. 2017-10-17 20:14:41 -04:00
Emil Axelsson 81298f10be Work on asset synchronization and initialization 2017-10-16 19:08:22 +02:00
Emil Axelsson 2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00
Alexander Bock 93534d13bc Fix error with preInitialization timestep being overwritten 2017-10-10 12:34:11 -04:00
Emil Axelsson 6b82df68dd Pr/core threadpool (#401)
Move GlobeBrowsing thread pool to OpenSpace core
2017-09-22 13:22:03 +02:00
Emil Axelsson ea5382c028 Volume conversion and rendering (#350)
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Emil Axelsson af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +02:00
Jonathas Costa 2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Jonathas Costa 758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -04:00