1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 12:15:36 +00:00
Commit graph

8035 commits

Author SHA1 Message Date
AnyOldName3
ff3ffa13b6 Auto format 2024-03-14 23:54:22 +00:00
AnyOldName3
28131fd62b Fixes for a whole bunch of warnings
These warnings were always enabled, but we didn't see them due to https://gitlab.com/OpenMW/openmw/-/issues/7882.
I do not fully understand the cause of 7822 as I can't repro it in a minimal CMake project.

Some of these fixes are thought through.
Some are sensible best guesses.
Some are kind of a stab in the dark as I don't know whether there was a
possible bug the warning was telling me about that I've done nothing to
help by introducing a static_cast.

Nearly all of these warnings were about some kind of narrowing
conversion, so I'm not sure why they weren't firing with GCC and Clang,
which have -Wall -Wextra -pedantic set, which should imply -Wnarrowing,
and they can't have been affected by 7882.

There were also some warnings being triggered from Boost code.
The vast majority of library headers that do questionable things weren't
firing warnings off, but for some reason, /external:I wasn't putting
these Boost headers into external mode.

We need these warnings dealt with one way or another so we can switch
the default Windows CI from MSBuild (which doesn't do ccache) to Ninja
(which does).
I have the necessary magic for that on a branch, but the branch won't
build because of these warnings.
2024-03-14 23:39:33 +00:00
uramer
68ed771816 Fix element detachment logic 2024-03-14 20:28:12 +01:00
uramer
2f40491065 Fix crash when destroying UI element in the same frame as creating it 2024-03-14 18:08:18 +01:00
Evil Eye
b52f721318 Use getSubComposite to read AMBI 2024-03-14 17:08:23 +01:00
Andrei Kortunov
715efe892f Load YAML files via Lua (feature 7590) 2024-03-14 16:29:21 +04:00
psi29a
2764d8ceff Merge branch 'fix_destroying_new_elements' into 'master'
Don't destroy root widget for new elements

See merge request OpenMW/openmw!3947
2024-03-14 08:37:13 +00:00
AnyOldName3
942eeb54c1 Yet another osgpluginchecker rewrite
It turns out that it's possible for OSG plugins to be spread across multiple directories, and OSG doesn't account for this in osgDB::listAllAvailablePlugins(), even though it works when actually loading the plugin.

Instead, use code that's much more similar to how OSG actually loads plugin, and therefore less likely to miss anything.

Incidentally make things much simpler as we don't need  awkwardness from working around osgDB::listAllAvailablePlugins()'s limitations.
2024-03-12 23:30:11 +00:00
uramer
b12f98db98 Don't destroy root widget for new elements 2024-03-12 17:48:42 +01:00
elsid
859d765921
Use normalized path for NifFileManager::get 2024-03-11 22:07:37 +01:00
elsid
3ea3eeb613
Use string_view for canOptimize 2024-03-11 22:07:37 +01:00
elsid
a98ce7f76a
Replace std::filesystem::path by std::string_view in Files::getHash argument 2024-03-11 22:07:37 +01:00
elsid
79b73e45a1
Replace std::filesystem::path by std::string and std::string_view in nif code
It's used only for error reporting.
2024-03-11 22:07:37 +01:00
elsid
cd3c3ebadb
Use VFS::Path::Normalized for ResourceManager cache key 2024-03-11 22:07:36 +01:00
psi29a
b5b6744321 Merge branch 'hotfix_ui_update' into 'master'
Fix Lua UI updates

See merge request OpenMW/openmw!3936
2024-03-11 11:14:26 +00:00
psi29a
3cb8d05fe5 Merge branch 'vfs_normalized_path_4' into 'master'
Use VFS::Path::Normalized in few more places

See merge request OpenMW/openmw!3934
2024-03-11 07:29:55 +00:00
AnyOldName3
0730dc2ebb Get OSG to tell us the plugin filenames it's going to use
That way, we don't have issues like the checker getting false positives when the right plugins are present for the wrong OSG version or build config, or false negatives when we've generated the wrong filenames.
2024-03-10 18:04:38 +00:00
uramer
af8662daee Detach Lua Elements properly from their parent 2024-03-10 14:05:37 +01:00
uramer
0f60052bb8 Set Element state in Element::create 2024-03-09 22:27:10 +01:00
psi29a
6f9ceff3f3 Merge branch 'windows_build' into 'master'
Add option to disable precompiled headers

See merge request OpenMW/openmw!3933
2024-03-09 09:48:57 +00:00
elsid
cc35df9409
Use VFS::Path::Normalized for fx::Technique file path 2024-03-09 00:21:17 +01:00
elsid
ffbeb5ab98
Build localization path using VFS::Path::Normalized 2024-03-09 00:21:17 +01:00
elsid
84adb0a148
Make VFS::Path::Normalized constructor from std::string_view explicit 2024-03-09 00:21:16 +01:00
psi29a
a926f4a5a9 Merge branch 'alt_tab_fix' into 'master'
Do not treat Alt-Tab as resolution change

Closes #7866

See merge request OpenMW/openmw!3931
2024-03-08 08:41:55 +00:00
psi29a
f09f5c644c Merge branch 'update_setting_pages' into 'master'
Optimize setting group rendering

See merge request OpenMW/openmw!3929
2024-03-08 08:39:49 +00:00
elsid
5859fd464c
Add option to disable precompiled headers
To be able to use ccache.

Also fix compilation errors appeared due to absence of precompiled
headers.
2024-03-08 02:11:51 +01:00
Andrei Kortunov
5dcac4c48f Do not treat Alt-Tab as resolution change (bug 7866) 2024-03-07 15:43:35 +04:00
uramer
9ae61f1932 Fix child UI Elements created in the same frame as parent 2024-03-06 23:16:02 +01:00
elsid
5acfb07850
Fix build with OSG_USE_UTF8_FILENAME 2024-03-06 20:51:48 +01:00
Evil Eye
1499dd2654 Add getCompositeSize and handle NPC data 2024-03-06 18:16:55 +01:00
psi29a
231b5753e4 Merge branch 'launcher_help_version' into 'master'
Open matching version of documentation for Launcher Help

See merge request OpenMW/openmw!3909
2024-03-05 09:24:52 +00:00
psi29a
e340b06411 Merge branch 'get-glextensions-properly' into 'master'
Get the GLExtensions instance when a context is created

Closes #7351

See merge request OpenMW/openmw!3022
2024-03-04 15:05:23 +00:00
psi29a
61f5a13c02 Merge branch 'check-osg-plugins' into 'master'
Check for dynamic OSG plugins on launch

Closes #7736

See merge request OpenMW/openmw!3748
2024-03-04 08:00:16 +00:00
Evil Eye
cef59e8928 Replace fixed size writeHNT calls with decomposition 2024-03-03 19:39:19 +01:00
Evil Eye
958f70736f Implement auto calculated potion values 2024-03-02 12:45:48 +01:00
psi29a
be1e77c282 Merge branch 'fix-git-commit-updating' into 'master'
Fix git commit updating

See merge request OpenMW/openmw!3911
2024-02-28 20:37:28 +00:00
psi29a
03d5872a55 Merge branch 'drop_on_exit' into 'master'
Add a storage mode to drop section on game exit

See merge request OpenMW/openmw!3905
2024-02-28 20:36:40 +00:00
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04:00
Mads Buvik Sandvei
c82c111ee1 Use correct index for Athletics_SwimOneSecond 2024-02-27 19:28:51 +01:00
Alexei Kotov
46f863a32e Merge branch 'help-i-cant-swim' into 'master'
Fix(editor): Don't save dirty water height values

Closes #7841

See merge request OpenMW/openmw!3881
2024-02-26 21:50:50 +00:00
psi29a
619ccf7107 Merge branch 'decomposition' into 'master'
Use decompose to remove more instances of pragma pack

See merge request OpenMW/openmw!3906
2024-02-26 11:23:17 +00:00
psi29a
f2039b35d0 Merge branch 'vfs_normalized_path_3' into 'master'
Use normalized path for correctSoundPath

See merge request OpenMW/openmw!3903
2024-02-26 11:21:33 +00:00
AnyOldName3
bcd54ab1ff Format osgpluginchecker.cpp.in
I formatted the generated file that's part of the VS solution, then diffed it against the input and changed it to match.
2024-02-25 23:01:52 +00:00
AnyOldName3
02ef7ae3cc Give up rearranging the CS 2024-02-25 22:49:53 +00:00
AnyOldName3
93a84b38ac Give git-version its name back 2024-02-25 19:05:38 +00:00
AnyOldName3
42c7fc8e92 Update 2 files
- /components/CMakeLists.txt
- /cmake/GitVersion.cmake
2024-02-25 18:53:19 +00:00
uramer
86a82ae3f1 Open matching version of documentation for Launcher Help 2024-02-25 18:20:40 +01:00
Dave Corley
059191c840 Also apply hasWaterHeightSub for INTV 2024-02-25 07:30:23 -06:00
Alexei Kotov
357b190571 Merge branch 'oldsavessuck' into 'master'
Account for pre-0.46 saves storing a gold value of 0 for everything

See merge request OpenMW/openmw!3902
2024-02-25 10:07:52 +00:00
Alexei Kotov
01e0b25fd3 Merge branch 'coverity' into 'master'
Fix some Coverity complaints

See merge request OpenMW/openmw!3904
2024-02-24 20:25:58 +00:00
AnyOldName3
a761e417f1 Accept that it's too much work to defer light manager creation in the CS and instead use something akin to the old approach 2024-02-24 16:59:11 +00:00
Evil Eye
7d7e8939ab Use ESM::decompose to handle WPDTstruct 2024-02-24 16:55:58 +01:00
Evil Eye
ec1c6ee171 Use ESM::decompose to handle ENAMstruct 2024-02-24 14:03:24 +01:00
elsid
ec9c829021
Use normalized path for correctSoundPath 2024-02-24 12:42:36 +01:00
elsid
92d57d6e46
Make Normalized constructor from const char* explicit 2024-02-24 12:42:02 +01:00
Evil Eye
82c92a9a6c Merge branch 'bookart-is-textures-too' into 'master'
Consider bookart a valid prefix for regular textures and vice versa

Closes #7535

See merge request OpenMW/openmw!3342
2024-02-24 10:31:13 +00:00
AnyOldName3
dec8d32b3a FIx static destruction order chaos 2024-02-24 00:54:40 +00:00
Andrei Kortunov
cf6b6020a0 Move local variables 2024-02-23 17:10:55 +04:00
Andrei Kortunov
fc1f244627 Add missing initialization 2024-02-23 17:01:59 +04:00
AnyOldName3
3fbd97ffc8 Remove unused <vector> header 2024-02-23 12:48:39 +00:00
Alexei Kotov
6d35b626cf Merge branch 'fix_components_property' into 'master'
Set components property after it is defined

See merge request OpenMW/openmw!3899
2024-02-23 12:41:36 +00:00
Alexei Kotov
89d856d03e Merge branch 'use_is_directory_member' into 'master'
Use is_directory member function

See merge request OpenMW/openmw!3897
2024-02-23 12:36:40 +00:00
AnyOldName3
6406095bfb s p a n 2024-02-23 01:34:01 +00:00
AnyOldName3
2bc091fc05 Include missing header
I thought I'd seen this class defined in one of the existing headers
with a different name, but I was muddling its forward declaration and a
different class being in a non-obvious header.
2024-02-23 00:15:23 +00:00
AnyOldName3
ec4731d454 Cope with scene widgets being destroyed in a weird order
I can't actually test this as the CS still doesn't get far enough with this MR.
2024-02-23 00:15:23 +00:00
AnyOldName3
36a75cdb29 Get the GLExtensions instance when a context is created 2024-02-23 00:15:23 +00:00
AnyOldName3
1717e696b1 Format before clang notices and sends me an angry email 2024-02-23 00:06:51 +00:00
AnyOldName3
db5a43db30 Allow top-level prefix to be found in the middle of a path 2024-02-23 00:04:48 +00:00
Evil Eye
0bab37327c Account for pre-0.46 saves storing a gold value of 0 for everything 2024-02-22 20:23:21 +01:00
psi29a
e4a9e83609 Merge branch 'disable-shadows-properly-properly' into 'master'
Affect correct texture units when disabling shadows for stateset

Closes #7838

See merge request OpenMW/openmw!3891
2024-02-22 18:05:48 +00:00
elsid
38990b1fd2
Set components property after it is defined 2024-02-22 11:15:39 +01:00
Dave Corley
ce2787e15e Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub 2024-02-22 03:26:17 -06:00
Dave Corley
d04572ac84 Cleanup(loadcell): Rename mHasWater to mHasWaterHeightSub for clarity. 2024-02-22 03:01:29 -06:00
Dave Corley
f95cad07f2 Cleanup(loadcell): Remove unused integer water flag 2024-02-22 03:01:29 -06:00
Dave Corley
bb35f0366a Fix(loadcell): Save water height regardless of value, if the user actually adjusted it 2024-02-22 03:01:28 -06:00
Dave Corley
1b431bf633 Fix(editor): Don't save dirty water height values 2024-02-22 03:01:28 -06:00
psi29a
35f547ad7c Merge branch 'fatstacks' into 'master'
Allow the NAM9 field to be used if COUN is omitted

Closes #7836

See merge request OpenMW/openmw!3889
2024-02-22 08:10:59 +00:00
psi29a
518f34c869 Merge branch 'bsa_archive' into 'master'
Cleanup and optimize BSA archives code

See merge request OpenMW/openmw!3876
2024-02-22 08:02:12 +00:00
AnyOldName3
2a5f8d5bab Skip the check on MacOS
It doesn't work, the workaround isn't enough to make it work, I can't be bothered making a more powerful workaround, and it's impossible to *package* a MacOS build missing the plugins we need anyway, even if you can build and attempt to run it.
2024-02-22 00:24:44 +00:00
elsid
c2ac1ce046
Use is_directory member function
To reduce the number of syscalls.
2024-02-21 22:03:15 +01:00
AnyOldName3
3335ccbc32 Capitulate 2024-02-20 23:51:42 +00:00
AnyOldName3
8c92f6ee87 Make uniform a signed int again 2024-02-20 23:10:23 +00:00
AnyOldName3
d282fdb77a Eliminate unused uniform 2024-02-20 23:10:03 +00:00
AnyOldName3
132c43affa Fix warning
Also attempt to make an equivalent warning fire with MSVC, then have to fix other stuff because /WX wasn't working, then back out of enabling the warning because none of the ones I could find disliked the old code.
2024-02-20 22:14:13 +00:00
AnyOldName3
7391bf2814 Fix OpenGL errors
There's no reason to use the AndModes variant as we never (intentionally) attempt to sample from a shadow map via the FFP.
2024-02-20 21:23:23 +00:00
AnyOldName3
535c5e328a Affect correct texture units when disabling shadows for stateset
Knowing which are right required making the function non-static, so the shadow manager had to become a singleton as the results of passing it around to where it's needed were hellish.

I'm seeing a bunch of OpenGL errors when actually using this, so I'll investigate whether they're happening on master.
I'm hesitant to look into it too much, though, as I'm affected by https://gitlab.com/OpenMW/openmw/-/issues/7811, and also have the Windows setting enabled that turns driver timeouts into a BSOD so a kernel dump is collected that I can send to AMD.
2024-02-20 21:02:31 +00:00
Evil Eye
254b533512 Allow the NAM9 field to be used if COUN is omitted 2024-02-20 20:04:28 +01:00
psi29a
8c8fffc2c6 Merge branch 'fix_shared_library_build' into 'master'
Build fixes related to shared libraries and position independent code

See merge request OpenMW/openmw!3878
2024-02-20 08:47:14 +00:00
AnyOldName3
2c1c8bc8de Work around for listAllAvailablePlugins 2024-02-19 23:16:50 +00:00
psi29a
e88e92d3aa Merge branch 'recursive_directory_iteration_errors' into 'master'
Add context to the errors on recursive iteration over directory

See merge request OpenMW/openmw!3872
2024-02-19 10:00:24 +00:00
psi29a
3369184c19 Merge branch 'lesspragmaticpackages' into 'master'
Use decompose to handle AI packages and data

See merge request OpenMW/openmw!3856
2024-02-19 09:59:59 +00:00
elsid
efbc37d22f
Build components with position independent code only for Android
openmw is build as shared library with position independent code enabled there
so linked static libraries need to have this too.
2024-02-18 19:36:58 +01:00
elsid
e2e1d913af
Remove redundant destructor 2024-02-18 14:54:51 +01:00
elsid
8c6e0866e0
Avoid seek for detecting BSA type
Seek is pretty expensive operation. Try to read first 12 bytes instead.
2024-02-18 14:54:51 +01:00
elsid
cc9f9b53ba
Convert BsaVersion to enum class 2024-02-18 14:54:51 +01:00
elsid
df077a2524
Simplify and reduce code duplication for BSA archive creation 2024-02-18 14:54:14 +01:00
elsid
1b1ed55762
Add context to the errors on recursive iteration over directory
To avoid showing users errors like:
recursive_directory_iterator::operator++: Access is denied.

And show something like this:
Failed to recursively iterate over "/home/elsid/.local/share/openmw/test_data"
when incrementing to the next item from
"/home/elsid/.local/share/openmw/test_data/permission_denied": Permission denied
2024-02-18 01:08:19 +01:00
elsid
a2345194c8
Optimize lookup for a file in the BSA archive
Use binary search in sorted vector or normalized paths instead of linear search
in the original file struct. With number of files from 1k to 10k in vanilla
archives this gives some benefits.
2024-02-18 00:56:50 +01:00
psi29a
a297a0e742 Merge branch 'init_filesystem_archive' into 'master'
Initialize FileSystemArchive index in constructor

See merge request OpenMW/openmw!3870
2024-02-17 23:42:30 +00:00
psi29a
f9820e2061 Merge branch 'debugdrawdebugged' into 'master'
Try to uncursify debug primitive drawer (#7767)

Closes #7767

See merge request OpenMW/openmw!3852
2024-02-17 18:56:21 +00:00