Commit Graph

2233 Commits

Author SHA1 Message Date
Emil Axelsson fd2568fdab Let http synchronizations overwrite files 2017-12-23 17:54:22 +01:00
Alexander Bock 4b65e20570 Support loading of .asset and .scene files
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
Emil Axelsson d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01: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
Alexander Bock 966df322cf Added additional absPath where necessary 2017-12-18 14:47:58 -05:00
Alexander Bock 0b0ad54028 Reenable digital universe on default
Fix refresh rate setting in configuration_helper
2017-12-18 11:58:22 -05:00
Emil Axelsson 8230e8d1e5 Add preprocessor flag 2017-12-18 17:50:07 +01:00
Emil Axelsson ef2633980b Allow sync module to be compiled without libtorrent 2017-12-18 17:36:52 +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 df259f6d02 Multithreaded scene initialization 2017-12-17 17:34:46 +01:00
Emil Axelsson 7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +01:00
Emil Axelsson 84dfbe7b80 Clean up asset related code 2017-12-16 12:51:46 +01:00
Emil Axelsson 603078af53 Add sync task 2017-12-15 13:28:24 +01:00
Emil Axelsson 75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Alexander Bock 23a446cb2c Update Ghoul repository
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -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
Alexander Bock 7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Alexander Bock a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Emil Axelsson 1926b59f91 Thread safety in torrentclient. Add syncfile to torrentsync. 2017-12-12 18:36:09 +01:00
Alexander Bock 0f0fb78a63 Cherry pick 0d83df09bf 2017-12-12 00:30:38 -05:00
Alexander Bock a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock 7dfa3374fc Update version number
Correctly layout tooltips in space/time widget
Fall back on old Digital Universe stars
Move settings of tooltip delay into each GuiComponent
2017-12-11 11:22:22 -05:00
Alexander Bock 66b3117064 Add a delay to the display of tooltips (closes #426) 2017-12-08 11:37:56 -05:00
Emil Axelsson 0396832ae5 Change notification mechanisms for assets 2017-12-08 17:36:45 +01:00
Emil Axelsson 3968961434 Show resource sync progress in gui 2017-12-08 14:37:34 +01:00
Alexander Bock 0af3233f53 Move Space/Time component into simple menu version
Move regular menu to F3
Move easy menu to F2
Remove extra text
2017-12-07 17:06:55 -05: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 da1a8f0796 Allow user to close asset gui window 2017-12-07 11:37:13 +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 11b054b007 Move selection of Tree layout into GuiPropertyComponent property 2017-12-06 18:40:54 -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
Emil Axelsson 79581c8556 Add lua function to set camera state without loading from file 2017-12-06 14:58:14 +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 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 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 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 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
Alexander Bock 0ff9c93512 Enable the disabling of Tooltips in ImGUI 2017-11-16 09:06:17 -05:00