Andrei Kortunov
d4a8023e1a
Merge pull request #2485 from Capostrophic/lighting
...
Add support for QuadraticMethod/LinearMethod setup (bug #4965 , continuation)
2019-08-11 22:17:40 +04:00
capostrophic
62fd2d47a5
Rewrite flickering/pulsing to work more like vanilla (bug #4952 )
2019-08-11 20:33:13 +03:00
capostrophic
c0d5cbdc8b
Add support for QuadraticMethod/LinearMethod setup (bug #4965 )
2019-08-10 13:25:49 +03:00
Andrei Kortunov
8557346fbd
Use glow for enchanted arrows (feature #5122 )
2019-08-07 12:58:14 +04:00
Capostrophic
6622e36226
Only merge pure osg::Groups in the optimizer
2019-06-09 11:47:43 +03:00
Alexei Dobrohotov
1444ef6f43
Merge pull request #2298 from akortunov/optimize
...
Do not allocate eight dummy LightStateAttribute's for every stateset
2019-05-11 02:32:34 +03:00
Capostrophic
05d94d35f9
Make disabled shadow defines map static
2019-04-29 19:31:46 +03:00
Capostrophic
85e99182ce
Revise light source configuration (bug #4965 )
...
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
2019-04-10 22:31:31 +03:00
bzzt
1a65adacdd
Do not allocate dummy LightStateAttribute's for every stateset
2019-03-30 21:36:08 +04:00
Andrei Kortunov
b466bfee40
Enable light sources directly to avoid virtual calls
2019-03-21 10:27:50 +04:00
Andrei Kortunov
b2fca46206
Fix a couple of minor issues in shadows
2019-03-19 09:14:07 +04:00
Capostrophic
de572226e4
Update optimizer with upstream improvements
2019-03-17 07:59:16 +03:00
Bret Curtis
7917f1fc84
Merge pull request #2252 from akortunov/terrain
...
Do not allocate empty callbacks in the RigGeometry
2019-03-14 14:53:35 +01:00
bzzt
4ab93aeffe
Do not allocate empty callbacks in the RigGeometry
2019-03-14 12:37:41 +04:00
elsid
8e09468f45
Don't set display list usage for navmesh
2019-03-12 00:05:55 +03:00
elsid
4395a92c35
Use display list to render navmesh
...
Slightly improves performance of massive navmesh rendering.
2019-03-10 23:58:49 +03:00
Andrei Kortunov
bacaa1f789
Get rid of C-style limits in the shadows code
2019-03-09 13:52:03 +04:00
Bret Curtis
551563cbfb
Merge branch 'clsb-warning' into 'master'
...
Hopefully fix Clang warning about hiding overloaded virtual functions
See merge request OpenMW/openmw!82
2019-03-08 08:50:03 +00:00
elsid
47e87cc2bd
Fix ODR violation for VDSMCameraCullCallback
...
This class is also defined in OpenSceneGraph at global namespace.
2019-03-07 23:49:23 +03:00
AnyOldName3
d34724a3c4
Hopefully fix Clang warning about hiding overloaded virtual functions
2019-03-07 20:46:10 +00:00
Grigory Latyshev
3872d7476b
Move makeOsgVec3f() to settingsutils.hpp
...
Remove all other makeOsgVec3f() implementations
2019-02-28 20:03:42 +00:00
bzzt
8c649f05e6
Don't reallocate light list vector unnecessarily
2019-02-27 00:12:14 +03:00
bzzt
a567111400
Use emplace instead of find-assign
2019-02-27 00:10:34 +03:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
...
Shadows
2019-02-20 15:35:49 +00:00
AnyOldName3
0c8ad0a3bb
Double buffer debug HUD frustum geometries to prevent race conditions.
2019-02-19 18:13:03 +00:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
...
Native glowing windows support
2019-02-04 14:50:13 +01:00
Andrei Kortunov
60c9806d62
Share RigGeometry node data
2019-02-03 13:09:49 +04:00
Andrei Kortunov
9e4a339ad3
Daytime node switch support (feature #4836 )
2019-02-02 10:50:15 +04:00
AnyOldName3
15547750ba
Correct behaviour of use front face culling setting to not use back face culling either when disabled.
2019-02-01 00:29:13 +00:00
AnyOldName3
cfe921fb82
Remove uneeded includes.
2019-01-31 20:12:42 +00:00
AnyOldName3
2761a38562
Prettify shadow define map setup.
2019-01-31 20:12:17 +00:00
AnyOldName3
57e10e26b2
Make variable name less confusing
2019-01-31 14:58:57 +00:00
AnyOldName3
a24b8ec3d2
Fix enable/disable mixup.
2019-01-31 14:57:56 +00:00
AnyOldName3
556c9a3382
Add normal-offset shadow mapping to remove shadow acne (flicker)
2019-01-30 22:28:00 +00:00
Andrei Kortunov
03b71d3c30
Improve switchable nodes handling by optimizer
2019-01-27 15:19:48 +04:00
AnyOldName3
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2019-01-24 23:09:23 +00:00
AnyOldName3
d82c85913a
Don't bother multiplying a matrix by its inverse and applying that to the light direction.
...
Hopefully this will improve numerical stability and reduce shadow flicker a little.
2019-01-24 23:07:38 +00:00
AnyOldName3
4438ab4493
Use CullVisitor traversal mask for light manager.
2019-01-24 22:42:23 +00:00
Andrei Kortunov
2c38e337ae
Support NiSwitchNode (feature #4812 )
2019-01-23 21:01:54 +04:00
Andrei Kortunov
8e6fd348d1
RigGeometry optimization: optimize geometry optimization
2019-01-09 21:01:33 +04:00
Andrei Kortunov
254f01b89d
RigGeometry optimization: vector iteration is more cheap than map iteration
2019-01-09 11:52:11 +04:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05:00
AnyOldName3
199e6ed82d
Revert "Use forward declaration to reduce build times."
...
This reverts commit 305b9826df
.
2018-12-19 23:53:14 +00:00
AnyOldName3
305b9826df
Use forward declaration to reduce build times.
2018-12-19 16:23:32 +00:00
AnyOldName3
7b108ae9a2
Disable depth sorting for translucent objects in the shadow maps
2018-12-19 01:45:05 +00:00
AnyOldName3
53188f61fc
Fix animation bug with VAOs
2018-12-18 19:44:30 +00:00
Bret Curtis
fc19c842cf
Revert "fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO"
2018-12-13 20:09:46 +01:00
AnyOldName3
2d5da1a6fa
Don't exclusively rely on a shadow map if its bounds have been expanded since the cull traversal.
2018-12-08 20:39:41 +00:00
mp3butcher
7a85e10d2f
fix a rig bug visible with OSG_VERTEX_BUFFER_HINT=VAO
2018-12-02 23:36:27 +01:00
AnyOldName3
0a409c0ab8
Make shadow map front-face culling configurable
2018-12-01 00:26:43 +00:00
AnyOldName3
dd207d9e54
Make the shadow polygon offset parameters configurable
2018-11-30 00:55:54 +00:00
AnyOldName3
aa11832949
Resolve bugs with depth-clamped shadow maps
2018-11-29 01:17:58 +00:00
AnyOldName3
7ad4882f0c
Fix debug hud frustum outline disappearence
2018-11-21 23:45:47 +00:00
AnyOldName3
061fa57335
Switch to better-performing data types for debug hud geometry
2018-11-21 22:38:50 +00:00
AnyOldName3
632b0d8979
Make shadow maps use their whole depth range for the overlap with the view frustum and rely on depth clamping to ensure objects outside the frustum still cast shadows.
2018-11-20 23:02:28 +00:00
AnyOldName3
660e423e99
Correct debug hud frustum colour
2018-11-20 23:01:04 +00:00
AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
AnyOldName3
1ca7ea23d1
Add extra uniforms to the disabled shadows StateSet so that the shadow texture samplers are bound ot the dummy shadow maps correctly.
2018-10-30 17:07:11 +00:00
AnyOldName3
b0907f8929
Add todos in case they're left until after the shadow PR is merged
2018-10-18 16:01:36 +01:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Andrei Kortunov
87394f2ebb
Revert "Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )"
...
This reverts commit 09427d3f5e
since the
fix is not entirely correct.
2018-09-29 16:21:40 +04:00
Kyle Cooley
6bece13a32
Use new Log class for error message
2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Andrei Kortunov
09427d3f5e
Take in account transformations of NiTriShape and NiSkinData in skinning (bug #4437 )
2018-09-16 14:38:58 +04:00
Marc Zinnschlag
24ce8cce72
Merged pull request #1898
2018-08-29 12:04:52 +02:00
Andrei Kortunov
0ddd0e4edc
Fix light flicker amplitude calculation
2018-08-28 14:57:11 +04:00
Andrei Kortunov
c677f7ca27
Rework pulsing light sources (bug #4615 )
2018-08-28 14:57:08 +04:00
Marc Zinnschlag
232ea4f793
Merged pull request #1887
2018-08-27 12:52:30 +02:00
Sophie Kirschner
c412f99963
Remove commented lines in UnrefWorkItem::doWork
2018-08-26 11:08:06 +03:00
Andrei Kortunov
ff241fb787
Optimize skinning (task #4605 )
2018-08-25 20:45:59 +04:00
Sophie Kirschner
4dd9386c4f
Fix error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
...
Fixes compile error encountered on OSX 10.9 with g++
sophie:build pineapple$ g++ --version
Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
The compilation error:
[ 24%] Building CXX object apps/openmw/CMakeFiles/openmw.dir/mwrender/renderingmanager.cpp.o
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.cpp:1:
In file included from /Users/pineapple/git/openmw/apps/openmw/mwrender/renderingmanager.hpp:4:
/Users/pineapple/git/openmw/openmw-deps/include/osg/ref_ptr:35:36: error: member access into incomplete type 'SceneUtil::UnrefWorkItem'
~ref_ptr() { if (_ptr) _ptr->unref(); _ptr = 0; }
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:14:11: note: in instantiation of member function
'osg::ref_ptr<SceneUtil::UnrefWorkItem>::~ref_ptr' requested here
class UnrefQueue : public osg::Referenced
^
/Users/pineapple/git/openmw/./components/sceneutil/unrefqueue.hpp:10:11: note: forward declaration of 'SceneUtil::UnrefWorkItem'
class UnrefWorkItem;
2018-08-24 16:41:52 +03:00
AnyOldName3
db707a31ec
Add clipping planes when allow shadow map overlap is enabled
2018-08-23 13:14:02 +01:00
AnyOldName3
15e820825f
Fix another convex hull clipping issue and restore z-clipping
2018-08-21 14:00:29 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
AnyOldName3
dd501f4132
Make ConvexHull::clip more resilient against large values.
2018-08-17 17:47:52 +01:00
AnyOldName3
987306feb9
Fix ConvexHull::extendTowardsNegativeZ
2018-08-16 23:48:19 +01:00
Andrei Kortunov
1452684d9e
Use new logging system for components
2018-08-14 19:42:41 +04:00
AnyOldName3
3b3721897d
Make indoor shadows disableable.
2018-08-08 23:56:11 +01:00
AnyOldName3
6286f5a1d4
Ensure RigGeometry child geometries have sensible bounds without actually computing them.
2018-08-08 23:24:57 +01:00
AnyOldName3
71778e2552
Disable convex hull clipping based on render leaf traverser results in the z direction.
2018-07-31 23:42:44 +01:00
AnyOldName3
02ab3b466a
Use simplified convex hull clipping maths from the other function doing hte same thing
2018-07-31 23:30:15 +01:00
AnyOldName3
85aba2e1da
Add toggleable shadow debug overlay.
2018-06-28 17:24:36 +01:00
AnyOldName3
ed68db5ef9
Fix issue where the camera frustum cropping wouldn't consider where casters might cast shadows, just where they actually were.
2018-06-19 23:48:59 +01:00
AnyOldName3
f5b144ef77
Improve bounds calculation for shadow casters outside of the viewing frustum
2018-06-12 17:04:56 +01:00
AnyOldName3
50fdd0be99
Resolve computed near plane issues with extremely high viewing distances.
2018-05-29 00:52:43 +01:00
AnyOldName3
2c30bc1b4f
Accidentally fix the one remaing case where shadows look awful while refactoring some stuff.
2018-05-18 22:39:57 +01:00
AnyOldName3
9f0a49c303
Disable CSM when disabled in the settings.
2018-05-17 20:27:10 +01:00
AnyOldName3
84284a60a7
Make CSM shader changes controllable by the setting.
2018-05-17 17:35:55 +01:00
AnyOldName3
5d05aadb37
Begin to let settings toggle between CSM and PSSM
2018-05-17 16:57:01 +01:00
AnyOldName3
7255c266ba
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-dicking-around-with-cascading-shadow-maps
2018-05-16 21:21:05 +01:00
AnyOldName3
fc1aee10f4
Remove function declaration that somehow snuck in.
2018-05-16 21:20:17 +01:00
AnyOldName3
1b30d47d7f
Add a hacky temporary version of cascading shadow maps
2018-05-13 12:56:40 +01:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
AnyOldName3
166e7df778
Improve debug HUD frustum
2018-05-11 19:08:42 +01:00