252 Commits

Author	SHA1	Message	Date
Alexander Bock	c3eda5e4e6	Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips	2016-06-17 21:37:43 +02:00
Alexander Bock	da0190ae1c	Remove default-performance measurements from default scene	2016-06-17 18:31:51 +02:00
Alexander Bock	82f97943c5	Use correct histograms for ENLIL	2016-06-17 18:31:39 +02:00
Alexander Bock	8bf06cdff2	Set fieldlines scene to the correct time of January 1st, 2015	2016-06-17 18:30:56 +02:00
Alexander Bock	9282d7e66b	Remove warnings from missing 'Atmosphere' definitions for Jupiter and its moons	2016-06-17 17:00:30 +02:00
Kalle Bladin	1f08bb413c	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-17 10:52:58 -04:00
Kalle Bladin	101795aa00	Group layer categories in gui.	2016-06-17 10:52:44 -04:00
Alexander Bock	4e240ddb19	Add 'atmosphereearth' scene node	2016-06-17 16:50:00 +02:00
Alexander Bock	e5662df36d	Remove warnings from missing 'Atmosphere' definitions for Pluto moons	2016-06-17 16:48:34 +02:00
Alexander Bock	5c8bd32ae5	Merge branch 'feature/globebrowsing' into release/ips	2016-06-17 15:46:46 +02:00
Alexander Bock	0a6bff628b	Remove atmosphere from default earth for now	2016-06-17 15:46:38 +02:00
Alexander Bock	c328feb663	Reset default.scene	2016-06-17 15:34:08 +02:00
Alexander Bock	86dce766ad	Correctly align Earth trail relative to SSB instead of Earth barycenter	2016-06-17 15:23:46 +02:00
Alexander Bock	9d70944d2a	Merge branch 'develop' into release/ips	2016-06-17 14:00:36 +02:00
Alexander Bock	f8fd806d48	Add fieldlines scene file	2016-06-17 14:00:06 +02:00
Alexander Bock	d3d5bd45c5	Add volumetric milkyway scene, torrent, and data files	2016-06-17 13:59:16 +02:00
Alexander Bock	896d9bd1db	Merge remote-tracking branch 'origin/feature/iSWA' into release/ips	2016-06-14 22:52:30 +02:00
Kalle Bladin	627b8e635b	Activated texture layers can be set from mod file.	2016-06-14 14:00:21 -04:00
Kalle Bladin	0b7ce79e80	Collapse layer category rendering code in to for loop.	2016-06-14 00:20:37 -04:00
Kalle Bladin	164e133ce9	Update tileprovidermanager to loop through texture categories.	2016-06-13 22:17:15 -04:00
Kalle Bladin	b5f1a09b8c	Cache uniform IDs upon recompiling of shader programs. Renaming of uniforms in shader code.	2016-06-13 18:57:18 -04:00
Michael Nilsson	fd026dae53	only get selected datavalues from file	2016-06-13 17:59:36 -04:00
Sebastian Piwell	afb54ea8d1	Do not process x,y,z variables in DataProcessorText	2016-06-13 14:17:34 -04:00
Sebastian Piwell	c0b0d45470	Linux compile fix	2016-06-13 13:50:38 -04:00
Sebastian Piwell	65bacf3119	Merge with develop	2016-06-13 13:30:26 -04:00
Sebastian Piwell	661dd00129	Faster processing in DataProcessorText	2016-06-13 13:20:00 -04:00
Sebastian Piwell	39f083c342	Every datacygnet uses own dimensions	2016-06-10 15:19:32 -04:00
Michael Nilsson	9800ca72be	change demo server cygnet ids	2016-06-10 11:53:05 -04:00
Jonathas Costa	b2c895dab0	Merged branch Atmosphere.	2016-06-09 11:45:56 -04:00
Jonathas Costa	649aa879f2	New textures for earth with atmosphere.	2016-06-09 09:18:08 -04:00
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
Jonathas Costa	388bb15461	Initial implementation of Atmosphere Effects. Use framebuffer to render it.	2016-06-07 10:35:18 -04:00
Jonathas Costa	de6446282f	Fixed small bug in shadows.	2016-06-06 18:23:06 -04:00
Kalle Bladin	7ec7bbecea	Remove OpenStreetMap dataset from debugglobe	2016-06-06 17:43:34 -04:00
Jonathas Costa	700f411784	Merged develop branch into PlanetShadows.	2016-06-06 17:19:11 -04:00
Erik Broberg	113c37203b	Add some temporal wms configs	2016-06-06 12:28:02 -04:00
Sebastian Piwell	9e7c420719	KameleonTransformationMatrix() in Transformation manager	2016-06-06 10:20:53 -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