359e748c28
Initialize some missing fields in constructors
7 years ago
f8e4f3fca5
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
c1eb9042b3
Merge branch 'master' into terrainbleeding
7 years ago
34f8eca7bd
Fix indent
7 years ago
ab8de9fa14
Set node mask to cell borders
7 years ago
414e6caafe
Make tb work with distant terrain
7 years ago
f18d57429e
Move cell border management to World
7 years ago
1b8d500c07
Make tb command work again
7 years ago
1fd5ad3e56
Use REAL_SIZE constant
7 years ago
c3d7ee5a9e
Resolve merge conflicts
7 years ago
94f695cffc
Fix #4452 and remove dead code
7 years ago
db8aaa74d6
Start cell border debug drawing
7 years ago
6277f5511c
fix #3876 and #3993
7 years ago
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
810e4416f6
Merged pull request #1691
7 years ago
888c2d9a33
Render default land texture for Wilderness cells with distant terrain
7 years ago
6cc7405194
Remove unnecessary command from QuadTreeWorld destructor (bug #4408 )
7 years ago
fc41902798
Replace a dynamic cast with string comarison
7 years ago
d1a2955fa1
Merge upstream
7 years ago
e233dae1cd
Hook up the new shadow technique
7 years ago
02d0ee3485
Rename old shadow class to shadow manager
7 years ago
9ec59783ba
Add basic support for distant terrain CLSB
...
(cherry picked from commit 0f9dc3e65b72e6fff762f7a0933bae6f861e5fd4)
7 years ago
9b8c56761b
Fix timing error
7 years ago
145b47a550
Fix Windows builds
...
`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
7 years ago
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
7 years ago
112ade2a3f
Ensure TerrainDrawables affect the computed near/far planes.
7 years ago
1a30a917af
Merge upstream/master
7 years ago
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
7 years ago
ceaf0ee409
Enable shadow casting for terrain
...
Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass
7 years ago
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
7 years ago
021627bdf8
Mark some functions with override
...
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
7 years ago
2abf7f1752
Remove unnecessary cache dump
7 years ago
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
7 years ago
4fba157d3b
Implement releaseGLObjects for cached resources
7 years ago
979b0d7211
Code cleanup and more cache clearing
7 years ago
3b9326d238
Clear terrain cache and reload terrain
7 years ago
3e03a0d7bd
Terrain: remove ref argument that is now always true
8 years ago
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
8 years ago
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
c992cb6e82
Fix texture not being applied on rendering the composite map ( Fixes #3791 )
8 years ago
a070551af3
Attempt to fix naming conflict on windows
8 years ago
088d5604bf
Use a shader if required to display the composite map
...
Fixes composited terrain not respecting the 'clamp lighting' setting.
8 years ago
7f5beb3172
Remove unused includes
8 years ago
5044816770
Remove unused code
8 years ago
b66c2abfe3
Build the bounding sphere in the loading thread (only relevant for TerrainGrid)
8 years ago
9e9c028f1d
Skip light collection for far away terrain
8 years ago
0782839a42
Avoid redundant culling tests on the transform/drawable
8 years ago
fb8ac06524
Reduce the minSize of quad tree nodes for better performance
8 years ago
a041546b54
Use the quad tree's minSize in the LodCallback
8 years ago
e4e8821902
Refactor update of lodFlags
8 years ago
2aa09639a9
Re-enable terrain intersections
8 years ago
db00d47ca2
Hold a ref to the intersection visitor's view if possible
8 years ago
11bee6ee35
Avoid compiling composite maps that are no longer referenced
8 years ago
9eed7fa6f5
Fix composite map when force shaders is enabled
8 years ago
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
8 years ago
7d50b6c2e2
Add QuadTreeWorld::cacheCell to preload cells at max LOD for local maps
8 years ago
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
8 years ago
3c29e2dbeb
Refactor ownership of terrain views
8 years ago
28fd492711
Don't use terrain LOD for the map camera
8 years ago
e7a0878c10
Add CompositeMapRenderer info to the stats panel
8 years ago
c921620ef3
Compile the drawables of a composite map one by one to avoid frame drops for larger maps
8 years ago
47ca8aeee5
Use the time elapsed instead of # compiled as limit
8 years ago
8a6d909b22
Fix composite map being compiled twice
8 years ago
683e625c6c
Rewrite CompositeMapRenderer to be based on Drawable and share the FBO
8 years ago
4baa795152
Add preloading implementation to QuadTreeWorld
8 years ago
9db71e3f62
Recompute the LOD stitching when the view changes
8 years ago
ef704db877
Fix reset of changed flag
8 years ago
1c15686353
Remove non required use of WorkQueue
8 years ago
433900fca5
Fix waiting on initial quad tree build
8 years ago
4dbd224249
Hide the terrain in non-exterior cells
8 years ago
2580de11a4
Refactor ownership of ViewDataMap
8 years ago
5a3c645c89
Enable lazy compiling of composite maps
8 years ago
99e18f0d68
Clear the ViewData on exit
8 years ago
bb991850da
Add LOD stitches
8 years ago
6bd286d924
Fix unnecessary resizing in ViewData
8 years ago
8c151364df
Add special handling for CullVisitor to QuadTreeWorld.
...
- Cull only against bounding box, not bounding sphere, as this appears to perform better.
- Also traverse into non visible nodes to compute their LOD, this is to avoid nodes having to be loaded in when the player turns the view around, and will avoid unnecessary refs/unrefs of rendering data in the View. This should probably be turned off at some point for static cameras, such as the local maps.
8 years ago
f19a88be9d
Reject QuadTreeNodes with invalid bounds
8 years ago
7d004bf757
Preliminary rendering of QuadTreeWorld
8 years ago
e36bdb490e
Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection
8 years ago
0efc54c749
Subdivide the composite maps
8 years ago
819860081f
Remove custom bounding box
8 years ago
ce8c4ad4f5
Add quad tree implementation (no rendering yet)
8 years ago
14225a42c6
Remove unused pointer to IncrementalCompileOperation
8 years ago
c487df0abb
Move updateTextureFiltering and material into the base class
8 years ago
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
8 years ago
7e4450da55
Change the renderOrder of composite maps to ensure they are updated before water reflections or other cameras that may be using it.
8 years ago
b1d4bb5708
Add CompositeMapRenderer
...
Temporarily render all terrain using composite maps for testing purposes
8 years ago
e323b2fa7b
Use the SceneManager's ShaderManager
8 years ago
051c17a184
Make reportStats const
8 years ago
16b5cadd9e
Fix order of operations w.r.t clearing cache
8 years ago
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
8 years ago
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
8 years ago
274690f790
Refactor BufferCache to allow caching buffers of different sizes
8 years ago
804f873649
terrain: factor out texture caching into a separate class
8 years ago
eef63a880a
terrain: use a custom drawable for multi-pass render instead of osgFX::Effect
...
osgFX::Effect is awkward to use because of the lazy-definition of passes, no support for compileGLObjects, useless 'Technique' abstraction and having to define silly methods like 'effectAuthor()'
Handling the multi-pass rendering inside the Drawable also avoids redundant culling tests against the same bounding box for each pass.
8 years ago
62cc091414
Fix incorrect setting of TexMat in terrain material
8 years ago
8f79fa3d72
Add resource statistics panel opened with F4
8 years ago
c5f8ff6e0e
Add names to several nodes for debugging purposes
8 years ago
0f20312012
Fix MSVC warnings
8 years ago
Andrei Kortunov
AnyOldName3
Bret Curtis
Miloslav Číž
wareya
Marc Zinnschlag
scrawl
Alexander "Ananace" Olofsson
Chris Robinson
Kyle Cooley
scrawl
Ewan Higgs
Allofich