Commit Graph

771 Commits

Author SHA1 Message Date
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
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
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
Jonathas Costa
5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -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
be98c3d784 Add TemplateProperty<std::vector<std::string>> as StringListProperty
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
Jonathas Costa
56854012a5 Fixed bug in local normals. 2017-12-06 12:40:33 -05:00
Jonathas Costa
24d3c5e8d2 Improved fade-io/out controls in GUI. Changed default behavior for unknown textures in renderable planes cloud. 2017-12-04 11:15:39 -05:00
Jonathas Costa
695df47b00 Added MilkyWay texture. 2017-12-01 15:13:14 -05:00
Jonathas Costa
6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00
Jonathas Costa
bb805c1baf Merged. 2017-11-25 21:10:59 -05:00
Alexander Bock
f0d5b313b0 Add scene for Voyager 1 and Voyager 2 missions 2017-11-25 16:09:59 -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
Jonathas Costa
27fd0ce09e Added minsize controls for billboards. 2017-11-23 20:40:44 -05:00
Jonathas Costa
10a60e73ad Improved performance of RenderablePlanesCloud adding min size control. 2017-11-23 20:03:42 -05:00
Alexander Bock
aa490a97c6 Adding MOLA HRSC dataset 2017-11-20 11:42:20 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
41dae755f5 Merged master. 2017-11-15 17:47:21 -05:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -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
Jonathas Costa
ee4f65dab7 Added mod file control for billboard max size. 2017-11-10 14:20:32 -05:00
Jonathas Costa
bca64bdcb1 Tully enabled by default. 2017-11-10 12:02:40 -05:00
Jonathas Costa
9e7e45c85b Added limit for screen size of renderablebillboards. 2017-11-10 11:48:21 -05:00
Alexander Bock
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Jonathas Costa
929bd9ae05 Merged. 2017-11-09 15:46:46 -05:00
Jonathas Costa
e26e5c7f15 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-11-09 14:02:25 -05:00
Jonathas Costa
ac15a14602 Merged. 2017-11-09 14:02:01 -05:00
Alexander Bock
5fe98b85ff Merge pull request #403 from OpenSpace/feature/fieldlineSequence
Feature/fieldlinesSequence
2017-11-09 12:23:13 -06:00
Jonathas Costa
081f178eb1 Added fade-in for background radiation. Changed from sigmoid to linear fading. 2017-11-09 13:03:38 -05:00
Jonathas Costa
b67172b29a Updated Ghoul reference. 2017-11-09 10:26:17 -05:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Jonathas Costa
cf2c21fab8 Fixed stars labels and added Gaia Stars. 2017-11-08 17:17:32 -05:00
Jonathas Costa
69aa660885 Added fade-in/fade-out transitions for Milkyway/Tully galaxies. 2017-11-08 16:55:31 -05:00
Jonathas Costa
3818ff3839 Fixed bug in background color for atm. Adding option to enable/disable fade-in effect in DU objects. Updated Ghoul. 2017-11-08 12:04:05 -05:00
Jonathas Costa
845c867380 Initial fade-in methods for DU objects. 2017-11-07 17:58:38 -05:00
Jonathas Costa
9885c00beb Performance improved atmosphere. 2017-11-07 15:57:25 -05:00
Alexander Bock
7ab79ce687 Update Digital Universe stars 2017-11-04 09:45:10 -04:00
Jonathas Costa
089cfe727f Improved ATM perfomance (still working on it). Debugging billboards alingment (in progress). 2017-11-03 17:10:03 -04:00
Alexander Bock
735d6378d9 More work on loading screen
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
Alexander Bock
4a449f3668 Update starlabels.data file 2017-11-02 12:05:04 -04:00
Jonathas Costa
cb6ae2500e Added control for emitted ground radiance and fixed bug in MSAA pattern. 2017-11-01 15:55:41 -04:00
Jonathas Costa
cbe1e870a5 Added night layer with new atm. 2017-10-31 14:30:33 -04:00
Jonathas Costa
ba9ab552e6 Fixed wrong configuration files. 2017-10-30 14:13:22 -04:00
Jonathas Costa
d116d1c28e Added g-buffer for DU renderables and for grid renderables. 2017-10-30 11:56:59 -04:00
Jonathas Costa
5b11eff966 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-10-29 11:51:26 -04:00
Jonathas Costa
ce034022b4 New MSAA Atmosphere. 2017-10-27 16:26:25 -04:00
Jonathas Costa
2b0d00b785 Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-10-24 21:15:20 -04:00