mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 21:29:56 +00:00
Code Issues Releases Wiki Activity
26555 commits 107 branches 66 tags 133 MiB
Commit graph

17937 commits

Author SHA1 Message Date
unelsson
0cfabd6f3b Move mapToSource back to constructor 2021-08-22 23:42:27 +03:00
unelsson
b2fe591590 Don't do any storing in the constructor 2021-08-22 23:42:27 +03:00
unelsson
45549da0f5 For most commands, set mOld in redo, not in constructor 2021-08-22 23:42:27 +03:00
psi29a
716eebe616 Merge branch 'terrainselectioncrashfix' into 'openmw-47' 
Fix terrain selection crash

See merge request OpenMW/openmw!1165

(cherry picked from commit ec4e3b04a7)

b84e41bd Avoid storing ref, dynamic cast worldspacewidget for safety
d62ddc00 Use QPointer to detect object existence, less verbose debug messages
cb42b528 Remove friend, make getEditMode public to allow editmode testing.
4b148180 Restucture code
08f7c73e Fix text
 2021-08-22 19:22:54 +00:00
psi29a
855f491196 Merge branch 'splintercell' into 'master' 
Clean up text key extraction

See merge request OpenMW/openmw!1163
 2021-08-22 14:51:54 +00:00
Alexei Dobrohotov
0922d0b105 Clean up text key extraction 2021-08-22 05:56:30 +03:00
Petr Mikheev
3771e523f1 More object bindings 2021-08-21 17:18:11 +02:00
Alexei Dobrohotov
31e70f2ecc Merge branch 'minor_factorisation' into 'master' 
Minor factorisation in apps/openmw/mwmechanics/actors.cpp

See merge request OpenMW/openmw!1143
 2021-08-21 06:22:17 +00:00
cc9cii
28ad139464 Check if deleted, just in case. 2021-08-21 07:20:10 +10:00
psi29a
d09c807a40 Merge branch 'fixbadcast' into 'master' 
Fix std::bad_cast

Closes #6217

See merge request OpenMW/openmw!1130
 2021-08-20 20:36:44 +00:00
unelsson
7801f42005 Don't do mapToSource at executeModify 2021-08-20 22:32:41 +03:00
psi29a
9751717b35 Merge branch 'components_qt' into 'master' 
Do no link binaries with Qt where it's not used

See merge request OpenMW/openmw!1157
 2021-08-20 19:29:42 +00:00
elsid
e9b8933b2f
Do no link binaries with Qt where it's not used 
Define components_qt static library with all qt dependent components that also
depends on other components. Link only cs, wizard and launcher with qt
dependent components.
 2021-08-20 19:02:09 +02:00
psi29a
77e58abf0d Merge branch 'lua_input' into 'master' 
Lua package 'openmw.input'

See merge request OpenMW/openmw!1073
 2021-08-20 11:44:42 +00:00
elsid
193be0d5d1 Merge branch 'some_small_changes' into 'master' 
Fix coverity warning and build on some osg

See merge request OpenMW/openmw!1153
 2021-08-19 23:40:14 +00:00
cc9cii
bd3ef506cd Empty Pathgrid record is considered as the modder's intention to delete any existing record. 2021-08-19 19:30:01 +10:00
cc9cii
802a202455 Remove warning log messages as they are more suitable for OpenCS. 2021-08-19 12:45:09 +10:00
cc9cii
8244ba8957 Erase old record instead (i.e. assume an empty Pathgrid record was placed in purpose) 2021-08-19 12:31:49 +10:00
cc9cii
1d925154f2 Do not store (or worse, overwrite) empty PGRD records. Should resolve Issue #6209. 2021-08-19 12:31:49 +10:00
glassmancody.info
a6c7fcd436 don't pingpong depth function on character preview update 2021-08-18 15:46:25 -07:00
elsid
fea4fb6e69
Make AiPursue path destination to be as close as possible to target 
Even when target is not reachable actor will try to run there either because
target navmesh polygon is selected within extended area or because partial path
is built to the closest possible polygon.
 2021-08-18 23:44:36 +02:00
elsid
9112c65afc
Use pathgrid path when destination is closer to different graph component node 
Partially revert d863267d5c to restore 0.46
behaviour for pathgrid based pathfinding.
 2021-08-18 19:52:10 +02:00
glassmancody.info
d63eb3325f fix coverity warning and build on some osg 2021-08-17 17:45:50 -07:00
psi29a
6595c731f7 Merge branch 'fix_rc_poly_mesh_flags_length' into 'master' 
Fix flags length for rcPolyMesh

See merge request OpenMW/openmw!1134
 2021-08-17 09:19:32 +00:00
psi29a
faa3e04494 Merge branch 'const_reff' into 'master' 
Sprinkle some const-ref

See merge request OpenMW/openmw!1145
 2021-08-17 08:20:13 +00:00
cc9cii
b1fb3e2313 Add missing includes. 2021-08-17 13:53:14 +10:00
cc9cii
47a841d3b7 Fix/workaround for Issue #3246 
OpenMW save file assumes the presence of NPC/Creature data but the vanilla save file provides only the delta changes in most situations.  The base data are not available without loading all the relevant dependency content files.  Duplicating that code in the ESSImporter is not desirable.

Ideally a flag should be set but that will mean a change in the save file format.  For a minor change such as this doing so seems like an overkill.  So a temporary workaround is introduced where the gold carried by the NPC/Creature is used as an indicator as the lack of ACDT data.
 2021-08-17 12:29:28 +10:00
jvoisin
39cd679ca9 Minor factorisation in apps/openmw/mwmechanics/actors.cpp 2021-08-16 13:13:44 +02:00
Alexei Dobrohotov
6c1ac9ed9f Merge branch 'init_sky' into 'master' 
Use an initialization list in WrapAroundOperator's constructor

See merge request OpenMW/openmw!1146
 2021-08-16 01:19:28 +00:00
Alexei Dobrohotov
7665ebfa67 Merge branch 'another_fix' into 'master' 
Fix #6219

Closes #6219

See merge request OpenMW/openmw!1137
 2021-08-16 01:15:52 +00:00
Alexei Dobrohotov
873e16ae93 Merge branch 'emp' into 'master' 
Use an emplace instead of an insert

See merge request OpenMW/openmw!1144
 2021-08-16 01:14:36 +00:00
elsid
f966fdb65e Merge branch 'noweak' into 'master' 
use shared_ptr inside the physics simulation to simplify the code

See merge request OpenMW/openmw!1141
 2021-08-15 21:59:47 +00:00
jvoisin
ff2a51a484 Use an initialization list in WrapAroundOperator's constructor 2021-08-15 19:57:20 +02:00
jvoisin
7a015d24c6 Sprinkle some const-ref 2021-08-15 19:50:28 +02:00
jvoisin
0792bb212a Use an emplace instead of an insert 2021-08-15 18:57:33 +02:00
glassmancody.info
ed72f3335b silence compiler warning 2021-08-15 08:02:00 -07:00
fredzio
ec871e6bf7 Use shared_ptr instead of weak_ptr for actors handle inside the 
simulation

The purpose of weak_ptr is to avoid performing the simulation on deleted
Actor by promoting it to a shared_ptr via a lock() call. This clutter
the code with a lot of branches, whereas the overwhelmingly common case is for the call to succeed.
Since the simulation is decoupled from the engine state, we can use a shared_ptr instead of a weak_ptr.
This allow us to ignore (ie not handle) the rarer case where the actor is delete from the scene. This means that the simulation
will run for one frame more than before for each actor, whereas the rest of the engine
will be ignorant of this.
 2021-08-15 16:21:16 +02:00
AnyOldName3
7400050b38 Merge branch 'character_preview_alpha_fix' into 'master' 
Fix transparent objects being invisible in character doll

See merge request OpenMW/openmw!1140
 2021-08-15 00:01:23 +00:00
glassmancody.info
6cc71745ac ensure character preview is using standard depth 2021-08-14 14:50:33 -07:00
Mads Buvik Sandvei
d40c18234a Double buffering the water's node position uniform 2021-08-14 17:41:58 +00:00
fredzio
713f612bdb Partially revert !1046: the player is added before the scene exists, so we need to check again the grounded state, as it correctly was. 2021-08-13 18:01:16 +02:00
jvoisin
b01ef2629c Fix two Wreorder clang warnings 2021-08-13 13:59:57 +02:00
Alexei Dobrohotov
839cf36bdd Merge branch 'hidden_markers' into 'master' 
Use common implementation to filter hidden markers

See merge request OpenMW/openmw!1132
 2021-08-12 22:29:20 +00:00
elsid
54a676f2e3
Add functions to get length of recast type arrays 
To avoid duplicating same formulas in multiple places.
 2021-08-12 22:43:01 +02:00
elsid
05258ed644
Remove redundant TileCachedRecastMeshManager::hasTile function 
It's used only for tests. getMesh is a valid replacement.
 2021-08-12 22:40:06 +02:00
elsid
3caf45807f
Use common implementation to filter hidden markers 2021-08-12 22:35:16 +02:00
Cédric Mocquillon
b0b60b05b8 Do not update doors markers at each frame, only when needed 2021-08-12 22:10:45 +02:00
unelsson
298db2ef76 Initialize and check pointer. 2021-08-12 22:31:37 +03:00
unelsson
f1d05a93bf Get index and model from proxy 2021-08-12 22:28:16 +03:00
jvoisin
bcdd0f55da Merge branch 'bc_refnum' into 'master' 
Always print object refnum

See merge request OpenMW/openmw!1123
 2021-08-12 10:18:55 +00:00
elsid
e84a177a91
Always print object refnum 
Also print content file index even when it's negative. To be able to identify
the object unambiguously.
 2021-08-12 02:02:25 +02:00
fredzio
de9ee2f196 Revert "Calls directly MovementSolver::traceDown instead of" 
This reverts commit c1e50f530b.
 2021-08-11 21:53:04 +02:00
Petr Mikheev
0e6fbbc126 Lua package 'openmw.input' 2021-08-10 19:00:52 +03:00
psi29a
45b45b3560 Merge branch 'fix_op_bzzt_whoopsie' into 'master' 
resolve issue of OP meshes that cross boundaries

See merge request OpenMW/openmw!1117
 2021-08-10 15:50:33 +00:00
Bret Curtis
c99bddc8dc Revert "Move reference to the right cell according to its geographical position" 
This reverts commit d0677c3f07.
 2021-08-09 22:11:00 +02:00
Bret Curtis
7dfaef7644 resolve issue of meshes that cross boundaries; should only be calculating the maxBound, not the minBound of y; also fix it in groundcover as it was copied blindly over; 2021-08-09 22:05:12 +02:00
Cédric Mocquillon
bfc9ea9e32 Fix warning on MSVC convertion from double to float 2021-08-09 19:43:35 +02:00
Cédric Mocquillon
b0e30e4bb6 Change setting to clamp the local viewing distance to fix value (instead of coeff) 2021-08-09 19:43:34 +02:00
Cédric Mocquillon
b27de8f188 Disable zooming when setting is off 2021-08-09 19:43:34 +02:00
Alexei Dobrohotov
73e83fd3d8 Merge branch 'dontcrash' into 'master' 
Fix #6208 (hopefully)

Closes #6208

See merge request OpenMW/openmw!1113
 2021-08-09 17:10:11 +00:00
fredzio
8e3984ae5a Clear mActors when reseting the simulation. Otherwise during next run we can try to read past the end of mActorsFrameData. 2021-08-09 14:46:41 +02:00
jvoisin
586d8684d0 Fix two coverity issues about uninitialised variables 2021-08-09 12:43:30 +02:00
psi29a
cb7a4d20dd Merge branch 'killmutex' into 'master' 
Remove mutex from PtrHolder

See merge request OpenMW/openmw!1110
 2021-08-08 19:45:16 +00:00
psi29a
3afa9829b3 Merge branch 'tracedown' into 'master' 
Correct calls to traceDown in addActor

See merge request OpenMW/openmw!1109
 2021-08-08 19:41:53 +00:00
fredzio
c1e50f530b Calls directly MovementSolver::traceDown instead of 
PhysicsSystem::traceDown before inserting into mActors.

The latter does nothing until the actor is inserted into mActors.
We can't move the call after the insertion either because then
the actor is part of the simulation, and we'd have a race.
 2021-08-08 18:26:35 +02:00
AnyOldName3
8d93748f87 Fix rebase issue 2021-08-08 17:25:57 +01:00
AnyOldName3
cf15803e67 Disable triangle detection workaround when Bullet actually uses triangles 2021-08-08 16:53:14 +01:00
AnyOldName3
8b4c2d205d WIP-ish glPolygonOffset for Bullet debug geometry 2021-08-08 16:53:08 +01:00
fredzio
b4dd9e6b4d Avoid division by zero in movementsolver when an actor is immobile and 
in a storm
 2021-08-08 17:19:18 +02:00
fredzio
ee09f3095f At last kill PtrHolder mutex 2021-08-08 15:05:07 +02:00
fredzio
07fa1803f7 Use btCollisionObject* instead of MWWorld::Ptr inside of Projectile 
collision handling and castRay() to avoid calling getPtr(). It is a step forward
removing the mutex inside of PtrHolder.

Do the same for DeepestNotMeContactTestResultCallback. It is used
only for not-ranged combat for now, but do it anyway for parity with all
other callback. This way, once the PtrHolder mutex is gone one will not
have to worry about wether it is safe to use the callback in a specific
context.

To avoid use-after-free with projectile / projectile collision, defer deletion of projectile.
Since instead of storing a copy of target Ptr we have a pointer to its collision object,
we can't delete projectiles until after we finished iterating over the loops.
 2021-08-08 15:05:07 +02:00
fredzio
e88b94d0b0 Move btCollisionObject* into PtrHolder 
Remove unused function
 2021-08-08 15:05:07 +02:00
psi29a
8ad3d3d792 Merge branch 'freezeandcool' into 'master' 
Don't use FreezeOnCull for any particle system (#4744)

Closes #4744

See merge request OpenMW/openmw!1103
 2021-08-08 12:35:26 +00:00
psi29a
8c81191d09 Merge branch 'schneller' into 'master' 
Optimize actors physics simulation

See merge request OpenMW/openmw!1048
 2021-08-08 12:27:53 +00:00
Alexei Dobrohotov
1fc7cb8191 Don't use FreezeOnCull for any particle system (#4744) 2021-08-08 03:36:35 +03:00
fredzio
5fc3b80406 Don't query actor halfextent in a tight loop, use the already existing 
variable. These repeated calls become costly with > 150 actors.
 2021-08-07 13:38:24 +02:00
fredzio
7dd5e715d7 Compute and store actor half extents. This is faster for 2 reasons: 
- half extents changes when actor scale is modified, which is very rare
- we don't need to protect them by the actor mutex.
 2021-08-07 13:38:24 +02:00
fredzio
bcd6541d3e Reorganize ActorFrameData members: 
- constify all read-only variables
- order them so that all variables modified as aprt of the simulation
  fits in one cache line
 2021-08-07 13:38:24 +02:00
fredzio
0c5cf6ec19 Store the btCollisionObject* of the object we're standing on instead of 
MWWorld::Ptr:
- they are equivalent
- btCollisionObject* is readily available from the simulation, it saves
  a call to a mutex
- btCollisionObject* is smaller
 2021-08-07 13:38:24 +02:00
fredzio
26d9052b8c Move the weak_ptr<Actor> outside of ActorFrameData. 2021-08-07 13:38:24 +02:00
fredzio
f68273c3c0 Remove Actor* from ActorFrameData 2021-08-07 13:38:24 +02:00
fredzio
9e911cc8b5 Introduce helper function to write back updated values inside parent Actor class 2021-08-07 13:38:24 +02:00
fredzio
b04c958410 Modify the way swimming is handled: 
- compute the swimming state instead of storing it, it changes as part of the simulation and was not updated, so it was wrong anyway.
- store the swim level in ActorFrameData, it is constant per Actor so no need to compute it inside the simulation
 2021-08-07 13:38:24 +02:00
fredzio
6e51a9a512 Simplify a bit the solver 2021-08-07 13:38:24 +02:00
fredzio
51514e44cc Handle jump as part of the simulation preparation (inside of 
PhysicsSystem) instead of inside the simulaiton.
For mechanics, we don't care how the jump is handled, just that it will be.
 2021-08-07 13:38:24 +02:00
fredzio
1bfaf353be Explicitely store all the potential states an Actor can have into the 
ActActorFrameData structure. It makes it easier to reason about the
simulation (and hopefully simplify it).
Remove atomics from Actor class as a side effect.

Rename mFloatToSurface to mInert to make is explicit what it represent, not what it is used for
Store the Actor rotation (1 Vec2) instead of the whole ESM::Position (2 Vec3)
 2021-08-07 13:38:24 +02:00
fredzio
9472728fa4 Do not generate data for immobile actors instead of early out from the solver 2021-08-07 13:38:24 +02:00
Evil Eye
29921bf9fa Don't stack cast packages 2021-08-07 10:06:56 +02:00
psi29a
b770373491 Merge branch 'OpenCS-enforce-str-length' into 'master' 
OpenCS - Disallow entry of strings longer than the lengths allowed by the file format (#3066)

See merge request OpenMW/openmw!1088
 2021-08-06 21:08:09 +00:00
glassmancody.info
09e03fde2e refactor and fix wobbly shores 2021-08-04 17:49:57 -07:00
glassmancody.info
cad0b151cb enable shaders path and dehardcode depth formats 2021-08-04 17:39:11 -07:00
glassmancody.info
d89e37d689 add framebuffer extension check and fix issues with manual screenshots 2021-08-04 17:39:11 -07:00
glassmancody.info
70fac33940 initial reverse-z depth implementation 2021-08-04 17:39:11 -07:00
Petr Mikheev
a94072243b Lua command core.quit 2021-08-04 19:14:24 +03:00
cc9cii
8aee84c46e Disallow entry of strings longer than the lengths allowed by the file format. 
It is possible to allow longer strings but that will require an extension in the omwaddon format as well as changes to the reader to handle that extension.  Such changes should be a separate MR.

(applied the patch in https://gitlab.com/OpenMW/openmw/-/issues/3066)
 2021-08-04 09:39:18 +10:00
psi29a
9fa7521fc5 Merge branch 'OpenCS-no-charconv' into 'master' 
OpenCS - Avoid the inclusion of charconv header

See merge request OpenMW/openmw!1087
 2021-08-03 23:32:40 +00:00
psi29a
9b7e14ec00 Merge branch 'OpenCS-moved-reference' into 'master' 
OpenCS - Fix moved reference - Issues #3514 and #4752

See merge request OpenMW/openmw!1051

(cherry picked from commit 2bee171c7990522da33c2667f7d079fa35f4ede0)

36c30f7f Fix for Issue #3514 where moving a reference to another cell is not handled properly.
40327681 Update the changelog.
 2021-08-03 23:29:05 +00:00
psi29a
e10e9c0005 Merge branch 'navmesh_reduce_lock_wait' into 'master' 
Reduce waiting duration on locks when updating navmesh object in the main thread (#6193)

Closes #6193

See merge request OpenMW/openmw!1079
 2021-08-03 23:05:39 +00:00
psi29a
16d04cf76c Merge branch 'fixtexindex' into 'master' 
Fix texture index search bug

See merge request OpenMW/openmw!1080
 2021-08-03 23:00:33 +00:00
cc9cii
bf06898a79 Retain the use of std::string_view in the function signature. 2021-08-04 08:23:22 +10:00
cc9cii
99e691fbe3 Avoid the inclusion of <charconv> header due to Ubuntu Bionic (18.04) which as gcc version less than 8.1 
Partially reverts commit fd67ebde25
 2021-08-04 06:47:14 +10:00
Petr Mikheev
3ce5e9e680 Improve error messages in components/lua/serialization.cpp 2021-08-03 16:42:26 +03:00
Petr Mikheev
0f7f5ce140 Remove Lua command "self:setDirectControl" 2021-08-03 14:36:51 +03:00
elsid
c8987bda2f
Store reference to BulletShapeInstance for btCollisionShape 
To keep btCollisionShape lifetime.
 2021-08-03 12:21:56 +02:00
elsid
4574e5f565
Remove redundant Navigator API functions 2021-08-03 12:21:55 +02:00
psi29a
bd1bf4ec73 Merge branch 'donoteraseme' into 'master' 
#6192: Stop crashing in moveActors()

See merge request OpenMW/openmw!1085
 2021-08-03 07:53:13 +00:00
fredzio
bc738c5640 Use extract/insert instead of erase/emplace 
When we call moveObject(), we might trigger a change of cell for the
actor, which in turn triggers updatePtr(). The erase/emplace
construct invalidate references, whereas extract/insert do not.

The reason is was working before !1075 is because we were always
"refreshing" the reference by a call to getActor().
 2021-08-03 07:00:42 +02:00
unelsson
09ee2a0a36 fix texture brush index search 2021-08-01 19:42:41 +03:00
psi29a
4b48e62b64 Merge branch 'fixandclean' into 'master' 
Fix opencs build and remove some clang warnings

See merge request OpenMW/openmw!1078
 2021-08-01 12:11:17 +00:00
fredzio
1391194152 Remove unneeded return statement 2021-08-01 13:14:32 +02:00
fredzio
9ba459662d Remove unneeded std::move 
[19/199] Building CXX object apps/opencs/CMakeFiles/openmw-cs.dir/model/world/commands.cpp.o
../../../apps/opencs/model/world/commands.cpp:298:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:298:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
../../../apps/opencs/model/world/commands.cpp:333:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:333:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
2 warnings generated.
 2021-08-01 13:14:32 +02:00
fredzio
36e33b0cf2 Add missing override 2021-08-01 13:14:32 +02:00
fredzio
bede1ea1ec Fix build 2021-08-01 13:14:32 +02:00
psi29a
15d278de55 Merge branch 'opt-out-compose' into 'master' 
Make it possible to opt out of composing variables

Closes #6186

See merge request OpenMW/openmw!1076
 2021-08-01 08:53:52 +00:00
cc9cii
67cad2c515 Fix CSMWorld::InfoCollection::getTopicRange() returning one too many. 2021-08-01 15:53:00 +10:00
AnyOldName3
04e9b6d242 Abort on duplicate content file 2021-08-01 03:04:12 +01:00
AnyOldName3
4727ae4b3b Make it possible to opt out of composing variables 2021-08-01 02:47:10 +01:00
psi29a
547bc4a252 Merge branch 'notonlyactors' into 'master' 
Refactor the physics simulation to make it not actor centric.

See merge request OpenMW/openmw!1075
 2021-07-31 23:39:22 +00:00
psi29a
a3a079acc1 Merge branch 'projstats' into 'master' 
Add projectiles number to the resources stats

See merge request OpenMW/openmw!1074
 2021-07-31 23:12:14 +00:00
psi29a
4c5e6beb75 Merge branch 'canyouseeme' into 'master' 
Solve actor awareness check without async physics

See merge request OpenMW/openmw!1071
 2021-07-31 22:18:35 +00:00
fredzio
35928cf4d3 Refactor a bit the physics simulation to make it not actor centric: 
- inline PhysicsSystem::applyQueuedMovements() into PhysicsSystem::stepSimulation()
- rename PhysicsTaskScheduler::moveActors() to PhysicsTaskScheduler::applyQueuedMovements()
- move the actor movement code from World::doPhysics() to
  PhysicsSystem::moveActors() (analogically to the projectile manager)
 2021-07-31 23:39:04 +02:00
psi29a
141095b850 Merge branch 'OpenCS-loading-opt' into 'master' 
OpenCS loading time improvements

See merge request OpenMW/openmw!1044
 2021-07-31 21:27:29 +00:00
fredzio
c76387162b Add projectiles number to the resources stats 2021-07-31 23:08:50 +02:00
psi29a
ca011927f3 Merge branch 'ObjectPagingDisappearingTexture' into 'master' 
Move reference to the right cell according to its geographical position

See merge request OpenMW/openmw!1065
 2021-07-31 10:58:20 +00:00
Evil Eye
5cdf1e7e6b Merge branch 'vec3_vs_xyz' into 'master' 
Use Vec3f instead of x,y,z in World API

See merge request OpenMW/openmw!730
 2021-07-31 10:36:11 +00:00
fredzio
a7b190ad29 Change rotateObject() to take a osg::Vec3f argument instead of 3 floats 
for readability.
 2021-07-30 23:24:53 +02:00
fredzio
88a5ca440b Change moveObject() to take a osg::Vec3f argument instead of 3 floats 
for readability.
 2021-07-30 23:24:49 +02:00
fredzio
4e7c128d25 The LOS cache is now unconditionally used without async physics as well 
with a TTL of 0 frame. It helps performance when several subsystems
request the same LOS in the same frame (combat, headtracking, etc).
Except it doesn't work if the cache is never trimmed.
 2021-07-30 22:23:42 +02:00
Cédric Mocquillon
d0677c3f07 Move reference to the right cell according to its geographical position 2021-07-30 18:28:29 +02:00
psi29a
8c36eb56cf Merge branch 'stereo_friendly_water' into 'master' 
Stereo friendly water and statesetupdater

See merge request OpenMW/openmw!563
 2021-07-30 11:00:49 +00:00
psi29a
c5d49b44ba Merge branch 'lua_settings' into 'master' 
Add Lua package 'openmw.settings'

See merge request OpenMW/openmw!1017
 2021-07-30 10:47:15 +00:00
Evil Eye
779795734f Remove calm/rally/demoralize and turn undead from the wrong targets 2021-07-29 18:23:45 +02:00
Evil Eye
a366a85c4e Merge branch 'noalloc_dance_for_npcanimation' into 'master' 
Don't do an unnecessarily complex memory allocation dance in npcanimation.cpp

See merge request OpenMW/openmw!1042
 2021-07-28 17:25:28 +00:00
Evil Eye
88d207b0cd Merge branch 'land' into 'master' 
Correct creature landing sound type (bug #6118)

Closes #6118

See merge request OpenMW/openmw!1054
 2021-07-28 16:18:44 +00:00
psi29a
ea05b958b8 Merge branch 'FixIssueWithTRData' into 'master' 
Fix issue with Tamriel Data landscapes

See merge request OpenMW/openmw!1064
 2021-07-28 10:16:55 +00:00
psi29a
292e6f1a9e Merge branch 'seducer_ice_queen' into 'master' 
Prevent a missing weapon animation from partially freezing actors

See merge request OpenMW/openmw!1060
 2021-07-28 09:06:13 +00:00
Cédric Mocquillon
c98b0f713d If same area is defined in multiple plugin the last must wins 2021-07-28 10:29:16 +02:00
elsid
6adf7b10ae
Fix removing heightfield from navigator 
It's added not as object so it shouldn't be removed as it.
 2021-07-27 20:11:22 +02:00
Petr Mikheev
2938aaf05c Rename API_VERSION -> API_REVISION in Lua API. 2021-07-27 20:06:04 +02:00
Petr Mikheev
3e4c0b775d Add Lua package 'openmw.settings' 2021-07-27 20:06:04 +02:00
Petr Mikheev
68b8a148d7 Initialize Lua packages in LuaManager::init rather than in constructor. 2021-07-27 19:52:17 +02:00
Evil Eye
977f717f8b Prevent a missing weapon animation from partially freezing actors 2021-07-27 16:33:07 +02:00
Alexei Dobrohotov
536dc6a0c6 Correct creature landing sound type (bug #6118) 2021-07-27 07:39:21 +03:00
psi29a
5a434aebe0 Merge branch 'SortedStaticLands' into 'master' 
Replace land static container from vector to flat_set

See merge request OpenMW/openmw!853
 2021-07-26 18:29:07 +00:00
Cédric Mocquillon
7772f5111b std::set version 2021-07-26 18:30:06 +02:00
madsbuvi
41c08b1c3b Stereo friendly StateSetUpdater 
(cherry picked from commit 496b3aef88b8fd867dcdd23a6ca43144573b1b2f)

Stereo friendly water

(cherry picked from commit 0e22c55e48a7f965367d3d430c1bef5357b22748)

Option to disable per view mapping.

Include memory header

De-hardcode settings and buffers.

formatting error

Update water.cpp (whitespace)

Update water.cpp (more whitespace)

include render order

c array -> c++ array
 2021-07-26 14:01:02 +02:00
psi29a
44ceb9572a Merge branch 'recast_mesh_heightfield' into 'master' 
Reduce navmesh cache size by special handling for heightfields

See merge request OpenMW/openmw!1032
 2021-07-26 11:49:30 +00:00
glassmancody.info
166e23a6d9 fix CI artifacts, missing header 2021-07-25 20:49:17 -07:00
elsid
9a5ec5fd03
Store heightfields as array of heights instead of triangles 
To reduce size of RecastMesh and therefore cache size.
 2021-07-26 00:22:21 +02:00
elsid
28b2f769c2
Update navmeshtilescache benchmark generators 2021-07-26 00:22:21 +02:00
elsid
fdee9db20c
Consider RecastMeshManager not empty when there is water 2021-07-26 00:22:21 +02:00
elsid
5d6c93566d
Rename DetourNavigator::Water -> Cell 2021-07-26 00:22:21 +02:00
elsid
753767d6d9
Store only water shift 
Rotation is not used.
 2021-07-26 00:22:20 +02:00
elsid
a1549321d7
Move Water struct out of RecastMesh class 2021-07-26 00:22:20 +02:00
elsid
d60edb36aa
Make RecastMesh independent from recast scale factor 
To avoid scaling until it's required by delaying coordinates conversion until
navmesh generation.
 2021-07-26 00:22:20 +02:00
elsid
af7059373c
Make RecastMesh independent from the order of RecastMeshBuilder calls 
To make sure RecastMesh objects are equal if built with the same data but in
different order. Will be used later when there will be more than one place
building RecasMesh objects.
 2021-07-26 00:22:20 +02:00
elsid
100cba6260
Use navigator field in Scene 2021-07-26 00:22:03 +02:00
psi29a
6949dd89c2 Merge branch 'gui_shaders' into 'master' 
Add shader path for mygui (#6162)

See merge request OpenMW/openmw!1019
 2021-07-25 21:37:39 +00:00
psi29a
b92c6985cd Merge branch 'auto_in_most_apps' into 'master' 
Using auto keyword in most apps

See merge request OpenMW/openmw!885
 2021-07-25 21:23:26 +00:00
psi29a
7d7427015e Merge branch 'removing_unused_launcher_imports' into 'master' 
Removing unused imports in the Launcher

See merge request OpenMW/openmw!884
 2021-07-25 21:18:25 +00:00
Petr Mikheev
200ccfab69 Merge branch 'Allow-Zoom-levels-on-the-World-Map' into 'master' 
Allow Zoom levels on the World Map

See merge request OpenMW/openmw!275
 2021-07-25 20:19:11 +00:00
fredzio
7145ef4ce0 Update AABB also in sync cases 2021-07-25 18:00:48 +02:00
Petr Mikheev
e371831086 Merge branch 'esmstore_infix' into 'master' 
Use prefix increment for iterators in esmstore.cpp

See merge request OpenMW/openmw!1041
 2021-07-25 13:28:18 +00:00
jvoisin
ce8c30bf07 Minor code simplification in npcanimation.cpp 2021-07-25 14:20:37 +02:00
Cédric Mocquillon
1051745f29 [Launcher] Add new setting 'allow zooming' to advanced tab in the launcher 2021-07-25 14:17:10 +02:00
CedricMocquillon
9fee9dbc9c [Global map] Regroup markers when the zoom out 2021-07-25 14:17:10 +02:00
CedricMocquillon
18f5853279 [Global <-> Local] Auto switch between local and global map when zoom in/out 2021-07-25 14:17:09 +02:00
CedricMocquillon
8c87defddf [Local map] Use the distance view in the local map 2021-07-25 14:17:08 +02:00
CedricMocquillon
ed04ebe9ff [Local map] Allow zoom on local map 2021-07-25 14:17:08 +02:00
CedricMocquillon
9fadbd5b7a [Global map] Allow zoom on global map 2021-07-25 14:17:07 +02:00
CedricMocquillon
99cd4b6742 [Refactoring] Several refactorings: 
[Refactoring] Add marker size method instead of using magic constant

[Refactoring] Simplify worldPosToImageSpace and cellTopLeftCornerToImageSpace usage

[Refactoring] Add a missing 'f' to specify the float type

[Refactoring] Make cellTopLeftCornerToImageSpace more homogenous with worldPosToImageSpace

[Refactoring] Extract createmakrercoords method

[Refactoring] Use worldPosToImageSpace instead of cellTopLeftCornerToImageSpace
Remove cellTopLeftCornerToImageSpace as it is not used anymore
Remove getCellSize as it is not used anymore

[Refactoring] Extract new method createMarker

[Refactoring] Extract new method getMarkerCoordinates

[Refactoring] Extract new method getPosition

[Refactoring] Extract new method centerView

[Refactoring] Extract new method createDoorMarker

[Refactoring] Simplify for loop

[Refactoring] Make the test before the loop
 2021-07-25 14:17:06 +02:00
cc9cii
33dcd7585a OpenCS - Jump To Modified 2021-07-24 20:00:25 +00:00
psi29a
2eea590762 Merge branch 'spawn_fix' into 'master' 
Fix #6173

Closes #6173

See merge request OpenMW/openmw!1046
 2021-07-24 12:04:20 +00:00
cc9cii
3e466699c8 A better way to plug a potential memory leak in the event of an exception during push_back(). 2021-07-24 21:23:03 +10:00
cc9cii
fd67ebde25 Changes based on review comments, including: 
* replace murmurhash with std::unordered_map
* plug potential leak from unique_ptr release
* replacing some sections with cleaner code
 2021-07-24 09:17:48 +10:00
fredzio
f348b70733 Set mCanWaterWalk and mOnGround when adding Actor to the scene. 
mCanWaterWalk was set to false and updated during next frame's simulation
mOnGround is set to true but then was updated as part of the scene
loading logic.
 2021-07-23 18:04:58 +02:00
cc9cii
ee3361a118 Fix table being sorted twice (at least it appeared that way according to the sample profiler) 
- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."

(copied the changes from commit SHA-1: 77394fce99)
 2021-07-23 23:18:11 +10:00
cc9cii
725d689e8a Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert(). 
(copied the changes from commit SHA-1: 257126ed69)
 2021-07-23 23:17:16 +10:00
cc9cii
44a333b6db Don't attempt to open files yet to be created. 2021-07-23 21:25:35 +10:00
Petr Mikheev
ec79f26320 Merge branch 'minor' into 'master' 
Minor code cleanup

See merge request OpenMW/openmw!1038
 2021-07-23 11:20:37 +00:00
cc9cii
5c504e4d22 Convert the CellRef record index lookup maps to use integer keys rather than strings. 
- Morrowind load over 300,000 references, so even small inefficiencies add up to longer loading times.
- std::map is used, but should try others, std::unordered_map or even std::vector

(copied the changes from commit SHA-1: 86945d1912)
 2021-07-23 19:07:56 +10:00
cc9cii
10c6304a1f Fix typo from commit cfdbd0d471. 2021-07-23 18:12:09 +10:00
cc9cii
fc2f68a465 Change the loader's top progress bar to show total number of records processed rather than the number of files. 
(copied the changes from commit SHA-1: ff072441fd)
 2021-07-23 17:34:27 +10:00
cc9cii
5fffcab94f Performance improvements for loading Info records. 
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered.  The topic string is hashed.  The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag

(copied the changes from commit SHA-1: 06f9922822)
 2021-07-23 16:05:58 +10:00
cc9cii
66bda84240 Convert RefNum index map to use find(). 
(copied the changes from commits 68e16b6cee and 0de223c637)

NOTE: it is unclear how this change affects commit 61a4a0807b
 2021-07-23 15:30:33 +10:00
cc9cii
be45092e55 Use std::unique_ptr to store records in collections, RefidCollection and RefIdData. 
(copied the changes from commit 23e7e3c165)
 2021-07-23 14:21:21 +10:00
glassmancody.info
e8c6f31e0c add shader path for mygui (#6162) 2021-07-22 15:55:30 -07:00
jvoisin
73c20be29a Use prefix increment for iterators in esmstore.cpp 
See https://pvs-studio.com/en/docs/warnings/v803/
for the rationale.
 2021-07-22 22:03:59 +02:00
jvoisin
74fab99b89 Use a const-ref for an osg::Quat 
Since an osg::Quat contains at least 4 floats,
it should be worth it to use a const-ref instead
of passing it by value.
 2021-07-22 21:33:18 +02:00
jvoisin
f86ddef4db Minor code cleanup 2021-07-22 15:15:41 +02:00
psi29a
469cc44ef7 Merge branch 'tweaks' into 'master' 
Change settings for async physics

See merge request OpenMW/openmw!778
 2021-07-22 07:18:41 +00:00
jvoisin
5e3f000b66 Add a std::noboolalpha to a std::boolalpha 2021-07-21 14:40:54 +02:00
Nuri
36657698fb Added checks for paralysis, knocked down, and death when picking up items from inventory. Fixes #6165 2021-07-21 07:46:02 +00:00
psi29a
cc642b5335 Merge branch 'slimfast' into 'master' 
Reduce size of physics objects by 1/3

See merge request OpenMW/openmw!1024
 2021-07-20 19:03:14 +00:00
Alexei Dobrohotov
e5f96ab4ae Merge branch 'lol_so_random' into 'master' 
Set the ptr's custom data before filling the store so leveled lists have access to the level

See merge request OpenMW/openmw!1028
 2021-07-18 14:02:06 +00:00
Evil Eye
b95cf4fd00 Set the ptr's custom data before filling the store so leveled lists have access to the level 2021-07-18 15:04:25 +02:00
elsid
f92843e3d2
Fix UB: reference binding to misaligned address in Lua tests 
/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166:34: runtime error: reference binding to misaligned address 0x562ea892076c for type 'const struct TestStruct1', which requires 8 byte alignment
0x562ea892076c: note: pointer points here
  00 74 73 31 00 00 00 00  00 00 f8 3f 00 00 00 00  00 00 04 40 21 79 4b 08  00 00 00 74 65 73 74 5f
              ^
    #0 0x562ea6462b8e in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:166
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)

/home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176:34: runtime error: reference binding to misaligned address 0x562ea892078f for type 'const struct TestStruct2', which requires 4 byte alignment
0x562ea892078f: note: pointer points here
 75 63 74 32 04  00 00 00 03 00 00 00 04  00 6e 64 69 74 69 6f 6e  73 00 73 68 61 70 65 00  51 00 00
             ^
    #0 0x562ea6462df9 in deserialize /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:176
    #1 0x562ea68b7402 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:172
    #2 0x562ea68b7bf6 in deserializeImpl /home/elsid/dev/openmw/components/lua/serialization.cpp:204
    #3 0x562ea68b86ea in LuaUtil::deserialize(sol::state&, std::basic_string_view<char, std::char_traits<char> >, LuaUtil::UserdataSerializer const*) /home/elsid/dev/openmw/components/lua/serialization.cpp:251
    #4 0x562ea6464d96 in TestBody /home/elsid/dev/openmw/apps/openmw_test_suite/lua/test_serialization.cpp:197
    #5 0x562ea6d9dac6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #6 0x562ea6d9dac6 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #7 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2682
    #8 0x562ea6d92e25 in testing::Test::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2672
    #9 0x562ea6d93024 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2861
    #10 0x562ea6d93728 in testing::TestInfo::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2834
    #11 0x562ea6d93728 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:3015
    #12 0x562ea6d94142 in testing::TestSuite::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:2994
    #13 0x562ea6d94142 in testing::internal::UnitTestImpl::RunAllTests() /home/elsid/dev/googletest/googletest/src/gtest.cc:5855
    #14 0x562ea6d9e096 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2607
    #15 0x562ea6d9e096 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/elsid/dev/googletest/googletest/src/gtest.cc:2643
    #16 0x562ea6d93140 in testing::UnitTest::Run() /home/elsid/dev/googletest/googletest/src/gtest.cc:5438
    #17 0x562ea5d3fdc6 in RUN_ALL_TESTS() /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:2490
    #18 0x562ea5d3fc6f in main /home/elsid/dev/openmw/apps/openmw_test_suite/openmw_test_suite.cpp:11
    #19 0x7fe3938d0b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #20 0x562ea5d3fb7d in _start (/home/elsid/dev/openmw/build/gcc/ubsan/openmw_test_suite+0x173eb7d)
 2021-07-17 17:41:41 +02:00
fredzio
44f822da56 Do not store a btTransform into Projectile class: reduce its size by 112 bytes 2021-07-17 13:11:41 +02:00
fredzio
f02d01ef0c Do not store btTransform into Object class: reduce its size by 104 bytes 2021-07-17 13:11:41 +02:00
fredzio
62ef708910 Do not store a btTransform into Actor class: reduce its size by 128 bytes 2021-07-17 13:11:39 +02:00
psi29a
42e50e487a Merge branch 'cleaning' into 'master' 
Improve save cleaning

See merge request OpenMW/openmw!1015
 2021-07-16 08:53:06 +00:00
psi29a
22068eed6b Merge branch 'navmesh_cache_without_off_mesh' into 'master' 
Do not use off mesh connections as a part of navmesh cache key

See merge request OpenMW/openmw!1016
 2021-07-16 08:40:56 +00:00
psi29a
6d08a1d731 Merge branch 'skip_async' into 'master' 
Don't put player in the air after going out of tcl

See merge request OpenMW/openmw!1009
 2021-07-16 07:50:26 +00:00
Evil Eye
087e933326 Close windows using Ptrs that are about to be deleted 2021-07-15 22:31:26 +02:00
elsid
beeb882ea8
Do not use off mesh connections as a part of navmesh cache key 
To reduce cache size and make it more flexible.

Adding off mesh connections to the navmesh is the last step of navmesh
generation and it's very fast comparing to other steps (microseconds vs
milliseconds). Having less cache size makes get and set operations almost 2x
times faster that also have an order of microseconds. So in total there is
no performance impact.
 2021-07-14 12:19:17 +02:00
elsid
6128fcfc82
Use empty off mesh connections in benchmark 
To get proper comparison with the next change removing it from the cache key.
 2021-07-14 00:01:46 +02:00
Evil Eye
1e1ebb049e Workaround clang and actually erase from the vector 2021-07-13 21:18:24 +02:00
Evil Eye
86c50ece92 Improve save cleaning 2021-07-12 20:51:13 +02:00
elsid
5c9af1742a
Dump moved cell refs in esmtool 2021-07-12 18:56:45 +02:00
elsid
cfdbd0d471
Indicate moved cell refs explicitly 
This is less error prone approach than use of MovedCellRef fields.

Also make separate functions for skipping and reading moved cell refs to avoid
passing special flags  logic and null pointers for unused arguments.
 2021-07-12 18:56:42 +02:00
elsid
f90c4ae22f
Add yaml-like separator between cell refs 
To be able to separate records visually.
 2021-07-12 18:48:49 +02:00
psi29a
cd9fb2adad Merge branch 'dial_me_maybe' into 'master' 
Change disposition to work like vanilla

Closes #5100 and #5842

See merge request OpenMW/openmw!599
 2021-07-12 14:22:26 +00:00
psi29a
6475082095 Merge branch 'lifetime' into 'master' 
Maybe fix #6071

Closes #6071

See merge request OpenMW/openmw!1010
 2021-07-12 14:11:14 +00:00
psi29a
223216733d Merge branch 'coverity_fix' into 'master' 
Fix some coverity issues

See merge request OpenMW/openmw!1013
 2021-07-12 14:06:44 +00:00
Petr Mikheev
8ff8ec4abd Fix coverity issues 2021-07-12 12:51:25 +02:00
elsid
153cd9a20c
Avoid redundant search for existing element 2021-07-12 11:41:21 +02:00
elsid
eece47f70e
Avoid copying osg::ref_ptr when adding or removing item from work queue 
Copy constructor does refcounting, and move constructor doesn't.
 2021-07-12 11:41:21 +02:00
elsid
b8fcd6d3ba
Manage work item lifetime on the client side 
Instead of explicit work queue stop before any possibly used engine manager
is destructed. Based on an assumption that any engine manager can be destructed
independently from the work queue destruction. This model is already used in
CellPreloader that conflicts with explicit work queue stop.

After the work queue is requested to be stopped, any client waiting for a not
started work item to be done will wait forever because the work item is dropped
from the queue. Therefore either clients should not wait for own work items to
be completed in destructor or the work queue should not drop items before
clients are destructed. Other approaches are possible but are not considered
due to increasing complexity.

CellPreloader already tries to wait for all created work items to be done so
keep it that way and extend the model to AsyncScreenCaptureOperation and Scene.
Additionally abort all scheduled work items when owner is destructed. This
prevents a long exit when multiple screenshots are scheduled right before
exiting the game.
 2021-07-12 11:41:14 +02:00
glassmancody.info
389b830046 fix black objects with OP batch debug due to unitialized uniform 2021-07-11 23:03:55 -07:00
fredzio
1650dabed8 Assign the return value of weak_ptr::lock() to a variable, so that the 
shared object lifetime is properly extended. Otherwise there is a
possibility that the Actor gets destroyed during call to unstuck().
 2021-07-11 18:01:20 +02:00
fredzio
643a64cb2f Change some settings for async physics: 
- default to 1 thread
- default to always use defered aabb update, remove option
- always keep a cache of LOS request for at least the current frame.
This decreases number of raycast, especially when a lot of actors are
involved and "NPCs avoid collisions" is on
 2021-07-11 17:07:39 +02:00
fredzio
6ad2cf8e4f Skip simulation result after calling Actor::updatePosition(). Otherwise 
when going out of tcl the player would go back to previous position for
one frame.
 2021-07-11 16:42:45 +02:00
elsid
73639a93b6
Avoid CTAD to fix macOS build 
../../../apps/openmw/engine.cpp:706:23: error: no viable constructor or deduction guide for deduction of template arguments of 'function'
                    ? std::function(ScheduleNonDialogMessageBox {})
                      ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate template ignored: could not match 'function<_Fp>' against '(anonymous namespace)::ScheduleNonDialogMessageBox'
template<class _Fp> class _LIBCPP_TEMPLATE_VIS function; // undefined
                                               ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate function template not viable: requires 0 arguments, but 1 was provided
../../../apps/openmw/engine.cpp:707:23: error: no viable constructor or deduction guide for deduction of template arguments of 'function'
                    : std::function(IgnoreString {})
                      ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/functional:1430:48: note: candidate template ignored: could not match 'function<_Fp>' against '(anonymous namespace)::IgnoreString'
template<class _Fp> class _LIBCPP_TEMPLATE_VIS function; // undefined
                                               ^
 2021-07-11 13:26:21 +02:00
Cédric Mocquillon
269cd31059 Use same world coordinates to compute distances 2021-07-10 19:04:46 +02:00
Petr Mikheev
c2280ada1d OpenMW Lua, API_VERSION=0 2021-07-09 20:48:54 +02:00
Petr Mikheev
85c441ec9a Refactoring and minor fixes related to active/inactive object state 2021-07-09 20:48:54 +02:00
Petr Mikheev
43b7e6964a Add function World::isCellActive 2021-07-09 20:48:54 +02:00
Petr Mikheev
702eb19271 Fixes and refactoring 2021-07-09 20:48:54 +02:00
Petr Mikheev
cc7dbabd19 Change argument of onKeyPress 2021-07-09 20:48:54 +02:00
Petr Mikheev
b1a6441c23 Add LocalScripts::LocalEngineEvent. Add OnConsume engine handler. 2021-07-09 20:48:54 +02:00
Petr Mikheev
1268597676 Make loaded but inactive objects available in Lua scripts. 2021-07-09 20:48:54 +02:00
Petr Mikheev
403d31313c New setting "lua num threads". Thread syncronization is changed from std:🧵:yield to std::condition_variable. 2021-07-09 20:48:54 +02:00
Petr Mikheev
a8f76260bc A possibility to view actor controls from lua scripts without disabling AI. 2021-07-09 20:48:54 +02:00
Petr Mikheev
c463f52390 Add Cell Lua bindings 2021-07-09 20:48:54 +02:00
Petr Mikheev
de349962d1 Engine handlers onActive/onInactive and a function self:isActive() 2021-07-09 20:32:53 +02:00
Petr Mikheev
d5cda61855 Console command "reload lua" 2021-07-09 20:24:56 +02:00
Petr Mikheev
9d09ecf8ca Add mwlua/actions 2021-07-09 20:24:56 +02:00
Petr Mikheev
f5722f9ba0 Inventory bindings 2021-07-09 20:24:56 +02:00
Petr Mikheev
bdccf161c4 Add lua package 'openmw.query' 2021-07-09 20:24:56 +02:00
Petr Mikheev
32218f6dd5 More Lua bindings 2021-07-09 20:24:56 +02:00
Petr Mikheev
87b5afb9bf Control active Lua scripts from openmw.cfg 2021-07-09 20:24:56 +02:00
Petr Mikheev
8c6d303730 Saving/loading for Lua scripts (saves format is changed) 2021-07-09 20:24:56 +02:00
Petr Mikheev
914e604e06 Interactions between LuaManager and other parts of OpenMW 2021-07-09 20:24:56 +02:00
Petr Mikheev
f2d0a702e9 Add Lua timers 2021-07-09 20:24:51 +02:00
Petr Mikheev
3d7e306064 Add apps/openmw/mwlua 2021-07-09 20:03:27 +02:00
Petr Mikheev
7df500c385 Put RefData move constructor to cpp file 2021-07-09 20:03:27 +02:00
Petr Mikheev
6db2450c90 Initial support of generated RefNums with negative mContentFile. 2021-07-09 20:03:27 +02:00
Petr Mikheev
b53667d555 Queries. Data structures and lua bindings. 2021-07-09 20:03:27 +02:00
Petr Mikheev
479856f812 Add components/lua/scriptscontainer and components/esm/luascripts 2021-07-09 20:03:27 +02:00
Petr Mikheev
8dbaf6022c Add components/lua/serilalization 2021-07-09 20:03:27 +02:00