Commit Graph

65 Commits

Author SHA1 Message Date
Emil Axelsson 7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +01:00
Emil Axelsson 75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01: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
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
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
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
Emil Axelsson 6b182bdfad Start with Gui for assets 2017-11-15 09:40:37 +01:00
Emil Axelsson 62f58a9749 Start on asset gui 2017-11-14 20:46:03 +01:00
Alexander Bock 3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Emil Axelsson 62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Alexander Bock b6d841c677 Correctly use group identifier name in property rendering
Fix indexing in Dropbox of OptionProperty
Finishing touches on FixedRotation (closes #137)
2017-11-12 12:33:10 -05:00
Emil Axelsson 19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock f29b15a37f Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
2017-11-10 17:15:00 -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 bc95d13c31 Updated ImGui external 2017-11-10 09:58:53 -05: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
Alexander Bock aa20c677dd Move onscreen rendering into SGCT's render2D function (closes #181)
Same fix makes GUI windows work again (closes #412)
2017-11-09 18:12:13 -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
Alexander Bock 80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06: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 10bcd9a3d3 Add display for current time and ability to return to today to the space/time component 2017-10-24 02:53:51 -07:00
Alexander Bock e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock 4dacba868b Fix featured property display
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
Alexander Bock 78aa164ccf Reset moon.mod 2017-10-19 15:14:04 -04:00
Emil Axelsson 27dea20520 Work on asset loading 2017-10-19 13:24:21 +02:00
Emil Axelsson 97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Alexander Bock 2e7da84dbf Some minor ImGUI color changes 2017-10-18 19:30:32 -04:00
Alexander Bock f8754115eb Various cleanup 2017-10-16 17:11:28 -04:00
Alexander Bock a303bf3aa8 Fix for mission visualization
Change default monospaced font
2017-10-16 16:27:32 -04:00
Alexander Bock 7520edab83 Added first version of mission visualization 2017-10-16 10:23:00 -04:00
Emil Axelsson 2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00