florent.teppe
7c6471b0dc
getExteriorCellLocation() added to MWWorld::Cell
2023-05-12 23:24:36 +02:00
florent.teppe
a3bd6e7e47
ESM::ExteriorCellIndex => ESM::ExteriorCellLocation
2023-05-12 22:05:55 +02:00
florent.teppe
393357abc0
ESM::Cell::positionToCellIndex returns a ESM::ExteriorCellIndex
...
and takes a worldspace id as input
ESM::getCellSize takes a wordspace as input.
removed useless static in static inline funcs
2023-05-12 22:05:55 +02:00
florent.teppe
559830f59a
applies review comments
...
Removes ToLowercase after .serializeText
removed unused variable
!ptr => ptr == nullptr
better indentation + error message on throw
friend struct std::hash<...> useless on struct with all public fields.
2023-05-12 22:05:55 +02:00
florent.teppe
39cfe9c2fb
Removed unused variable, factorised code.
2023-05-12 22:05:55 +02:00
florent.teppe
3d06cabf6a
indexToPosition moved from world -> esm/util.hpp
2023-05-12 22:05:55 +02:00
florent.teppe
1cf0cd5628
moved mwworld/cellutils.hpp -> esm/util.hpp
2023-05-12 22:05:54 +02:00
florent.teppe
f261f59809
World::indexToPosition is modified to be less error prone.
2023-05-12 22:05:54 +02:00
florent.teppe
1fdecaaa34
seperate permanent and non permanent exterior cells.
2023-05-12 22:05:54 +02:00
florent.teppe
f731c5eadb
preloader compatible with esm4 exteriors.
2023-05-12 22:05:54 +02:00
florent.teppe
75561abfca
Factorises code and fixes preload bug.
2023-05-12 22:05:54 +02:00
florent.teppe
5648e03e9e
function to get cellsize depending on the context.
2023-05-12 22:05:54 +02:00
florent.teppe
93b3d9238c
mWater level disabled for skyrim.
2023-05-12 22:05:54 +02:00
florent.teppe
3de08e654f
Better handling of water levels for exterior cells.
...
Especially for skyrim and it's weird water level values in exteriors.
If we don't have a valid exterior water level we use the world's water level
2023-05-12 22:05:54 +02:00
florent.teppe
56cb2a83ec
removed sDefaultWorldspace, only sDefaultWorldspaceId now.
...
sDefaultWorldspaceId is a StringRefId to be able to getvalue easily.
2023-05-12 22:05:53 +02:00
florent.teppe
141878f30d
int x, int y , ESM::RefId worldspace => ESM::ExteriorCellIndex
...
also removed the changeToExteriorCell that only took a position as input, didn't work with esm4.
2023-05-12 22:05:53 +02:00
florent.teppe
43e247d458
fixes tests
...
fix linux build + clang-tidy
2023-05-12 22:05:53 +02:00
florent.teppe
1d03b54694
maps with tuple key instead of map of map
...
instead of using a map with key as exterior and map of <int ,int >, Cell as value we use a single map with a tuple x,y,exterior as key
2023-05-12 22:05:53 +02:00
florent.teppe
d8a782425b
can actually load and teleport to esm4 exterior spaces
2023-05-12 22:05:53 +02:00
florent.teppe
eb48f8724f
change grid and preload takes the right exterior
...
also fixes some crashes
2023-05-12 22:05:53 +02:00
florent.teppe
81d9686541
crashfix dynamic exterior cells
2023-05-12 22:05:53 +02:00
florent.teppe
a62e75fd19
Initial attempt at loading esm4 exteriors
2023-05-12 22:05:52 +02:00
psi29a
242ac21b38
Merge branch 'fix_local_map_update' into 'master'
...
Update cell local map on different neighbour cells (#7140 )
See merge request OpenMW/openmw!3012
2023-05-11 12:13:35 +00:00
elsid
aa9fb33a18
Update cell local map on different neighbour cells
...
Save which neighbour cells were active when local map for a cell is rendered.
Update when intersection of currently loaded cells is different from stored. If
map was rendered when all neighbours were loaded no more updates will happen.
2023-05-11 10:41:15 +02:00
elsid
f7ebd9b9b4
Avoid old C-style cast
2023-05-11 10:27:33 +02:00
elsid
fd249b46c0
Remove redundant member function
...
mActive is public.
2023-05-11 10:27:33 +02:00
elsid
b2f7fc70a6
Remove redundant MapSegment constructor and destructor
2023-05-11 10:27:32 +02:00
elsid
d927aaad14
Avoid redundant getCell()->getGrid* calls
2023-05-11 10:26:41 +02:00
elsid
1324256440
Avoid redundant lookup
2023-05-11 10:26:39 +02:00
elsid
624ffef4fe
Reduce block nesting
2023-05-11 10:26:18 +02:00
psi29a
42bf639916
Merge branch 'cellstore_optimize' into 'master'
...
Optimize CellStore modifications
See merge request OpenMW/openmw!3013
2023-05-11 07:09:52 +00:00
Petr Mikheev
f3adcab9c5
Update CellStore::mMergedRefs lazily.
2023-05-11 01:00:50 +02:00
Petr Mikheev
93342af1f9
Remove CellStore::searchViaRefNum (replaced with WorldModel::getPtr)
2023-05-11 00:17:22 +02:00
Petr Mikheev
270ead937b
Remove check in cellstore.cpp that causes Lua teleport command to fail.
2023-05-11 00:17:22 +02:00
jvoisin
0270cfb733
Merge branch 'throw_with_more_info' into 'master'
...
show which file is not found
See merge request OpenMW/openmw!3011
2023-05-10 21:40:04 +00:00
Bret Curtis
95fff7b77b
show which file is not found
2023-05-10 21:43:55 +02:00
psi29a
54a79cfc39
Merge branch 'master' into 'master'
...
fixed some typos and spelling errors
See merge request OpenMW/openmw!3010
2023-05-10 18:02:34 +00:00
Elias Howell
bf8fafa79a
fixed some typos and spelling errors
2023-05-09 20:07:08 -04:00
psi29a
feb10ae05b
Merge branch 'revert_3003' into 'master'
...
Revert !3003 because it caused #7361
Closes #7361
See merge request OpenMW/openmw!3006
2023-05-09 07:14:02 +00:00
Petr Mikheev
3a8a4e8bff
Revert "Replace rayTest
with convexSweepTest
MovementSolver::traceDown
. Needed to prevent teleporting down through sewer grates."
...
This reverts commit 917132e326
.
2023-05-09 01:20:02 +02:00
Alexei Kotov
4394970894
Merge branch 'gui_view' into 'master'
...
Use string_view in journal code
See merge request OpenMW/openmw!3005
2023-05-08 17:37:46 +00:00
Evil Eye
f93d41d9ce
Use string_view instead of const char*
2023-05-08 17:18:18 +02:00
Evil Eye
ad3195488b
Remove unimplemented method declaration
2023-05-08 16:57:57 +02:00
psi29a
0a8c801d66
Merge branch 'lua_getters' into 'master'
...
Rename some functions in Lua API from `aaa` to `getAaa` (for consistency with `setAaa`)
Closes #7356
See merge request OpenMW/openmw!3004
2023-05-08 10:25:27 +00:00
psi29a
753696583e
Merge branch 'trace_down' into 'master'
...
Replace `rayTest` in `MovementSolver::traceDown` with `convexSweepTest`
See merge request OpenMW/openmw!3003
2023-05-08 09:31:53 +00:00
Petr Mikheev
067df2d07e
Rename some functions in Lua API from aaa
to getAaa
(for consistency with setAaa
)
2023-05-08 00:49:06 +02:00
psi29a
1f0aede634
Merge branch 'celloverride' into 'master'
...
Fix cell overrides and remove unused, incomplete erase method
See merge request OpenMW/openmw!3001
2023-05-07 19:50:36 +00:00
Petr Mikheev
917132e326
Replace rayTest
with convexSweepTest
MovementSolver::traceDown
. Needed to prevent teleporting down through sewer grates.
2023-05-07 21:13:14 +02:00
psi29a
ee224d00ab
Merge branch 'keep_refnum' into 'master'
...
Keep refnum when moving objects to/from inventory (partially resolves #6148 )
Closes #6148
See merge request OpenMW/openmw!2995
2023-05-07 18:22:22 +00:00
Evil Eye
22ba0a1cf0
Improve variable names
2023-05-07 17:27:28 +02:00