2996 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Broberg	a9f7cf5444	DataCollector: Collect current time in millis and use long longs for integers	2016-06-27 19:18:54 -04:00
Kalle Bladin	ce72f57183	Minimum camera height above surface is now configurable.	2016-06-27 18:46:35 -04:00
Erik Broberg	21c67e3199	Enable real time monitoring of StatsCollector data	2016-06-27 18:08:26 -04:00
Erik Broberg	6522a0f64a	Added clarifying comments to DebugRenderer header file	2016-06-27 16:54:56 -04:00
Kalle Bladin	9d8932218f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-27 16:17:22 -04:00
Kalle Bladin	627f00faba	Generalize tile fetching to consider datasets without overviews.	2016-06-27 16:17:10 -04:00
Erik Broberg	7d80598166	Add Mars Viking MDIM21 dataset config	2016-06-27 13:44:08 -04:00
Alexander Bock	90d9f09909	Make PerformanceManager not crash if performance measurements are requested multiple times	2016-06-27 15:02:40 +02:00
Alexander Bock	824da2199f	Include file cleanup	2016-06-27 15:02:21 +02:00
Alexander Bock	a25eb0f690	Clean up single.xml ... Update Ghoul repository	2016-06-27 15:01:43 +02:00
Alexander Bock	438e34b272	Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup	2016-06-27 02:11:49 +02:00
Alexander Bock	d15f8f3ba8	Do not show collapsing header if only one owner is present	2016-06-27 01:26:32 +02:00
Alexander Bock	a7f556a9c4	Add new font for the OnScreen GUI ... Cleanup of GUI shader code Make copy/paste work in Onscreen GUI	2016-06-27 01:13:28 +02:00
Alexander Bock	41ef7c1b55	Add methods to check for KeyActions and KeyModifiers	2016-06-27 01:12:00 +02:00
Alexander Bock	2550346835	Move GUI Lua functions into their own file	2016-06-26 16:35:48 +02:00
Alexander Bock	4ce4321847	More cleanup of Gui code ... Setting a new color layout	2016-06-26 16:35:29 +02:00
Alexander Bock	5b2c484da9	Merge branch 'master' into feature/gui-cleanup	2016-06-26 11:15:55 +02:00
Alexander Bock	8886eeec9d	Compile fix for when globebrowsing is not available	2016-06-26 03:38:42 +02:00
Alexander Bock	f457eb6cc2	Merge branch 'master' into feature/gui-cleanup	2016-06-25 18:26:18 +02:00
Erik Broberg	6843b37a3d	Add D3 javascript visualization of chunk statistics generated by StatsCollector	2016-06-24 16:35:35 -04:00
Erik Broberg	b9f3b03af3	Fix bug causing StatsCollector to crash during dump to file if a StatsCollection is empty	2016-06-24 14:51:25 -04:00
Erik Broberg	b5c85184da	Restructure StatsCollectors to keep track of both integers and doubles	2016-06-24 13:52:30 -04:00
Erik Broberg	064c9a5722	Add templated stats collector to store structured data in tables	2016-06-24 11:45:36 -04:00
Alexander Bock	74ff3eddbd	Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop	2016-06-24 10:56:57 +02:00
Alexander Bock	9705c33c16	Disable default module setting for galaxy, globebrowsing, and multiresvolume ... Update Ghoul repository	2016-06-24 10:55:49 +02:00
Erik Broberg	0c935e5b59	Use current - instead of maximum - chunk level height tiles in ground collision test	2016-06-23 20:23:08 -04:00
Erik Broberg	e59dd7a391	Enable finding a ChunkNode in ChunkNode tree based on a Geodetic2 point	2016-06-23 20:16:47 -04:00
Erik Broberg	a6baa5107a	Add test if GeodeticPatch contains a Geodetic2	2016-06-23 20:02:24 -04:00
wundahlful	b32262390c	Updated Ghoul version for cppformat changes	2016-06-23 16:00:26 -06:00
wundahlful	4954dda561	Updating deprecated cppformat/format.h to fmt/format.h ... The warning in cppformat's version throws a fatal error in the VS compiler	2016-06-23 15:32:10 -06:00
Erik Broberg	533453a943	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 21:08:05 -04:00
Erik Broberg	516e6b36ba	Use std::make_shared instead of new	2016-06-22 21:07:47 -04:00
Kalle Bladin	ad79831014	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 21:07:10 -04:00
Kalle Bladin	a23c38e5b3	Improve chunk bounds.	2016-06-22 21:06:56 -04:00
Erik Broberg	6d11ba2946	Move blending bools from ChunkLodGlobe to TileProviderManager and init them to true	2016-06-22 20:51:28 -04:00
Erik Broberg	87c1fdc4de	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 20:25:50 -04:00
Erik Broberg	3ed227df11	Rename HashKey to ChunkHashKey and define it as uint64_t	2016-06-22 20:25:39 -04:00
Kalle Bladin	38e774882a	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 19:19:05 -04:00
Kalle Bladin	b573c6104a	Use anisotropic filtering for tiles.	2016-06-22 19:18:58 -04:00
Erik Broberg	d7c45fcf60	Change prerender() to update() in TileProvider and related classes	2016-06-22 19:11:14 -04:00
Erik Broberg	1f62736bc6	Solve merge conflict	2016-06-22 18:35:22 -04:00
Erik Broberg	745c51c4e4	Add unimplemented initialize to InteractionModes	2016-06-22 18:22:46 -04:00
Kalle Bladin	fa4bb15489	Solve merge conflict.	2016-06-22 18:05:08 -04:00
Kalle Bladin	e8fc2250d5	Clean up in interaction mode abd push camera to the surface of the heightmap.	2016-06-22 17:48:59 -04:00
Erik Broberg	7c0e80b866	Enable basic saving and restoring camera position between runs	2016-06-22 17:37:55 -04:00
Erik Broberg	60da53c00e	Divide InteractionHandler and Interaction modes into different files	2016-06-22 14:42:24 -04:00
Kalle Bladin	cb4b6dbdf3	Clean up in code that clamps camera position to height map.	2016-06-22 13:55:02 -04:00
Erik Broberg	6e5796107c	Remove Camera pointer from all InteractionModes. Pass it into update() instead	2016-06-22 12:32:11 -04:00
Erik Broberg	16564a69e3	Remove InputState pointer from all InteractionModes. Pass it in in update() instead	2016-06-22 12:12:48 -04:00
Alexander Bock	bf8d365017	Started cleanup of OnScreenGui code	2016-06-22 16:55:44 +02:00