madsbuvi
d598923421
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-03-02 14:32:34 +01:00
psi29a
c33b2e0100
Merge branch 'dehardcodebaseanim' into 'master'
...
Dehardcode Base_animation and improve Collada support
See merge request OpenMW/openmw!510
2021-02-10 16:29:47 +00:00
madsbuvi
66d2912fcd
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-07 19:17:43 +01:00
AnyOldName3
3e273a759a
Clarify method name now we're using it differently
2021-02-06 16:41:46 +00:00
Nelsson Huotari
bae27e8199
dynamic_cast to static_cast
2021-02-02 21:52:15 +02:00
Nelsson Huotari
b28d8251aa
Clone animation tracks
2021-02-02 21:52:08 +02:00
Nelsson Huotari
1221889cf7
Limit conversion of underscores to nodes origating from osgAnimation library
2021-02-02 21:41:17 +02:00
Nelsson Huotari
5b88d16a50
Clean-up
2021-02-02 21:09:50 +02:00
Nelsson Huotari
2162b97fef
Handle case in osgAnimation bone names
2021-02-02 17:34:02 +02:00
Nelsson Huotari
7d3f2bc113
Convert underscores in bone names to whitespaces
2021-02-02 17:33:40 +02:00
madsbuvi
697caaff84
Merge remote-tracking branch 'remotes/origin/stereo_friendly_water' into openmw-vr
2021-02-01 15:55:38 +01:00
madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-01 15:09:00 +01:00
madsbuvi
7edaa50195
another approach
2021-01-31 18:02:05 +01:00
madsbuvi
2113545ba9
c array -> c++ array
2021-01-29 18:46:44 +01:00
madsbuvi
beedba3354
include render order
2021-01-29 18:42:29 +01:00
Nelsson Huotari
3194520dcd
Move base_anim settings to settings-default.cfg
2021-01-27 13:41:02 +02:00
madsbuvi
a67b512863
formatting error
2021-01-25 19:59:34 +01:00
madsbuvi
5f0aae0523
De-hardcode settings and buffers.
2021-01-25 19:58:27 +01:00
madsbuvi
6dc61b904f
Include memory header
2021-01-24 14:42:22 +01:00
madsbuvi
2393fe9e1d
Option to disable per view mapping.
2021-01-24 11:42:00 +01:00
madsbuvi
5c4e6c3f57
Stereo friendly water
...
(cherry picked from commit 0e22c55e48a7f965367d3d430c1bef5357b22748)
2021-01-24 11:25:04 +01:00
madsbuvi
da917fc9e7
Stereo friendly StateSetUpdater
...
(cherry picked from commit 496b3aef88b8fd867dcdd23a6ca43144573b1b2f)
2021-01-24 10:52:35 +01:00
Andrei Kortunov
f175beb304
Define template ref classes in components
2021-01-13 14:25:21 +04:00
Andrei Kortunov
801e2d6ad0
Avoid to use uninitialized variables
2021-01-09 13:36:40 +04:00
Mads Buvik Sandvei
823bda139a
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-20 14:17:39 +01:00
Mads Buvik Sandvei
6ab159f4d3
Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch
2020-12-19 15:56:49 +01:00
Mads Buvik Sandvei
434566ec80
Allow sharing via cv instead of camera
2020-12-19 15:55:47 +01:00
Mads Buvik Sandvei
d1faeed243
Merge remote-tracking branch 'remotes/origin/master' into shared_shadow_maps
2020-12-19 15:48:30 +01:00
Mads Buvik Sandvei
3e82cae500
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr_geometryshader_feature_branch
2020-12-18 20:50:58 +01:00
Nelsson Huotari
8b2bf12e8f
Use bip01 for root bone name
2020-12-15 13:51:49 +02:00
Nelsson Huotari
6c1f6169c0
Fix root movement glitch
2020-12-15 13:50:19 +02:00
Nelsson Huotari
256aa5e71d
Use const auto&
2020-12-12 22:23:20 +02:00
Mads Buvik Sandvei
b98b4db4c1
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-09 21:11:53 +01:00
Mads Buvik Sandvei
c974e1dde3
Merge remote tracking branch multiview_test_branch
2020-12-09 19:42:15 +01:00
Mads Buvik Sandvei
5beb0bc799
Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch
2020-12-08 20:50:27 +01:00
Mads Buvik Sandvei
059861f517
Merge remote-tracking branch 'remotes/origin/master' into shared_shadow_maps
2020-12-08 20:49:35 +01:00
Mads Buvik Sandvei
c870749c39
Merge remote-tracking branch 'remotes/origin/master' into multiview_test_branch
2020-12-06 15:24:12 +01:00
Mads Buvik Sandvei
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-12-06 15:14:53 +01:00
AnyOldName3
5ad297e6ff
Guarantee glow updater regenerates shaders on completion
...
Previously, it would edit the odd numbered stateset, then regenerate
shaders for the even-numbered one, then edit the even numbered one, and
regenerate shaders for the odd numbered one (or vice versa if it
finished during an even numbered frame). This would leave one of the
shader programs still trying to use the state that had been removed.
2020-12-03 18:41:32 +00:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04:00
Nelsson Huotari
55dcc6582a
Don't duplicate getFileExtension, use OpenMW's namespaces
2020-11-28 15:03:10 +02:00
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Nelsson Huotari
3232faa703
Use const ref instead of value
2020-11-20 19:41:01 +02:00
Nelsson Huotari
32d4344803
Don't copy osga-data in base class keyframecontroller, fix warnings.
2020-11-20 19:38:29 +02:00
Nelsson Huotari
6e77ad1f6a
OSG-Collada animation support
2020-11-19 01:11:56 +02:00
Nelsson Huotari
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
2020-11-18 22:48:47 +02:00
AnyOldName3
37661bffea
Merge branch 'shadowdisable-fix' into 'master'
...
Make disableShadowsForStateSet a no-op when shadows are disabled
See merge request OpenMW/openmw!205
2020-11-18 18:56:36 +00:00
AnyOldName3
7768556ce6
Set dummy state when disabling shadows indoors
...
As we don't reconfigure all shaders without shadows when we disable them
indoors (as it'd probably add a hitch to transitioning in and out) we
need to set up dummy state so the shaders don't do anything illegal.
This hadn't had symptoms for most objects as when indoors, nearly
everything would be drawn first in one of the water RTTs, which had
dummy state to disable shadows already. This wasn't true of the water
plane itself, though, yet somehow it took until just now for anyone to
report that.
This resolves vtastek's issue where the water would be invisible indoors
2020-11-16 21:01:20 +00:00
AnyOldName3
1e0df23d14
Merge branch 'shadows-bin' into 'master'
...
Use a custom renderbin to avoid pointless OpenGL state switches
See merge request OpenMW/openmw!402
2020-11-13 16:29:41 +00:00
AnyOldName3
fcfd340c69
Actually copy alpha blended drawables to the new stategraph
2020-11-12 23:23:40 +00:00
