mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,153 Commits 86 Branches 47 Tags
5ad7fa94f3acbecded70fb071fcd33356889e2c5
Commit Graph

5153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathas Costa 5ad7fa94f3 Merge branch 'master' into feature/NewAtmosphere 2017-12-18 12:21:08 -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
Alexander Bock d26cc999e9 Update Ghoul repository 
Update SGCT repository
 2017-12-18 11:54:41 -05:00
Jonathas Costa c7a784f01e Updated absPath in shaders compilation. 2017-12-18 10:26:26 -05:00
Jonathas Costa 61b2c82b92 Improved code. 2017-12-15 13:21:14 -05:00
Jonathas Costa eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Jonathas Costa f78c10168f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-12-14 11:23:30 -05:00
Alexander Bock 255f187052 Update Ghoul repository 2017-12-14 00:22:08 -05: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
Jonathas Costa f6ab44ee12 Improved previous correction. 2017-12-13 15:32:06 -05:00
Jonathas Costa 5fe200ad7f Fixed squared texture noise on surface' planets when seeing from far away. 2017-12-13 14:53:57 -05:00
Jonathas Costa 7b956aa214 Fixed bug in AMD cards. 2017-12-12 18:08:07 -05:00
Alexander Bock 7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Jonathas Costa 4c0f0333af New Fade-in controlled range for planes cloud. 2017-12-12 16:47:47 -05:00
Jonathas Costa 6109b0c031 New Fade-in controlled range. 2017-12-12 16:20:20 -05:00
Jonathas Costa 952f8e8e13 Merged master into NewAtmosphere. 2017-12-12 13:43:40 -05:00
Jonathas Costa 91c7395a09 Merged. 2017-12-12 13:19:17 -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
Jonathas Costa 57abd18c80 Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-12-11 21:58:43 -05:00
Jonathas Costa 0d83df09bf Added max text size control for DU objects. 2017-12-11 21:58:33 -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 7ed683c59c Update ghoul repository 2017-12-11 14:31:54 -05:00
Alexander Bock d70078dca8 Merge branch 'master' into feature/NewAtmosphere 2017-12-11 11:22:52 -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 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 44586a0759 Remove EarthAtmosphere and MarsAtmosphere from the list of interesting nodes 2017-12-11 09:03:23 -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
Jonathas Costa 52da2297be Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure. 2017-12-08 16:11:58 -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
Jonathas Costa b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -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
Jonathas Costa 5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -05:00
Jonathas Costa 820bde4a13 Merged. 2017-12-07 11:01:35 -05:00
Jonathas Costa eb35b8420a Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-12-07 10:16:29 -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