mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 11:15:33 +00:00
Code Issues Releases Wiki Activity
30113 commits 108 branches 67 tags 134 MiB
Commit graph

6574 commits

Author SHA1 Message Date
elsid
cf75363290
Typed launcher settings 
QMultiMap is not clear about what settings exist and it's not efficient way to
access them after they are loaded.
 2023-01-27 12:42:05 +01:00
elsid
0961720835
Join path components using path::operator/ instead of string::operator+ 2023-01-27 01:07:15 +01:00
florent.teppe
3515c8e61a Static references are created as refcells, nothing displayed yet. 2023-01-26 22:37:32 +01:00
florent.teppe
c896a2ca48 Crashfix on launch 2023-01-26 22:37:32 +01:00
florent.teppe
0018bcf7de Should make cellvariant safer to use. 
Hopefully clang tidy agrees.
 2023-01-26 22:37:32 +01:00
florent.teppe
e81e278363 Implements some cell params + linux compile fix 2023-01-26 22:37:31 +01:00
florent.teppe
562e129bd0 encapsulations of esm3 cell and esm4 cells. 2023-01-26 22:37:31 +01:00
florent.teppe
08b68fcd48 Cannot load a cell yet, but getting more necessary parts in 2023-01-26 22:36:11 +01:00
Evil Eye
d40a9ec5bc Use worldspace coords in AiWanderStorage 2023-01-23 21:06:50 +01:00
psi29a
1422053fa9 Merge branch 'more_uniforms' into 'master' 
[Postprocessing] Add sky and ambient colors

See merge request OpenMW/openmw!2638
 2023-01-21 22:42:21 +00:00
psi29a
eb853b1315 Merge branch 'ptmikheev-master-patch-34687' into 'master' 
Fix constexprant

See merge request OpenMW/openmw!2643
 2023-01-21 22:42:03 +00:00
Petr Mikheev
24ef6d29d4 Fix constexprant 2023-01-21 21:58:17 +00:00
florent.teppe
a4137e941c std::string_view can be used in map and unordered map 
This avoids some unecessary dynamic allocations.
Also applies some review advice.
 2023-01-21 19:19:26 +01:00
florent.teppe
63e44eddc9 Navigator doesn't use RefId anymore 2023-01-21 18:39:57 +01:00
florent.teppe
150e2ba885 Revert "Use ESM::RefId for worldspace in detournavigator" 
This reverts commit b4ab153418.

# Conflicts:
#	apps/navmeshtool/worldspacedata.cpp
 2023-01-21 18:39:57 +01:00
florent.teppe
3780033837 Reverts Cell name to a string 2023-01-21 18:39:42 +01:00
glassmancody.info
564c408663 expose more uniforms to postprocessing 2023-01-20 17:43:54 -08:00
Petr Mikheev
95999afefd Apply clang-format to the previous commit 2023-01-20 23:44:12 +01:00
Petr Mikheev
ca48b778c3 Merge branch 'addutils' into 'master' 
Add remap and round to lua utils

See merge request OpenMW/openmw!2605
 2023-01-20 22:28:34 +00:00
Kindi
07da7eddea Add remap and round to lua utils 2023-01-20 22:28:34 +00:00
elsid
dd89403df0
Move ensureUtf8Encoding to named namespace 
To follow https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#sf21-dont-use-an-unnamed-anonymous-namespace-in-a-header

Add QtGlobal include to define QT_VERSION and QT_VERSION_CHECK macroses before
they're used.
 2023-01-18 22:58:35 +01:00
psi29a
ee980721b8 Merge branch 'debug_lua_memory' into 'master' 
Additional information in Lua profiler

See merge request OpenMW/openmw!2612
 2023-01-18 14:33:05 +00:00
psi29a
fbeacc1e0f Merge branch 'navigator_check_agent_bounds' into 'master' 
Check agent bounds on adding agent to navigator

See merge request OpenMW/openmw!2629
 2023-01-18 14:31:22 +00:00
psi29a
54c18ea86d Merge branch 'change-const-to-constexpr' into 'master' 
change const to constexpr

Closes #6797

See merge request OpenMW/openmw!2630
 2023-01-18 14:30:36 +00:00
elsid
cf1d8544e3
Check agent bounds on adding agent to navigator 
Do not add agent bounds which are not supported by recastnavigation with given
settings and log such events.

To avoid reaching navmesh tile generation to find out it can't be generated for
such agent bounds.
 2023-01-18 12:00:48 +01:00
James-Deciutiis
4e61fec14d change const to constexpr 2023-01-17 19:31:52 -08:00
Andrei Kortunov
ee9ab8d393 Use STL-style iterators instead of Java-style ones 2023-01-15 20:23:18 +04:00
Andrei Kortunov
792feae39e Do not use deprecated implicit conversion 2023-01-15 20:23:18 +04:00
Andrei Kortunov
0864d997d0 Add missing includes 2023-01-15 20:09:56 +04:00
psi29a
a7a89ba7c1 Merge branch 'launcher' into 'master' 
Rework how OpenMW launcher looks

Closes #6922

See merge request OpenMW/openmw!2587
 2023-01-15 16:00:59 +00:00
psi29a
dc3ec1a0a0 Merge branch 'mwscript' into 'master' 
Multiple mwscript optimizations and some refactoring

See merge request OpenMW/openmw!2600
 2023-01-15 15:59:30 +00:00
psi29a
32733d23fa Merge branch 'xanim' into 'master' 
X-file handling fixes (bug #5371)

Closes #5371

See merge request OpenMW/openmw!2614
 2023-01-15 15:57:27 +00:00
Andrei Kortunov
902c48d1bb Rework launcher UI 2023-01-15 12:36:08 +04:00
elsid
44429f0393
Limit NavMeshManager update range by player tile and max tiles 
Object AABB may be much larger than area currently covered by navmesh. In this
case all tiles beyond covered range should be ignored. Attempt to iterate over
them will not result in any new tile updates but can take quite a while. At
maximum this can be pow(INT_MAX - INT_MIN, 2) iterations.

Use arbitrary time limit to check for update call to finish in the test.
 2023-01-15 04:46:29 +01:00
Alexei Kotov
6ff9b5d326 Make use of ends_with for KF 2023-01-15 01:48:06 +03:00
Alexei Kotov
434b4deda1 Don't use xkf if xnif is merely the base model (bug #5371) 2023-01-14 04:55:12 +03:00
Alexei Kotov
4d0788e016 Use xnif if its xkf is present even if xnif isn't 2023-01-14 03:35:50 +03:00
elsid
d4ab1101eb
Change Interpreter type aliases to be fixed size types 
Remove no longer relevant comment for float type.
 2023-01-14 00:09:01 +01:00
elsid
b88f0d2dbd
Replace mwscript program serialization into a vector with simple struct 
Mostly to avoid string literal lookup by index with iteration over all preciding
literals and calling strlen. This is very inefficient. In genral this makes code
much more straightforward but also makes it portable since now int and float of
different sizes are properly supported.
 2023-01-14 00:07:37 +01:00
Petr Mikheev
d9e9db0983 Additional information in Lua profiler 2023-01-13 21:14:23 +01:00
psi29a
25d7ee7fdc Merge branch 'streams' into 'master' 
Setup utf8qtextstream in the way consistent with other Qt components

See merge request OpenMW/openmw!2611
 2023-01-13 11:23:44 +00:00
Andrei Kortunov
8da93d4b12 Setup utf8qtextstream in the way consistent with other Qt components 2023-01-13 13:10:34 +04:00
jvoisin
c90d22f3b2 Replace usage of QRegularExpression::anchoredPattern with ^ and $ 
Using `^` and `$` is shorter than `QRegularExpression::anchoredPattern`,
and even allows us in one case to get rid of a trailing `.*`.
 2023-01-12 22:52:00 +01:00
Andrei Kortunov
bfcbc2350d Handle UTF-8 in Qt streams in the Qt6-compatible way 2023-01-12 15:39:50 +04:00
elsid
60eede6a1d
Fix variable naming styleguide 2023-01-11 23:47:42 +01:00
elsid
0ab3090385
Make Runtime::getPC and setPC inline 2023-01-11 23:47:42 +01:00
elsid
46b4427d2e
Remove user defined constructor for Runtime 2023-01-11 23:47:42 +01:00
elsid
9c8df09475
Remove user defined constructors for Interpreter 2023-01-11 23:47:42 +01:00
Andrei Kortunov
307a60e87c Migrate from QRegExp to more modern QRegularExpression 2023-01-11 11:21:46 +04:00
elsid
c173348cbe
Use default initializers for ESM::RefNum members 
Instead of unset function that is removed now and assignments all over the code.
 2023-01-10 00:44:51 +01:00
psi29a
6a250c5900 Merge branch 'baby_it_is_occluded_outside' into 'master' 
Weather Particle Occlusion (#5492)

Closes #5492

See merge request OpenMW/openmw!1328
 2023-01-07 22:18:45 +00:00
psi29a
83718878b2 Merge branch 'Load_ESM4' into 'master' 
Loading ESM4 data and storing them in the ESMStore

See merge request OpenMW/openmw!2557
 2023-01-07 22:17:17 +00:00
psi29a
a9d3186173 Merge branch 'fix_esm_fixed_string_warning' into 'master' 
Fix gcc warning: array subscript n is outside array bounds of ‘const char [n]’

See merge request OpenMW/openmw!2585
 2023-01-07 22:15:16 +00:00
Andrei Kortunov
9630246cae Sort quests in journal by name (bug 7054) 2023-01-07 18:55:51 +04:00
glassmancody.info
9a4977d334 rain occlusion 2023-01-06 22:23:03 -08:00
elsid
2bbed8cc06
Fix gcc warning: array subscript 5 is outside array bounds of ‘const char [5]’ 
In function ‘bool ESM::operator==(const FixedString<capacity>&, const T* const&) [with long unsigned int capacity = 5; T = char; <template-parameter-1-3> = void]’,
    inlined from ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = ESM::FixedString<5>; T2 = const char*]’ at /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:1358:11,
    inlined from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = ESM::FixedString<5>; T2 = const char*; typename std::enable_if<((! std::is_integral<_Tp>::value) || (! std::is_pointer<_Dp>::value))>::type* <anonymous> = 0]’ at /home/elsid/dev/googletest/build/gcc/release/install/include/gtest/gtest.h:1377:64,
    inlined from ‘virtual void {anonymous}::EsmFixedString_equality_operator_for_not_convertible_to_uint32_with_const_char_pointer_Test::TestBody()’ at apps/openmw_test_suite/esm/test_fixed_string.cpp:165:9:
components/esm/esmcommon.hpp:134:19: warning: array subscript 5 is outside array bounds of ‘const char [5]’ [-Warray-bounds]
  134 |         return rhs[capacity] == '\0';
      |                ~~~^
apps/openmw_test_suite/esm/test_fixed_string.cpp: In member function ‘virtual void {anonymous}::EsmFixedString_equality_operator_for_not_convertible_to_uint32_with_const_char_pointer_Test::TestBody()’:
apps/openmw_test_suite/esm/test_fixed_string.cpp:164:20: note: at offset 5 into object ‘other’ of size 5
  164 |         const char other[5] = { 'a', 'b', 'c', 'd', '\0' };
      |                    ^~~~~
 2023-01-06 22:09:07 +01:00
psi29a
55ba5ed7ea Merge branch 'mygui_log' into 'master' 
Use OpenMW logging levels for MyGUI log

Closes #7130

See merge request OpenMW/openmw!2582
 2023-01-06 15:09:46 +00:00
Andrei Kortunov
b217d1fc36 Use OpenMW logging levels for MyGUI log (feature 7130) 2023-01-06 16:01:30 +04:00
psi29a
0d8d15a732 Merge branch 'fixcolladaanimopbug' into 'master' 
Fix Collada animated object bug #7051

Closes #7051

See merge request OpenMW/openmw!2565
 2023-01-06 10:10:27 +00:00
unelsson
5b0713517a Clang-format 2023-01-05 01:40:36 +02:00
psi29a
319aa11d84 Merge branch 'l10n_rename' into 'master' 
Reorganize l10n files

See merge request OpenMW/openmw!2546
 2023-01-04 21:48:00 +00:00
psi29a
1e62b84f9a Merge branch 'lua_initdata' into 'master' 
Allow passing `initData` to the :addSript call (#7091)

Closes #7091

See merge request OpenMW/openmw!2568
 2023-01-04 14:32:23 +00:00
florent.teppe
631fa26872 Applies review advice. 2023-01-04 12:22:16 +01:00
unelsson
ba9c2c9928 Add TemplateRef to animated Collada model 2023-01-03 22:51:46 +02:00
florent.teppe
3b2d9161c4 Applied review advice 
better deals with templated functions meant for esm3 used by esm4s.
simplified loading of esm4 and dealing with unhandled record types.
 2023-01-02 19:20:03 +01:00
florent.teppe
e9190bedc8 Reverts useless CmakeList formatting 2023-01-02 18:35:05 +01:00
Petr Mikheev
8c7d347179 Reorganize l10n files 2023-01-02 13:21:05 +01:00
florent.teppe
077cf97bc4 The esm4 reader logic is mutualised 
to avoid copy pasting code, readerutils gives functions that take visitors as params to decide how a record must be handled

Check encoder exists, and get value of stateless encoder.

fixes code formatting conventions

Fixed output of record with RefId

also fixed readTypedRecord and readRecord to have the proper return types

Check if the type has a sRecordId
 2023-01-01 19:22:27 +01:00
florent.teppe
c721a6cafa Initial commit to load ESM4 
Some data is actually loaded and store in ESM Store
Any new ESM4 will go through the same code path and be automatically sent to the right store
 2023-01-01 16:22:57 +01:00
Petr Mikheev
b248c3e173 Allow passing initData to the :addSript call (#7091) 2022-12-31 22:08:17 +01:00
unelsson
d60fd86719 clang format 2022-12-31 00:52:05 +02:00
unelsson
c71504eeb0 Better comments 2022-12-31 00:35:50 +02:00
unelsson
4676ac4ac9 Cleaner code part 2 2022-12-31 00:35:50 +02:00
unelsson
960019cf65 Cleaner code 2022-12-31 00:35:50 +02:00
unelsson
2efc691736 clang format 2022-12-31 00:35:50 +02:00
unelsson
7ef6b3cb62 automatic clang format 2022-12-31 00:35:50 +02:00
unelsson
d8de56e33c Coding style improvements, add Torso animation layer 2022-12-31 00:35:50 +02:00
unelsson
ffc64205c5 Force collada animation layers, remove nif blend mask detection. 2022-12-31 00:35:50 +02:00
elsid
c71862a8df
Reset rcPolyMeshDetail members after rcFree 
To avoid double free causing by later recastnavigation versions.
 2022-12-30 19:26:48 +01:00
psi29a
e6064645db Merge branch 'esm_ref_id_refactor' into 'master' 
Simplify ESM::RefId

See merge request OpenMW/openmw!2563
 2022-12-30 13:27:35 +00:00
elsid
755067f0f3
Remove redundant ESM::RefId member functions 2022-12-30 00:32:47 +01:00
elsid
fe57aec2a4
Move ESM::RefId comment to make sure IDEs recognize it and show in tooltips 2022-12-30 00:04:02 +01:00
elsid
b4ab153418
Use ESM::RefId for worldspace in detournavigator 2022-12-29 23:49:49 +01:00
Petr Mikheev
b8fb013edf Merge MWLua::ObjectRegistry and MWWorld::WorldModel 2022-12-28 12:45:11 +01:00
psi29a
80e2cd79ec Merge branch 'boat_closer_to_todd' into 'master' 
Ignore special characters preceding script commands

Closes #6807

See merge request OpenMW/openmw!2555
 2022-12-28 11:21:24 +00:00
florent.teppe
afed7e60ef Upgraded Filesave version for RefIDs 
Fix logic issue
 2022-12-27 23:05:31 +01:00
florent.teppe
dc21df97c8 Fixed issue with getSummonedCreature( that returned a reference to a non const static value 
Fix compile, and apply review comment

Fixed greater vs more typo.

getCellname is back to a string view.

Because in most cases was used as a strong not a refId.
and there was a fundamental issue with region names used as a cellname
 2022-12-27 19:16:22 +01:00
florent.teppe
1ef1de974d script blacklist => RefId 
Applies changes from review

Fixed clang format

Clang format + review.
 2022-12-27 19:16:21 +01:00
florent.teppe
2c30575b3b CellName is now a RefId, makes more sense that way. 2022-12-27 19:16:21 +01:00
florent.teppe
6ff90b34a8 Fixed an issue with RefId in CellRefs where Ids wouldn't be loaded 
Fixed multiple issues from the review.
 2022-12-27 19:15:58 +01:00
florent.teppe
42e45723b7 Fixes issue in MW script compilation that would silently produce the wrong bytecode 
Fixes issue when fetching MyGui values that were stored as RefId but fetched as String

Removed some uncessary copies, fixed issues with lowercase and uneeded changes
 2022-12-27 19:15:57 +01:00
florent.teppe
e7deffb376 Adds comment that explains what RefIds are 2022-12-27 19:15:57 +01:00
florent.teppe
d49f60d2d6 To change fewer things with the master implementation, the Id isn't changed to lower case on creation 
lower case utility functions used in comparison functions
 2022-12-27 19:15:57 +01:00
florent.teppe
65cdd489fb create a specific esm reader function for RefID to avoid allocation for string and then again for RefId 
Fixed some types

removed useless header

applied clang format

fixed compile tests

fixed clang tidy, and closer to logic before this MR

Removed hardcoded refids

unless there is a returned value we don't use static RefIds
can use == between RefId and hardcoded string

Fix clang format

Fixed a few instances where std::string was used, when only const std::string& was needed

removed unused variable
 2022-12-27 19:15:57 +01:00
florent.teppe
874ff88288 In the interpretter, the id is no longer passed by vallue, but as a const reference instead. 
In getMembersLocal(, a reference to a reference wrapper is used, because the id can change, bu all we need to do is change a pointer.No need to change the value
 2022-12-27 19:15:56 +01:00
fteppe
c283ea0ae8 string_view& => string_view 
fixed ref to temp variable
 2022-12-27 19:15:56 +01:00
fteppe
7da38113be Changed more hardcoded RefId to be static to avoid multiple runtime creations 
adresses multiple review comments
 2022-12-27 19:15:56 +01:00
fteppe
62d8fe3fc2 changed a few hardcoded refIds used in mutliple places to be defined only once in a variable 2022-12-27 19:15:55 +01:00
fteppe
20da0892ef openMW_test_suite compiles and runs 
Slowly moving through the open-cs errors

Good progress in openCS

Very good progress on openCS

Getting closer with openCS

OpenCS compiles and runs! Didn't have time to test it all though

ix openMW

everything compiles on windows??

Fix gcc

Fix Clang
 2022-12-27 19:15:55 +01:00
fteppe
2f2e401559 is Hidden marker now takes a const RefId& instead of a string_view 2022-12-27 19:15:55 +01:00