psi29a
622f906855
Merge branch 'fix_esm4_reader_utf8' into 'master'
...
Fix conversion to UTF8 for ESM4 Reader strings
See merge request OpenMW/openmw!2394
2022-09-12 07:04:39 +00:00
elsid
a9826342b2
Print ESM4 EditorId and Model by esmtool dump
2022-09-12 01:42:08 +02:00
elsid
4f7dcd5ae5
Fix conversion to UTF8 for ESM4 Reader strings
...
toUtf8 returns a string view to the input when input string is ASCII and nothing
is written to the buffer which means output string of Reader::getStringImpl is
not modified.
Move input to the output string and resize it in this case.
2022-09-12 01:42:01 +02:00
psi29a
80d52e3da8
Merge branch 'cursor' into 'master'
...
Support high-resolution cursor textures
Closes #6933
See merge request OpenMW/openmw!2262
2022-09-11 18:32:18 +00:00
psi29a
9e0678083d
Merge branch 'fix_build' into 'master'
...
Add missing include <array>
See merge request OpenMW/openmw!2392
2022-09-11 18:31:36 +00:00
elsid
9f35f9b45b
Add missing include <array>
2022-09-11 19:55:53 +02:00
psi29a
ab5023932d
Merge branch 'add_additional_osg_plugins' into 'master'
...
reorg of cmake osg plugins; add osgSim and osgdb_dae requirements
See merge request OpenMW/openmw!946
2022-09-11 17:17:52 +00:00
psi29a
435eacdaad
Merge branch 'debug_draw_commands' into 'master'
...
API to draw primitives
See merge request OpenMW/openmw!2345
2022-09-11 17:17:16 +00:00
Andrei Kortunov
a2c02d2999
Support high-resolution cursor textures (feature 6933)
2022-09-11 20:54:20 +04:00
psi29a
db619c684f
Merge branch 'cellstore_refactor' into 'master'
...
CellStore refactor, same idea as ESMStore refactor
See merge request OpenMW/openmw!2389
2022-09-11 16:37:31 +00:00
florent.teppe
43b0ae1ce7
all debug renders now use the same shader and it works
...
remove debug draw shader, now that debug and debugdraw serve the same function
remove debug draw code from actors to clean
replaced int uniforms with bool for better readability
clang format
cleanup, remove unused func, and mistake whitespace
fix namespace
added more colors
fixed missing whitespace
2022-09-11 17:54:01 +02:00
florent.teppe
21971c08ba
debug draw shader uses the generic functions
...
renamed files
roundabout way to change case with windows noticing
fixed type
fix filename in cmakelist.txt
ported shader and c++ code so glsl 120 can be used instead of 330
new debug shader and old one are almost unified
for some reason, even though I get no compilation issue, old debug draws don't work, only the new one implemented by this MR
remove useless const cast
2022-09-11 17:53:59 +02:00
florent.teppe
bd1bbc0ab8
removes mutex, and uses double buffering to avoid writing on a resource that will be read by the draw thread
...
changes when the buffers are reset -> at the end of the draw, because that's when we are certain the data isn't needed anymore
removed useless variable
fixed typo
include osg::vec3 instead of osg vec3f
compile linux
compile ?
applied clang format to the new files
2022-09-11 17:53:56 +02:00
florent.teppe
2a980ecb50
cleaned some code and fixed some naming issues
...
Moved debug draw to components, fixed some whitespace issues, added include guard
fixed uniform name, removed old files
Fixes some more whitespace weirdness
2022-09-11 17:53:53 +02:00
florent.teppe
12b3424dd7
initial work to get lines in
...
lines need the same synchronisation system as the other primitives
This two points are there because if I resize to 0 it crashes, si I need a pice of line at 0.,0.,0. so there is no crash.Not ideal
Lines are colored
didn't commit updated shader file
2022-09-11 17:53:51 +02:00
florent.teppe
80c97e48bf
made code more consistent between cube, cylinder and wirecube, should also fix a clang compilation error
...
remove include to non existing file
Actors code displays different ways to use debug draw
oups, forgot to remove parameter in function
fix include case sensitivity
Jopefully fixes all linux issues
moves some code pieces, and the debug draw now has a group node to have different types of objects to draw
2022-09-11 17:53:49 +02:00
florent.teppe
76008e1ff8
Multiple shapes to draw
...
adds wireCube primitive
scale of the command taken into account
shading light is more vertical
2022-09-11 17:53:47 +02:00
florent.teppe
93af569a68
can place a cube at 0,0,0 Useless for now
...
Arbitrarly draw cubes at certain position with a certain color
Adds exemple of how it looks in the actor update code.
draws a green cube if alive, red else
2022-09-11 17:53:41 +02:00
Bret Curtis
1237c45ecb
turn on BUILD_OSG_PLUGIN_DAE for non system OSG
2022-09-11 17:37:51 +02:00
Bret Curtis
3e9510a89f
reorg of cmake osg plugins; add osgSim and osgdb_dae requirements
2022-09-11 17:37:51 +02:00
psi29a
29f3de30c2
Merge branch 'master' into 'cellstore_refactor'
...
# Conflicts:
# apps/openmw/mwworld/scene.cpp
2022-09-11 15:03:37 +00:00
psi29a
052a3d9bc5
Merge branch 'std-filesystem' into 'master'
...
Replace all remaining occurrences of boost::filesystem with std::filesystem.
Closes #6085
See merge request OpenMW/openmw!1996
2022-09-11 15:00:12 +00:00
Project579
886b8c7af2
Fix build error with stdlibc++ due to includes shuffling.
2022-09-11 14:41:21 +02:00
Project579
9ceafe770d
Hard fail on loading BSA with records using unicode paths.
2022-09-11 14:41:21 +02:00
Project579
a60cebd0f9
Use std::u8string_view in debug logger overloads parameters.
2022-09-11 14:41:21 +02:00
Project579
1a79f098fa
Use std::filesystem::create_directories instead of std::filesystem::create_directory to recursively generate directories from the provided path.
2022-09-11 14:41:21 +02:00
Project579
ca14fc00dc
Added dedicated functions for conversions between QString and std::filesystem::path.
2022-09-11 14:41:21 +02:00
Project579
c226b35f1f
Fix some remaining encoding errors due to std::filesystem transition.
2022-09-11 14:41:20 +02:00
Project579
1fc197e404
Check std::getenv output before using it to construct a std::filesystem::path.
2022-09-11 14:41:20 +02:00
Project579
5456ef1d50
Add new functions and overloads to support std::u8string and std::filesystem::path.
2022-09-11 14:41:20 +02:00
Project579
796911e67d
iniimporter: Work around some old MSVC compiler bugs.
2022-09-11 14:41:20 +02:00
Project579
199bf233e8
essimporter: Don't use "std::string" to store paths.
2022-09-11 14:41:20 +02:00
Project579
14a786bab0
iniimporter: Don't convert paths to "std::string".
2022-09-11 14:41:20 +02:00
Project579
4e428dee12
Update some settings that accept paths by "std::string" to accept them as "std::filesystem::path" instead.
2022-09-11 14:41:20 +02:00
Project579
2df8bfed25
Fix build errors after rebase against master due to large amount of changes.
2022-09-11 14:41:20 +02:00
Project579
c3175e371a
Fix YAML::LoadFile mangling Unicode paths in Windows.
2022-09-11 14:41:20 +02:00
Project579
928b131564
Implement std::filesystem::path conversion tests.
2022-09-11 14:41:20 +02:00
Project579
a13709c510
Replace implicit convertions from std::filesystem::path to std::string with correctly converting functions.
2022-09-11 14:41:20 +02:00
Project579
4d47e8d055
openmw-cs: model: world: data: Remove dead code.
2022-09-11 14:41:20 +02:00
Project579
dec3f24375
filesystem: configurationmanager: Store file path tokens as std::u8string.
2022-09-11 14:41:20 +02:00
Project579
78ab009d5c
Add required overloads to logger for handling unicode paths, also add conversion functions from std::filesystem::path to std::string without losing unicode data.
2022-09-11 14:41:20 +02:00
Project579
b817359bcf
Revert "Fix regression from https://gitlab.com/OpenMW/openmw/-/merge_requests/1776 "
...
This reverts commit 6a5ad4ca43
2022-09-11 14:41:20 +02:00
Project579
864112b5db
Fixed Windows build when using MSVC 14.26 and MacOS build.
2022-09-11 14:41:20 +02:00
Project579
6bf4c7a04f
Upgraded "input-file" command line option to Files::MaybeQuotedPath from std::string to allow unicode characters on Windows.
2022-09-11 14:41:20 +02:00
Project579
e5c417c968
Make sure all paths are passed as std::filesystem::path instead of std::string where possible.
2022-09-11 14:41:15 +02:00
florent.teppe
10899ed680
typo
2022-09-11 13:18:56 +02:00
Project579
35fe214588
Updated components/misc/timeconvert.hpp to fix the Android build.
2022-09-11 02:20:01 +02:00
Project579
5446571aec
Circumvent QT MOC bugs by including the filesystem header in a specific order.
2022-09-11 02:19:07 +02:00
Project579
cf0af87c80
Revert changes from "4c8e1ccf - Fixed windows build and updated tests to reflect changes of escape character from "&" to "\"" in "apps/openmw_test_suite/openmw/options.cpp"
2022-09-11 02:19:07 +02:00
Project579
e97eeca281
Attempt to work around QT MOC bugs caused by the filesystem header.
2022-09-11 02:19:07 +02:00
