mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 08:15:54 +00:00
Code Issues Releases Wiki Activity
26156 commits 108 branches 66 tags 134 MiB
Commit graph

17692 commits

Author SHA1 Message Date
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