Commit Graph

4974 Commits

Author SHA1 Message Date
Emil Axelsson d1305bee6b Cleanup 2017-12-12 15:21:17 +01:00
Emil Axelsson 1417db5ed7 Let assets control their own lifecycle 2017-12-12 14:55:30 +01:00
Emil Axelsson e0504980ad Initialize requested assets when they are ready 2017-12-11 11:12:39 +01:00
Emil Axelsson 0396832ae5 Change notification mechanisms for assets 2017-12-08 17:36:45 +01:00
Emil Axelsson f3dfade201 Start adding support for removing assets 2017-12-08 16:02:45 +01:00
Emil Axelsson 137c4cd16e Add missing file 2017-12-08 14:38:37 +01:00
Emil Axelsson 3968961434 Show resource sync progress in gui 2017-12-08 14:37:34 +01:00
Emil Axelsson 4a43ca44f2 Render asset tree in gui 2017-12-07 18:44:08 +01:00
Emil Axelsson f33b24d551 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-07 11:44:14 +01:00
Emil Axelsson b99680a1cd Adjust to changes in asset api 2017-12-07 11:38:55 +01:00
Emil Axelsson da1a8f0796 Allow user to close asset gui window 2017-12-07 11:37:13 +01:00
Emil Axelsson 9630e735db An asset can only be considered synchronized when all required assets are synchronized 2017-12-07 11:07:15 +01:00
Alexander Bock a406aaf039 Merge branch 'feature/guisorting'
# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp
2017-12-07 01:15:52 -05:00
Alexander Bock 20bdb7b2b4 Use the 4K milkyway texture on default for better performance
Make featured properties and space/time widget easy to disable
Add setting for setting the bounds of the delta time slider
Add exponent to all numerical properties and use where appropriate
Add properties to Guicomponents that collapse the title bar
Add new F2 key to only display the main property window
2017-12-07 01:05:03 -05:00
Alexander Bock 2044371719 Update Ghoul 2017-12-06 18:50:59 -05:00
Alexander Bock 11b054b007 Move selection of Tree layout into GuiPropertyComponent property 2017-12-06 18:40:54 -05:00
Alexander Bock a96707c2ee Merge branch 'master' into feature/guisorting 2017-12-06 17:30:47 -05:00
Alexander Bock 32da94262f Fix uninitialized member variable in Loading screen 2017-12-06 17:29:14 -05:00
Alexander Bock be98c3d784 Add TemplateProperty<std::vector<std::string>> as StringListProperty
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
Alexander Bock 6be6149e02 Remove deprecation warning from camera functions
Fix compile warning
2017-12-06 17:00:50 -05:00
Emil Axelsson 175d21de9a Remove experimental code 2017-12-06 15:16:52 +01:00
Emil Axelsson 79581c8556 Add lua function to set camera state without loading from file 2017-12-06 14:58:14 +01:00
Emil Axelsson d16efef3d9 Automatically initialize assets 2017-12-05 16:01:59 +01:00
Emil Axelsson fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Alexander Bock 87b4ec03eb Display error message on loading screen in case of catastrophic scene loading (closes #423) 2017-11-30 21:49:39 -05:00
Alexander Bock 12ddfae337 Compile fix in TimeConversion
Reenable display of shutdown timer
Add prompt informing the user of ability to abort
2017-11-30 21:20:16 -05:00
Alexander Bock 38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock 8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -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
Alexander Bock f0d5b313b0 Add scene for Voyager 1 and Voyager 2 missions 2017-11-25 16:09:59 -05:00
Alexander Bock 07a8cb8bac Simplify specification of properties 2017-11-25 15:56:07 -05:00
Alexander Bock 182694422e Per default set the length of Uranus to a shorter value to allow for earlier time jumps with exceeding the spice kernel range
Set correct min/max values for static rotations
Enable rendering of matrix properties in ImGUI
2017-11-24 15:31:19 -05:00
Alexander Bock 8380b8f421 Provide more information in case of Lua table to dictionary conversion error 2017-11-24 13:27:37 -05:00
Alexander Bock 55afc617f3 Let performance measurement consume mouse events 2017-11-24 12:13:39 -05:00
Emil Axelsson 13aebb78b2 Do not assume that string propeties are file paths. Fix proper escaping in lua script generation. (#422) 2017-11-24 11:01:19 -05:00
Alexander Bock 0c18263de7 Issue/417 (#421)
Added support for multiple windows in ImGui
2017-11-24 11:00:53 -05:00
Emil Axelsson 99e097b441 Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range. 2017-11-22 19:04:19 +01:00
Alexander Bock aa490a97c6 Adding MOLA HRSC dataset 2017-11-20 11:42:20 -05:00
Alexander Bock f597b119ed Set more reasonable follow focus node rotation distance value for OrbitalNavigator 2017-11-17 13:58:31 -05:00
Alexander Bock 719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Emil Axelsson f3aeecaf23 Callbacks for asset state changes 2017-11-17 00:15:54 +01:00
Alexander Bock 669078201a Add check for usage of ghoul_assert instead of plain old assert
Update Ghoul
2017-11-16 16:12:54 -05:00
Emil Axelsson 436062381e Asset loading and synchronization 2017-11-16 19:29:45 +01:00
Emil Axelsson 7c80384d12 Decentralize asset synchronization 2017-11-16 15:09:55 +01:00
Alexander Bock 0ff9c93512 Enable the disabling of Tooltips in ImGUI 2017-11-16 09:06:17 -05:00
Emil Axelsson 816de9b29a Asset compile fix 2017-11-16 14:11:22 +01: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 6b182bdfad Start with Gui for assets 2017-11-15 09:40:37 +01:00
Emil Axelsson 95e6592f68 Asset synchronization 2017-11-15 09:38:42 +01:00