Commit Graph

4885 Commits

Author SHA1 Message Date
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
Alexander Bock
0f0fb78a63 Cherry pick 0d83df09bf 2017-12-12 00:30:38 -05:00
Alexander Bock
c321d76b3e Add try/catch blocks around the rendering to detect excess of texture units (closes #427) 2017-12-11 23:48:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
6c742b7e30 Add WMS server for Utah based Mars Color dataset
Remove dependency on old direct download
2017-12-11 15:27:54 -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
3578f52868 Make use of correct file path in TransferFunction (closes #402) 2017-12-08 16:24:53 -05:00
Alexander Bock
966b3b5ff4 Add ESRI World Imagery WMS file and reference in Earth.mod 2017-12-08 16:18:35 -05:00
Alexander Bock
d0f66dc754 Add customization.lua to the gitignore list 2017-12-08 15:31:48 -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
Alexander Bock
bce8e71d9b Another fix for StringListProperty
Do not crash if included script file does not provide a documentation key
2017-12-08 13:49:11 -05:00
Alexander Bock
bb74db4d28 Fix error in Lua-serialization of StringListProperty 2017-12-08 12:30:51 -05:00
Alexander Bock
66b3117064 Add a delay to the display of tooltips (closes #426) 2017-12-08 11:37:56 -05: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
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
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
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
Alexander Bock
0ff9c93512 Enable the disabling of Tooltips in ImGUI 2017-11-16 09:06:17 -05:00
Alexander Bock
3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Alexander Bock
3f6e5e6ace Merge pull request #415 from OpenSpace/feature/loadingscreen-refactor
Feature/loadingscreen refactor
2017-11-12 13:24:48 -06:00
Alexander Bock
fb5057ba36 Jenkins compile fix 2017-11-12 12:37:55 -05: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
Alexander Bock
5080cc13b3 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-12 11:17:48 -05:00
Alexander Bock
bbd019e8dd Jenkins build hotfix 2017-11-12 10:52:26 -05:00
Alexander Bock
907ea891cf Address PR comment 2017-11-12 10:50:24 -05:00