537 Commits

Author	SHA1	Message	Date
Kalle Bladin	e55cbaff8c	Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex.	2016-08-29 13:48:05 -04:00
Kalle Bladin	84834f230d	Merge branch 'develop' into feature/osirisrex	2016-08-29 13:01:28 -04:00
Alexander Bock	04f206da76	Compile fix in globebrowsing	2016-08-29 10:00:45 +02:00
Alexander Bock	d5063b116c	Compile fixes	2016-08-29 02:33:50 +02:00
Alexander Bock	dfa0709b11	More work into removing gdal dependency to libOpenspace	2016-08-29 02:12:33 +02:00
Alexander Bock	a798a7aae7	Remove gdal include from TileDataset header	2016-08-29 01:32:21 +02:00
Alexander Bock	cb92b85081	Remove gdal include from TileProvider ... Add stack include to RenderEngine	2016-08-29 01:19:57 +02:00
Alexander Bock	460da3893e	Add ability to define external libraries which will cause DLLs to be copied to application directories automatically ... Add gdal.dll as external library to the globebrowsing module	2016-08-26 23:47:08 +02:00
Kalle Bladin	14aad40e6c	Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe	2016-08-25 13:50:46 -04:00
Kalle Bladin	850ccb6d3c	Update rendering of shadow texture and water mask in RenderableGlobe.	2016-08-25 00:00:22 -04:00
Kalle Bladin	628f8b479f	Update updatestructures to have transform with translation, rotation and scale.	2016-08-18 16:59:51 -04:00
Kalle Bladin	ae1f8e457b	Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation.	2016-08-18 14:21:20 -04:00
Erik Broberg	23c4a05a96	Merge from globebrowsing	2016-08-17 20:25:58 -04:00
Erik Broberg	d4f635513d	Merge branch 'develop' into feature/globebrowsing	2016-08-17 19:53:28 -04:00
Erik Broberg	09ad585be5	Rebase to feature/globebrowsing	2016-08-17 19:16:01 -04:00
Erik Broberg	1199acc7b9	Re-add and revert back to old ThreadPool. See ticket #128	2016-08-17 18:22:27 -04:00
Alexander Bock	c93d882ea6	Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files) ... Updating SGCT and Ghoul references	2016-08-17 16:26:14 +02:00
Kalle Bladin	c01808ce10	Convert tabs to spaces.	2016-08-17 00:30:53 -04:00
Erik Broberg	3cb519ad77	Fix bug where TileDataLayout is created based on an uninitialized variable	2016-08-16 22:20:13 -04:00
Erik Broberg	5bddbcd683	Init lodScaleFactor to better reflect full screen resolution	2016-08-15 12:39:20 -04:00
Erik Broberg	0f21217f38	Merge branch 'feature/globebrowsing' into feature/osirisrex	2016-08-12 11:06:03 -04:00
Erik Broberg	42dc2da6f1	Each TileProvider has its own files located in tile/tileprovider/	2016-08-12 00:14:13 -04:00
Erik Broberg	06dcc05729	Fix un-added file to previous commit	2016-08-11 22:12:34 -04:00
Erik Broberg	6cb3dd1fea	Update AsyncTileReader according to new features of ghoul::ThreadPool	2016-08-11 22:04:15 -04:00
Erik Broberg	1dd569a3e1	Solve merge conflicts and fix bug in LayeredTextureUniformProvider	2016-08-11 17:05:14 -04:00
Alexander Bock	af672b6a4e	- Update Ghoul reference ... - Remove not needed cmake files - Make ConcurrentJobManager compile again	2016-08-11 11:12:15 +02:00
Alexander Bock	662e25963b	Move ThreadPool class from OpenSpace into Ghoul	2016-08-03 10:58:53 +02:00
Erik Broberg	64668e9feb	Merge from feature/globebrowsing	2016-08-02 19:25:23 -04:00
Erik Broberg	244c18fdc7	Solve merge conflicts: develop --> globebrowsing	2016-08-02 18:50:10 -04:00
Erik Broberg	e832b953c1	Reenable showing height intensities and resolution (after commit 06a5336961)	2016-08-02 18:09:14 -04:00
Alexander Bock	06a5336961	Fix debugging with Clang ... Removed include of vertex operations in fragment shader	2016-08-02 11:39:57 +02:00
Alexander Bock	f4f4e7de9e	More Jenkins compile fixes	2016-07-27 11:01:58 +02:00
Alexander Bock	60ce1872bd	Include correct directory for GDAL on non-Win32 systems	2016-07-27 09:25:17 +02:00
Alexander Bock	67e8608581	Use the include paths to search for gdal_priv.h	2016-07-26 17:00:29 +02:00
Alexander Bock	0062276d45	Fix case for TileProviderManager	2016-07-26 16:05:03 +02:00
Kalle	93d661bfc6	Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex	2016-07-22 17:06:02 -04:00
Kalle	5883d75047	Update render function in renderable model to avoid precision errors and remove psc dependency.	2016-07-22 17:05:34 -04:00
Erik Broberg	73e3c71b9a	Init StatsCollector to disabled and delete committed stats data	2016-07-21 17:42:35 -04:00
Erik Broberg	dd01953f7c	Enable disabling rendering of RenderableGlobe	2016-07-21 17:13:55 -04:00
Erik Broberg	f4fa144606	Use shorter struct name. Previous name caused linker error LNK1179	2016-07-21 16:57:48 -04:00
Erik Broberg	50735fde80	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-15 19:01:15 -04:00
Kalle Bladin	1d9aab6e63	Remove datasets from debugglobe.mod	2016-07-15 18:57:03 -04:00
Erik Broberg	7568912a7d	Bounding chunk heights considers multiple heightmaps and handles missing data	2016-07-15 18:56:03 -04:00
Kalle Bladin	e19a68eb1e	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-15 17:18:29 -04:00
Erik Broberg	2ec2c95cd7	Add forgotten updates for last commit	2016-07-15 17:16:48 -04:00
Kalle Bladin	403ecd8209	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-15 17:13:05 -04:00
Erik Broberg	a2cd9bc19d	Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code	2016-07-15 14:21:29 -04:00
Kalle Bladin	4a9d03c54f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-15 13:57:33 -04:00
Erik Broberg	d06c470636	Fix bounding heights (used for culling) for chunks with heightmap overlays	2016-07-15 13:48:00 -04:00
Kalle Bladin	ae9560332b	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-15 13:04:00 -04:00