Commit Graph

655 Commits

Author SHA1 Message Date
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
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
Alexander Bock
aa490a97c6 Adding MOLA HRSC dataset 2017-11-20 11:42:20 -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
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
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
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
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
5fe98b85ff Merge pull request #403 from OpenSpace/feature/fieldlineSequence
Feature/fieldlinesSequence
2017-11-09 12:23:13 -06: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
Emil Axelsson
43664d34b7 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-05 20:04:47 +01:00
Alexander Bock
7ab79ce687 Update Digital Universe stars 2017-11-04 09:45:10 -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
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
eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Alexander Bock
97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Alexander Bock
fc4ff258b0 Make log file links work again (thank Emil) (closes #378) 2017-10-20 11:47:48 -04:00
Alexander Bock
ca968f805c Fix Bennu mod file 2017-10-20 10:33:18 -04:00
Alexander Bock
28cb52e900 Fix Osiris-Rex scene file 2017-10-20 10:20:51 -04:00
Alexander Bock
2bfbf82403 Fix Tully download
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Alexander Bock
ae51be09fd Fix download links for Digital Universe 2017-10-19 23:22:54 -04:00
Alexander Bock
b26db7548b Allow setting the default enabled state for renderables 2017-10-19 23:20:43 -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
97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Alexander Bock
4fc6f82e40 Add data files for digitaluniverse
Add files to gitignore file
2017-10-18 18:11:15 -04:00
Alexander Bock
1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -04:00
Alexander Bock
7377d63794 Clean up digitaluniverse data folder
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Alexander Bock
d628c1a667 Merge branch 'master' into feature/DU
# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct
2017-10-17 17:09:37 -04:00
Alexander Bock
9a81b311f0 Generalize blending layer specification in default.scene
Make Utah server the default for WAC on Moon
2017-10-17 17:03:45 -04:00
Alexander Bock
f8754115eb Various cleanup 2017-10-16 17:11:28 -04:00
Alexander Bock
b3a2cebaa6 Fix more GuiPaths 2017-10-16 16:51:35 -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
Alexander Bock
89cdd6103d Update Juno mission 2017-10-13 16:51:26 -04:00
Alexander Bock
bb5f4d4381 Rename GuiGrouping to GuiPath
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Alexander Bock
ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -04:00
Alexander Bock
f1fd2b1960 Add window to show featured scenegraph nodes 2017-10-12 12:13:55 -04:00
Alexander Bock
d97cfbe829 Change ImGUI look and feel
Add Arimo font to be used in UI
2017-10-11 10:54:19 -04:00
Oskar Carlbaum
1a00d8a34f Add default colortable to data folder 2017-10-09 23:58:32 +02:00
Jonathas Costa
f1135afdea Fixed bug in DU mesh rendering. 2017-10-09 11:32:19 -04:00
Jonathas Costa
00757ec692 Added missing files. Fixed color in renderable du meshes. 2017-10-09 08:38:21 -04:00
Jonathas Costa
4ab735b883 Adding DU meshes. 2017-10-08 16:42:09 -04:00
Jonathas Costa
cc66165731 Disabled cache. Added initial coded for RenderablePlanesCloud. 2017-10-04 14:05:35 -04:00
Jonathas Costa
600536e7f8 Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix. 2017-10-04 09:23:49 -04:00
Jonathas Costa
74f0da9033 Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders. 2017-09-22 08:12:45 -04:00