Commit Graph

517 Commits

Author SHA1 Message Date
Emil Axelsson a44978b90e Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-04-04 14:26:17 +02:00
Alexander Bock a35609c6dd Add new libCurl that supports SSL for new GIBS datasets
Update WMS specification of GIBS datasets
2017-04-03 15:53:56 -04:00
Emil Axelsson 7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock dcc9d6228d Some minor cleanup 2017-03-05 20:08:24 -05:00
Alexander Bock 437db6c6f6 Rename PlutoProjection to Pluto 2017-03-05 17:27:43 -05:00
Emil Axelsson dbe8857e42 Clarify spice comments 2017-03-02 18:20:03 +01:00
Emil Axelsson 81d1358236 Update spice frames 2017-03-02 18:20:03 +01:00
Emil Axelsson 686fec4f9d Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes
Conflicts:
	data/scene/mercury/mercury.mod
	data/scene/saturn/saturn/saturn.mod
2017-03-02 18:20:02 +01:00
Emil Axelsson cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
2017-03-02 18:20:01 +01:00
Alexander Bock 57ba41bb10 Update the leap second kernel 2017-02-27 16:39:58 -05:00
Alexander Bock 8665cbe957 Update the Juno trajectory to the new format 2017-02-22 15:53:59 -05:00
Alexander Bock 1ac45a9077 Fix OsirisRex configuration file 2017-02-19 15:55:18 -05:00
Alexander Bock efe205c209 - Add initial tracing calls adapting to new Ghoul change of adding a
loglevel of ‘Trace’
- Adapt js and css files to show trace files in log
2017-02-14 18:10:28 -05:00
Emil Axelsson 4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Alexander Bock b3be4180de Clean data/scene folder; remove lodesritest and restructure lodglobes folders
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
Alexander Bock 2a3b532745 Add display of double precision properties to ImGui
Do not show date text when render information is hidden
Add Utah WMS files
2016-12-09 09:04:53 +01:00
Alexander Bock 189a68dd6d Add Utah MOLA and CTX configurations 2016-12-07 23:23:17 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00
Alexander Bock 2cffaa352a Provide Mars WMS servers in the correct order 2016-12-07 08:59:11 +01:00
Alexander Bock 1a48868ae3 Add data file to lodsaturn 2016-12-06 19:03:57 +01:00
Alexander Bock 04c6398d6a Fix case dependent kernels in OsirisRex
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
2016-12-06 18:47:46 +01:00
Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
Alexander Bock 777e6c628f Change tabs to spaces 2016-12-03 01:21:54 +01:00
Alexander Bock c515bbfd0f Redesign the ScriptScheduler to not copy scripts on return
Fix earth.mod file
2016-12-03 00:51:32 +01:00
Alexander Bock fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +01:00
Erik Broberg fa1407f2ac Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-28 17:40:55 +01:00
Erik Broberg 14f9126df2 Add TileProviderByLevel and use for Earth 2016-11-28 17:40:47 +01:00
Alexander Bock 328f57fb20 Fix error with pow being undefined when newValue becomes negative
Add wms.itn.liu.se as main server for CTX and Mola for Mars
2016-11-24 21:07:19 +01:00
kalbl 54367cc341 Update renderable trails to updated renderable 2016-11-23 13:36:24 +01:00
kalbl a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock 683fc8ee53 Pr/trails (#170)
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
2016-11-23 10:35:46 +01:00
Alexander Bock 8ed9d762dd Cleanup RenderableStars 2016-11-16 22:06:20 +01:00
kalbl c116b34765 Update biaxial ellipsoid for planets and add rings for saturn. 2016-11-08 00:57:59 +01:00
kalbl d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
kalbl 82d08ec45e Enable VIIRS by default 2016-11-07 22:57:19 +01:00
kalbl ef62fdca30 New data folder structure for lodglobes 2016-11-07 22:38:14 +01:00
Alexander Bock f99513a976 Remove the km to m conversion in RenderableFoV (closing #156) 2016-11-07 16:15:28 +01:00
Alexander Bock 921f5060c4 Move mission scene files into their own subdirectory missions 2016-11-07 13:12:41 +01:00
Alexander Bock af7e43c66a Rename bind_keys.lua script file to bind_common_keys.lua
Move SPICE kernel declaration from osirisrex.scene into the osirisrex mod file
2016-11-07 11:06:52 +01:00
Alexander Bock 4caa3d25ba Add documentation to the rosetta scene keyboard bindings 2016-11-07 10:34:19 +01:00
Alexander Bock 286eb89048 Add more documentation to the bindKey functions of NewHorizons and OsirisRex 2016-11-07 00:21:55 +01:00
Alexander Bock fd98f311d3 Some cleanup of scene files
Exceptions in preInitialization scripts no long crash the application
2016-10-31 11:43:36 +01:00
Alexander Bock ded3cb20ee Update Venus to make it not be located in the Sun 2016-10-29 15:48:05 +02:00
Alexander Bock 96e27913ca Add documentation to RenderableRings
Change Size to be specified in meters instead of powerscaled scalars
2016-10-29 15:24:39 +02:00
kalbl 156c6bab41 Merge branch 'develop' into feature/globebrowsing 2016-10-29 14:12:39 +02:00
Alexander Bock d6edfba60c Fixing the orientation of the Saturn moons 2016-10-29 11:40:35 +02:00
Alexander Bock 6689be687e Add approximated offset values to Saturn rings 2016-10-28 15:52:09 +02:00
Alexander Bock cb5f29612f Add Saturn moons to the data/scene
Add jup260 torrent download to the Jupiter system
2016-10-28 00:23:21 +02:00
Alexander Bock 18b8aab898 Changes in ProjectionComponent initialization
- Remove parsing function
  - Make ProjectionComponent accept sub-dictionary
Remove "Rotation" key-value from RenderableModelProjection
  - Information moved into RenderableFOV to do conversion between object and frame
Changes in mod files to reflect ProjectionComponent and RenderableModelProjection changes
Added Documentation to
  - RenderablePlanetProjection
  - RenderableModelProjection
  - ProjectionComponent
  - PlanetGeometry
  - ModelGeometry
2016-10-27 21:45:49 +02:00
Emil Axelsson 73e6fcf865 Sort documentation sections, fix json parse error for keybindings and add detailed documentation to html output 2016-10-27 17:09:56 +02:00