Mads Buvik Sandvei
b6e6be51aa
Merge errors
2020-06-28 12:12:24 +02:00
Mads Buvik Sandvei
58d73e14e6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/environment.cpp
# apps/openmw/mwbase/environment.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwrender/camera.cpp
# apps/openmw/mwrender/camera.hpp
# apps/openmw/mwrender/renderingmanager.cpp
# apps/openmw/mwrender/renderingmanager.hpp
2020-06-28 11:59:07 +02:00
Mads Buvik Sandvei
91de6392ca
More refactoring / cleanup. Code policies.
2020-06-26 23:02:48 +02:00
Andrei Kortunov
3dc3fe06e2
Merge pull request #2934 from akortunov/master
...
Fix MSVC warning about variable re-declaration
2020-06-26 09:55:30 +04:00
Andrei Kortunov
30b63270ce
Fix MSVC warning about variable re-declaration
2020-06-26 09:49:26 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types
2020-06-25 22:16:09 +02:00
Petr Mikheev
63137a3b5a
Make vertical offset of "view over shoulder" configurable
2020-06-24 20:07:41 +02:00
Petr Mikheev
b4c699348f
Improved strafe movement
2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747
Advanced third person camera.
2020-06-22 15:22:34 +02:00
Mads Buvik Sandvei
1cf97fd7ad
lots of refactoring and some commenting
2020-06-21 23:40:07 +02:00
Bret Curtis
c3dc0e62e8
OP profiling regression fix; Billboards such as those from Westly's tree mod should work again.
2020-06-18 16:16:16 +02:00
Andrei Kortunov
808c905e1f
Initialize fields to avoid undefined behaviour
2020-06-18 14:50:06 +04:00
Andrei Kortunov
d1a3cc98ff
Get rid of ECLD and dependencies
2020-06-17 13:09:16 +04:00
Mads Buvik Sandvei
09cd233958
Proper orientation of arrows
2020-06-16 17:54:02 +02:00
bzzt lost a hitlab login
26ab176389
profiling
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
daa2761c2d
alphablending & billboardfix
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4e2efb3cdb
avoid sqrt
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
66c9469a80
fix
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
f12879a04c
allow statesetupdater as cullcallback = faster + works in paging
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4238fbccdf
view fix
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b27b76e325
avoid pagerebuild when reloading a same save
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
89ec6cfea2
tooltips labels
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
9f0398c021
intersection by refnum tag + enable paging for acti,door,cont
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
340d626589
static moving support
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
c7fda6d280
activegrid paging = 2xfps
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b4af2ac672
avoid blocking on pagerebuild
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
17637c6575
pagerebuild on disable
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
4dccabeb83
fix analyzation not taking instancecount in account + settings calibration
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
b7b31926a8
fix map glitch + cleanup
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
00e56ae862
batch debug colours
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
8a624e5a71
minsize based on mergedecision solves partial culling
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
0b4226f3e2
ico effieciency
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
bzzt lost a hitlab login
38c21163ea
+ meshsizecache for reduce i&o stalling
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
69514dfd46
ico redundency fix + stats counter
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
1f891ca46d
billboarding support for tree mods
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
cf439581e1
comply by elsid review
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt lost a hitlab login
ce505a9bb3
crashfix + optimiziation
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt
c0f128bcb3
disablesupprort
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
bzzt
d684f1a78f
terrainbased objectpaging
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:27 +02:00
elsid
c4cd3b2c4f
Add pathgrid to navmesh as off mesh connection
2020-06-12 21:04:02 +02:00
Mads Buvik Sandvei
7f3930c312
Override bow animations to give all races consistent aim
2020-06-08 23:54:24 +02:00
Mads Buvik Sandvei
9bd676f5be
Some bugfixes, more experimenting with timing of frame sync calls.
2020-06-07 20:02:03 +02:00
Andrei Kortunov
4afc332a0c
Add a FogManager
2020-06-07 15:51:03 +04:00
Andrei Kortunov
6de97e6bc2
Remove redundant variables from RenderingManager
2020-06-06 14:10:24 +04:00
Mads Buvik Sandvei
480ce82217
Fixed performance issues related to xr synchronization as well as osg pipelining. Some code refactoring / cleanup.
2020-05-24 18:00:42 +02:00
Capostrophic
904b245d30
Re-enable non-biped creature headtracking (bug #5424 )
2020-05-22 14:45:28 +03:00
Bret Curtis
357a845d00
Merge pull request #2862 from elsid/optimize_has_animation
...
Optimize MWRender::Animation::hasAnimation
2020-05-22 10:33:37 +02:00
elsid
9326111f4c
Use vector for Animation::mActiveControllers
...
Container is only used to add elements, iterate over all of them and
clear. Multimap adds overhead for all of these operations without any
benefits. Reduce Animation::resetActiveGroups CPU time usage by 50%.
2020-05-21 17:32:25 +02:00
elsid
a59e25e093
Optimize MWRender::Animation::hasAnimation
...
Use a set to check for group start existence.
Reduce time taken from 2.6% to 0.08% and
MWMechanics::MechanicsManager::update from 7% to 5%
in relative CPU time usage for a scene with ~100 actors.
2020-05-21 16:21:11 +02:00
Mads Buvik Sandvei
288530510d
Some cleanup. Fixed problems arising from latest merge (refactoring).
2020-05-21 01:01:15 +02:00
Mads Buvik Sandvei
cbbc82f053
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.cpp
# apps/openmw/mwrender/water.cpp
# apps/openmw/mwrender/water.hpp
# apps/openmw/mwworld/worldimp.cpp
2020-05-17 23:47:28 +02:00
Mads Buvik Sandvei
6474d703ae
GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested.
2020-05-17 16:25:51 +02:00
Capostrophic
110e3761bf
Disable small feature culling for orthographic cameras
2020-05-12 23:25:07 +03:00
Mads Buvik Sandvei
6f9c405afd
Tentatively completed VR GUI
2020-05-12 22:13:01 +02:00
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png
...
Store fog of war as a PNG image instead of TGA
2020-05-12 11:52:23 +02:00
psi29a
b72720f357
Merge branch 'shadow-transparency-rework' into 'master'
...
Only alpha-test shadows when necessary
See merge request OpenMW/openmw!170
2020-05-08 21:32:16 +00:00
Mads Buvik Sandvei
57e48cfc03
Separate rendering of window menus. It's still awkward. Needs polishing.
2020-05-01 21:37:01 +02:00
Alexei Dobrohotov
7ba8176862
Merge pull request #2819 from elsid/fix_ub
...
Fix UB in NpcAnimation::mNpcType initialization
2020-05-01 21:49:04 +03:00
elsid
6d8debe009
Initialize variable without reading itself
2020-05-01 17:23:10 +02:00
Capostrophic
87ba0bb0e0
Fix usage of uninitialized weapon type in equipmentChanged()
2020-05-01 16:37:40 +03:00
Capostrophic
89282d14aa
Fix collision switch node mask (again)
2020-04-29 17:18:39 +03:00
AnyOldName3
a3b032bf2b
Fix chameleon shadows
2020-04-27 23:49:48 +01:00
bzzt
dc33eeadf1
tightscenebound is uncessary after water bbfix
2020-04-27 08:42:46 +02:00
bzzt
ed20d869b4
waterculling for both terrain
2020-04-23 08:53:21 +02:00
David Cernat
65a669344b
Merge branch 'magic_numbers' into 'master'
...
compromise on magic numbers making things easier to follow
See merge request OpenMW/openmw!181
2020-04-22 19:29:19 +00:00
Bret Curtis
c359406473
taking anyoldname3 review comments to heart; typo fixes plus rebase
2020-04-22 20:29:50 +02:00
bzzt
1cd4b9ee68
fixes shadows on savegame screenshot
2020-04-22 20:18:29 +02:00
Bret Curtis
6316227594
hpp not cpp; review
2020-04-22 15:57:24 +02:00
Bret Curtis
68549828b4
create static functions to set/get hidden node mask; compromise on magic numbers to make things easier to understand
2020-04-22 13:34:19 +02:00
Bret Curtis
8a8107e837
as it says; revert vismask and uncomplicate openmw
2020-04-20 20:57:38 +02:00
Capostrophic
1928bebe98
Don't use up light duration if the held light is hidden (bug #5352 )
2020-04-04 20:51:41 +03:00
Mads Buvik Sandvei
7eaf015b87
Non-vr should never roll camera.
2020-03-31 20:28:43 +02:00
Mads Buvik Sandvei
14bb0f0208
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2020-03-30 01:37:29 +02:00
Mads Buvik Sandvei
d658065fe7
Show full player body when knocked out or dead
2020-03-28 16:30:56 +01:00
Andrei Kortunov
2e7712a390
Fix C5204 warnings by adding default virtual destructors
2020-03-26 14:49:12 +04:00
Capostrophic
3e3f5d66b2
Don't reset dead non-werewolf vampires' vampire NPC type
2020-03-25 21:06:21 +03:00
Mads Buvik Sandvei
68c75f66eb
Improvements on combat
2020-03-23 23:32:47 +01:00
Evil Eye
4f4982545a
make robes cover the chest slot
2020-03-19 21:30:22 +01:00
Alexei Dobrohotov
e80fbf4786
Merge pull request #2721 from akortunov/radial_fog
...
Support for radial fog
2020-03-17 22:35:10 +03:00
Andrei Kortunov
02444add2a
Support for radial fog (feature #4708 )
2020-03-17 23:09:28 +04:00
Mads Buvik Sandvei
893b75d767
Realistic combat, first draft
2020-03-15 15:31:38 +01:00
elsid
5168f2059f
Compare revisions by equality to support overflow
2020-03-14 09:38:24 +01:00
elsid
7ae7cb181d
Support recast mesh rendering
2020-03-14 09:38:24 +01:00
Bret Curtis
3502b28045
Merge pull request #2714 from Capostrophic/bumpmapping
...
Add bump-mapping support (feature #5304 )
2020-03-11 09:00:42 +01:00
Mads Buvik Sandvei
31f5b76394
Drop items at location
2020-03-10 22:39:11 +01:00
Andrei Kortunov
8e1e4d6757
Do not copy global map texture during savegame loading (bug #5308 )
2020-03-08 22:31:38 +04:00
Mads Buvik Sandvei
e573a260cb
Rudimentary menu interactions
2020-03-08 14:14:24 +01:00
Mads Buvik Sandvei
2ae7255fac
Pointing beam to visualize what the player is pointing at
2020-03-08 00:44:39 +01:00
Andrei Kortunov
94df2114c1
Store fog of war as a PNG image instead of TGA (bug #5108 )
2020-03-07 11:05:32 +04:00
Capostrophic
6999f1fd28
Add an option to apply lighting to environment maps
2020-03-03 20:08:59 +03:00
AnyOldName3
52fa20fb1c
Merge branch 'fix-sky' into 'master'
...
Fix building mwrender/sky with OSG 3.6.5
See merge request OpenMW/openmw!162
2020-03-01 16:43:13 +00:00
Mads Buvik Sandvei
da03e8bf41
Some refactoring
2020-02-29 23:53:56 +01:00
Mads Buvik Sandvei
f5e01417ba
Fixed jitter bugs with the new player tracking.
2020-02-29 14:13:56 +01:00
Mads Buvik Sandvei
1d47807419
Character movement following VR movement
2020-02-23 12:56:48 +01:00
Mads Buvik Sandvei
bdade49129
In-place turning
2020-02-23 11:02:38 +01:00
Alexander Olofsson
776c0857fa
Always use ref_ptr for query geometry
2020-02-21 07:51:50 +01:00
Capostrophic
3787625e61
Fix water ripple cleanup (bug #5246 )
2020-02-19 23:27:45 +03:00
Bret Curtis
a0902bb98e
Merge pull request #2700 from akortunov/masks
...
Move VisMask to components
2020-02-17 11:58:53 +01:00
Andrei Kortunov
84979fa8b7
Move VisMask to components
2020-02-16 16:03:35 +04:00
Alexander Olofsson
5de1e0fb0c
Use queryGeom for all query geometry accesses
2020-02-15 03:12:52 +01:00
Mads Buvik Sandvei
49e0c6f17b
Basic hand tracking.
2020-02-14 22:11:19 +01:00
Alexander Olofsson
7db58a893a
Ensure osg/Version is included
2020-02-13 19:32:17 +01:00
Alexander Olofsson
807f550386
Fix building mwrender/sky with OSG 3.6.5
...
OSG commit aff574b completely replaces the method of doing user-defined
query geometry, removing support for modifying the default geometry.
2020-02-13 19:15:33 +01:00
Capostrophic
fcbd3b4324
Don't try to attach absent shield models to NPCs
2020-02-11 11:58:02 +03:00
Capostrophic
4a78674583
Make sure not to pick the ground shield model incorrectly
2020-02-02 15:39:29 +03:00
capostrophic
bbe5adb860
Use shield body part model for creatures (bug #5250 )
2020-01-10 14:18:40 +03:00
Andrei Kortunov
1cdd33b434
Implement additional stringops to avoid Boost functions
2020-01-09 19:40:22 +04:00
Andrei Kortunov
24ce242941
Implement TestCells (feature #5219 )
2019-12-22 11:13:42 +04:00
Andrei Kortunov
cd81f81fb6
Initialize variables to avoid GCC warnings
2019-12-22 10:44:14 +04:00
Andrei Kortunov
97ee4bc349
Improve equipment logic (bug #5223 )
2019-12-14 22:30:27 +04:00
Andrei Kortunov
43330f1dd1
Merge pull request #2626 from akortunov/master
...
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:37:21 +04:00
Andrei Kortunov
d66b81d7f7
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:35:32 +04:00
elsid
8083df4567
Avoid virtual call in Animation dtor
2019-11-17 18:50:11 +01:00
elsid
cf01df31be
Remove unused variable initialization
...
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: warning: Value stored to 'material' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
^
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: note: Value stored to 'material' during its initialization is never read
2019-11-17 18:50:11 +01:00
Andrei Kortunov
b21dc17538
Attempt to shut up CoverityScan warnings about tainted values
2019-11-14 18:28:38 +04:00
Andrei Kortunov
5c6ca82c45
Clamp fallback value from config
2019-11-13 15:10:19 +04:00
Andrei Kortunov
ca2a524a5f
Avoid null pointer dereference
2019-11-13 14:50:42 +04:00
Andrei Kortunov
1835a39c57
Do not show shields in the 1st-person view when shield sheathing is enabled
2019-11-09 17:48:05 +04:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images"
2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
...
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
Andrei Kortunov
7cd4fa4706
Ignore shields sheathing for creatures without sheathing bone
2019-10-26 12:41:16 +04:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield
...
Shields holstering support
2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6
Shields holstering support (feature #5193 )
2019-10-22 09:02:59 +04:00
Bret Curtis
36119ec2c4
Merge pull request #2562 from Capostrophic/weather
...
Weather-related fixes (incl. bug #4783 )
2019-10-21 21:56:02 +02:00
Capostrophic
43b1b9dfa2
Weather-related fixes (incl. bug #4783 )
...
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
2019-10-19 22:47:21 +03:00
bzzt
1316816148
fix #5176
2019-10-18 13:37:00 +00:00
Andrei Kortunov
6e6d6d7bda
Use forward declaration
2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96
Use rain settings from openmw.cfg (bug #4262 )
2019-10-13 22:32:23 +04:00
Andrei Kortunov
e5564df8cb
Implement vanilla-style wind speed calculations (bug #4449 )
2019-09-24 10:59:58 +04:00
Andrei Kortunov
b360deaec3
Store raw data about fog of war instead of RGBA images (bug #5108 )
2019-09-22 19:59:12 +04:00
Andrei Kortunov
a4d196f33f
Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168 )
2019-09-19 21:48:43 +04:00
Andrei Kortunov
d58f93f388
Use sayDone() only for scripting backward compatibility
2019-09-06 09:19:41 +04:00
Andrei Kortunov
c059bf04cc
Rename getWeaponPart() function
2019-08-27 09:55:02 +04:00
Andrei Kortunov
fe71ce9cb2
Optimize custom bones search visitor
2019-08-18 10:30:21 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera
...
Rewrite messed up playerlooking switch handling (bug #5078 )
2019-08-17 23:15:21 +04:00
Andrei Kortunov
6156ab45de
[Regression] inject bones for NPC's with custom animation models
2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c
2019-08-11 12:07:49 +03:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6
2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0
Revert "Do not use a separate GlowUpdater for every arrow in quiver"
...
This reverts commit b7c214b1bc
.
2019-08-09 21:38:03 +04:00
Andrei Kortunov
fcd6e915d4
Fallback for long animation groups
2019-08-09 19:40:30 +04:00
Andrei Kortunov
afaff8231d
Use the Weapon Bone as fallback
2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
2019-08-09 19:40:27 +04:00
Andrei Kortunov
b7c214b1bc
Do not use a separate GlowUpdater for every arrow in quiver
2019-08-07 12:58:18 +04:00
Andrei Kortunov
8557346fbd
Use glow for enchanted arrows (feature #5122 )
2019-08-07 12:58:14 +04:00
Andrei Kortunov
1eed511b4e
Use enchanted glow for pulled arrows
2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1
Move getEnchantmentColor() from Animation to Class
2019-08-07 08:51:46 +04:00
Capostrophic
0b074f2211
Rewrite messed up playerlooking switch handling (bug #5078 )
2019-07-29 15:44:17 +03:00
Alexei Dobrohotov
8ebecb7584
Merge branch '7' into 'master'
...
fixes pitch black ripples in shadow
See merge request OpenMW/openmw!123
2019-06-01 12:13:14 +00:00
bzzt
403171e083
fixes pitch black ripples in shadow
2019-05-29 13:37:00 +00:00
Alexei Dobrohotov
e0fb411fc8
Merge branch '2' into 'master'
...
stop making new reflacttetures at intext change
See merge request OpenMW/openmw!116
2019-05-24 14:08:09 +00:00