Commit Graph

176 Commits

Author SHA1 Message Date
Kalle Bladin 92c468426b Add night texture dataset 2016-06-08 22:48:53 -04:00
Kalle Bladin 3980aeff57 Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere. 2016-06-08 21:30:19 -04:00
Kalle Bladin 562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -04:00
Emil Axelsson 8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Kalle Bladin ec22683568 Use spice ephemeris for renderable globe. Still not considering rotation in rendering. 2016-06-07 22:47:05 -04:00
Kalle Bladin d36c33cbb6 Update other modules to work with the new interaction mode and camera class. 2016-06-07 19:51:37 -04:00
Kalle Bladin bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Kalle Bladin 012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Kalle Bladin 7ec7bbecea Remove OpenStreetMap dataset from debugglobe 2016-06-06 17:43:34 -04:00
Erik Broberg 113c37203b Add some temporal wms configs 2016-06-06 12:28:02 -04:00
Erik Broberg babad53a63 Add temporal GDAL dataset 2016-06-05 20:26:14 -04:00
Alexander Bock a0e5fe34fe Use more fine-grained texture specification for Pluto and Charon 2016-06-06 00:49:09 +02:00
Erik Broberg 5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00
Alexander Bock 3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock 6362318399 Make textured milkyway show again 2016-06-04 20:17:28 +02:00
Alexander Bock 50e0c1a43b Reset Earth as camera focus 2016-06-04 20:03:16 +02:00
Alexander Bock c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
2016-06-04 19:54:34 +02:00
Alexander Bock 36f5f7bb04 Only load cdf list if ISWA module is loaded 2016-06-04 19:39:22 +02:00
Alexander Bock 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
	data/scene/default.scene
2016-06-04 19:06:54 +02:00
Kalle Bladin cc31082eff Add more layers to debugglobe. 2016-06-03 14:39:02 -04:00
Sebastian Piwell 8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Alexander Bock 104cbcfd39 Update Pluto textures to remove superfluous textures 2016-06-03 16:02:51 +02:00
Emil Axelsson 1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Sebastian Piwell 41299f17f7 Improved multiple transfer functions 2016-06-02 16:56:25 -04:00
Erik Broberg 678e91816b Setup a simple working demo with TemporalTileProvider as a TileProvider 2016-06-02 14:00:11 -04:00
Kalle Bladin c241448007 Enable blending between ties of different levels to avoid some of the poping artifacts. 2016-06-01 20:47:07 -04:00
Michael Nilsson cb601042a6 solve merge conflict 2016-06-01 14:03:39 -04:00
Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Sebastian Piwell 876c86ca75 Merge fix 2016-06-01 12:09:58 -04:00
Sebastian Piwell d33121d07c New dataprocessor classes works with IswaGroup 2016-06-01 11:50:26 -04:00
Kalle Bladin 0202828c73 Layers can be turned on and off during runtime and shaders will be recompiled accordingly. 2016-05-31 19:26:42 -04:00
Sebastian Piwell 1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Alexander Bock 2742340112 Extract batsrus volume file into a variable for ease of change 2016-05-31 19:17:18 +02:00
Alexander Bock 8bfdf8db0d Add more interesting times to rosetta scene files 2016-05-31 18:35:13 +02:00
Alexander Bock 469358a8d6 Enable easy toggling of high v low resolution Pluto+Charon textures 2016-05-31 18:34:49 +02:00
Alexander Bock 592c2d41b5 First fix for reenabling Jupiter projections 2016-05-31 18:25:57 +02:00
Alexander Bock fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock 884324c467 Cleanup of default.scene and keybindings 2016-05-30 13:36:55 +02:00
Michael Nilsson 627d31a5b2 refactor textureplane and cygnetplane 2016-05-27 16:50:01 -04:00
Kalle Bladin 118dfe32f8 Number of segments per patch can be set from mod file. 2016-05-27 14:05:50 -04:00
Sebastian Piwell 95dd221f84 Fix crash when cygnet has no group 2016-05-26 15:53:44 -04:00
Sebastian Piwell edfff68491 Memory leak fix 2016-05-26 15:29:45 -04:00
Kalle Bladin 2a11f73932 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-24 22:55:34 -04:00
Sebastian Piwell 92f64e8653 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-24 14:42:55 -04:00
Sebastian Piwell a4d90fb667 Load cdf files at start up 2016-05-24 14:42:38 -04:00
Michael Nilsson 8f6bc7d418 solve merge conflict 2016-05-24 14:10:37 -04:00
Erik Broberg 3bb2161a09 1 Thread for Tile loading, allowing MaxConnections concurrent connections per RasterIO 2016-05-23 18:26:25 -04:00
Sebastian Piwell e3c1093310 Read cdf list 2016-05-23 17:24:46 -04:00
Sebastian Piwell 5b9813c817 Don't load all Histograms at startup for KameleonPlane 2016-05-23 11:08:12 -04:00
Sebastian Piwell eefa5ea844 Small fix for ionospere 2016-05-23 09:51:10 -04:00