198 commits

Author	SHA1	Message	Date
Bret Curtis	c1eb9042b3	Merge branch 'master' into terrainbleeding	2018-06-19 13:40:14 +02:00
Miloslav Číž	34f8eca7bd	Fix indent	2018-06-14 13:43:32 +02:00
Miloslav Číž	ab8de9fa14	Set node mask to cell borders	2018-06-14 13:18:37 +02:00
Miloslav Číž	414e6caafe	Make tb work with distant terrain	2018-06-14 13:14:38 +02:00
Miloslav Číž	f18d57429e	Move cell border management to World	2018-06-14 12:27:22 +02:00
Miloslav Číž	1b8d500c07	Make tb command work again	2018-06-14 12:01:09 +02:00
Miloslav Číž	1fd5ad3e56	Use REAL_SIZE constant	2018-06-14 01:01:22 +02:00
Miloslav Číž	c3d7ee5a9e	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
wareya	94f695cffc	Fix #4452 and remove dead code	2018-06-12 21:04:27 -04:00
Miloslav Číž	db8aaa74d6	Start cell border debug drawing	2018-06-13 01:48:31 +02:00
wareya	6277f5511c	fix #3876 and #3993	2018-06-08 17:52:46 -04:00
Marc Zinnschlag	810e4416f6	Merged pull request #1691	2018-05-23 16:56:36 +02:00
Andrei Kortunov	888c2d9a33	Render default land texture for Wilderness cells with distant terrain	2018-05-22 12:40:01 +04:00
Andrei Kortunov	6cc7405194	Remove unnecessary command from QuadTreeWorld destructor (bug #4408)	2018-04-30 18:29:26 +04:00
scrawl	9b8c56761b	Fix timing error	2018-02-13 18:25:28 +00:00
Alexander "Ananace" Olofsson	145b47a550	Fix Windows builds ... `std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds	2018-02-13 17:47:38 +01:00
scrawl	123f7b83d5	Make the CompositeMapRenderer use available time and add related setting	2018-02-13 00:40:41 +00:00
scrawl	7b4add2ae4	Fall back to non-shader material if creating the shader fails ... Also fixes an uncaught exception that will break the whole game.	2017-11-08 00:24:03 +00:00
Marc Zinnschlag	dd17f70068	Merge remote-tracking branch 'aesylwinn/landrecords'	2017-10-03 13:32:02 +02:00
Chris Robinson	021627bdf8	Mark some functions with override ... Fixes some Clang warnings about overriding a virtual function without the override keyword.	2017-09-18 01:51:11 -07:00
Kyle Cooley	2abf7f1752	Remove unnecessary cache dump	2017-09-15 12:19:12 -04:00
Kyle Cooley	2eacc2f093	Changes to land creation, add ability to specifically clear terrain cache	2017-09-08 14:37:03 -04:00
scrawl	4fba157d3b	Implement releaseGLObjects for cached resources	2017-08-26 19:29:12 +00:00
Kyle Cooley	979b0d7211	Code cleanup and more cache clearing	2017-08-21 18:58:38 -04:00
Kyle Cooley	3b9326d238	Clear terrain cache and reload terrain	2017-08-20 22:34:41 -04:00
scrawl	3e03a0d7bd	Terrain: remove ref argument that is now always true	2017-07-19 16:24:35 +02:00
scrawl	ac78d01b2b	Terrain: use the main camera's viewpoint for intersection tests ... Fixes lag spikes caused by intersection tests loading/unloading terrain pages.	2017-07-19 13:11:44 +02:00
Ewan Higgs	38a2de3c51	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
scrawl	c992cb6e82	Fix texture not being applied on rendering the composite map (Fixes #3791)	2017-03-19 19:15:22 +01:00
scrawl	a070551af3	Attempt to fix naming conflict on windows	2017-03-15 17:51:00 +01:00
scrawl	088d5604bf	Use a shader if required to display the composite map ... Fixes composited terrain not respecting the 'clamp lighting' setting.	2017-03-14 19:27:56 +01:00
scrawl	7f5beb3172	Remove unused includes	2017-03-14 19:27:56 +01:00
scrawl	5044816770	Remove unused code	2017-03-14 19:27:56 +01:00
scrawl	b66c2abfe3	Build the bounding sphere in the loading thread (only relevant for TerrainGrid)	2017-03-14 19:27:56 +01:00
scrawl	9e9c028f1d	Skip light collection for far away terrain	2017-03-14 19:27:56 +01:00
scrawl	0782839a42	Avoid redundant culling tests on the transform/drawable	2017-03-14 19:27:56 +01:00
scrawl	fb8ac06524	Reduce the minSize of quad tree nodes for better performance	2017-03-14 19:27:56 +01:00
scrawl	a041546b54	Use the quad tree's minSize in the LodCallback	2017-03-14 19:27:56 +01:00
scrawl	e4e8821902	Refactor update of lodFlags	2017-03-14 19:27:56 +01:00
scrawl	2aa09639a9	Re-enable terrain intersections	2017-03-14 19:27:56 +01:00
scrawl	db00d47ca2	Hold a ref to the intersection visitor's view if possible	2017-03-14 19:27:56 +01:00
scrawl	11bee6ee35	Avoid compiling composite maps that are no longer referenced	2017-03-14 19:27:56 +01:00
scrawl	9eed7fa6f5	Fix composite map when force shaders is enabled	2017-03-14 19:27:56 +01:00
scrawl	d055dc25bf	Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell	2017-03-14 19:27:56 +01:00
scrawl	7d50b6c2e2	Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps	2017-03-14 19:27:56 +01:00
scrawl	6ccb6009ee	Use the View-based preloading for TerrainGrid as well	2017-03-14 19:27:56 +01:00
scrawl	3c29e2dbeb	Refactor ownership of terrain views	2017-03-14 19:27:56 +01:00
scrawl	28fd492711	Don't use terrain LOD for the map camera	2017-03-14 19:27:56 +01:00
scrawl	e7a0878c10	Add CompositeMapRenderer info to the stats panel	2017-03-14 19:27:56 +01:00
scrawl	c921620ef3	Compile the drawables of a composite map one by one to avoid frame drops for larger maps	2017-03-14 19:27:56 +01:00