Commit Graph

174 Commits (master)

Author SHA1 Message Date
Bo Svensson db3d938ee9
cleans up BSAFile (#3177)
We currently build a large map of a BSAFile's contents unused by Open MW. We already map archive contents in VFS. With this PR we remove the map from BSAFile and reimplement its only current use in BSATool.
3 years ago
Bo Svensson 7c50f823d8
devirtualises BSAFile (#3161)
Currently, Open MW's basic file access speed is limited by a peculiar layer of virtualisation in BSAFile's interface. This PR removes such virtualisation by properly separating BSAFile from CompressedBSAFile in low level contexts.
3 years ago
Evil Eye 0998929608 Merge branch 'noreturn' into 'master'
Sprinkle some [[noreturn]] where possible

See merge request OpenMW/openmw!793
4 years ago
jvoisin 1123dc46ee Add a ton of const refs 4 years ago
jvoisin aec3c74fa5 Sprinkle some [[noreturn]] where possible 4 years ago
CedricMocquillon 86d137363e Check if the archive is opened before adding a file to it and clear state on close 4 years ago
CedricMocquillon b61249841e Update lookup only after sorting files 4 years ago
Andrei Kortunov b717103fe0 Fix warning in assert - size_t can not be negative 4 years ago
Andrei Kortunov 963e1b8b3f Fix MSVC's C4244 warnings 4 years ago
Andrei Kortunov f9d42ed396 Fix MSVC's C4267 warnings 4 years ago
Andrei Kortunov 6d351b2bdd Fix MSVC 4706 warnings 4 years ago
jvoisin 47ced7dec4 Add some validation for bsa parsing
This should fix #5955
4 years ago
Andrei Kortunov 41c78a889a Check for decompression error code 4 years ago
CedricMocquillon d617d66a87 Add file to BSA 4 years ago
Gleb Mazovetskiy b9c2f6ea1a Minor cleanup: Remove `using namespace std`
I came across these while trying to figure why MSVC build triggers
https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889

In the end, the issue was not in openmw but in OSG, but it's good to
clean up here anyway.
4 years ago
unknown 3bf641d3ce Show mesh origin 4 years ago
psi29a 957a1425d1 Merge branch 'cleanup_1' into 'master'
Cleanup 1

See merge request OpenMW/openmw!365
4 years ago
Alexei Dobrohotov 45c155b054 Rewrite compressed BSA hash calculation again 4 years ago
Bret Curtis d826fbdadf components/bsa cleanup 4 years ago
WW d39aef3f5a Changed `LZ4F_dctx*` to `LZ4F_decompressionContext_t` for better compatibility. 4 years ago
Alexei Dobrohotov 66d2b9c195 Add Skyrim SE BSA version support
Fix embedded file name loading
4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
Capostrophic d3244dc777 Don't save space in compressed BSA hash generation 5 years ago
Capostrophic c9df63ffd1 Replace BSAOpt hash calculation with a custom function 6 years ago
Capostrophic be5faadff8 Fix compressed BSA loading on non-Windows systems 6 years ago
Azdul 7880e6f761 CompressedBSAFile::FileRecord::isCompressed implementation simplified.
Double space in CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag removed.
6 years ago
Azdul 6aa6b2dc89 Removed TES4 from file names. Correct Git file history / attribution. 6 years ago
Azdul a3bcd95546 Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa 6 years ago
Azdul 42ea609d1d Remove files with incorrect Git history / attribution 6 years ago
Azdul 4c499983ca Fixed warnings reported by GCC 6 years ago
Azdul e502819246 Proper conversion from shared_ptr<bsa::MemoryinputStream> to shared_ptr<std::istream> 6 years ago
Azdul b9a7514278 Memory leak fixed. Proper file names in headers. 6 years ago
Azdul 25650e65bf Read any BSA file - detection based on version in BSA header 6 years ago
cc9cii 3982573035 BSA enhancements.
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because  Boost::filesystem seems to take forever on GetFileAttributeW.  This implementation uses FindFirstFile/FindNextFile/FindClose instead.
6 years ago
Harald H d3b623b5d3 http to https for supported urls (#1625)
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
7 years ago
Bret Curtis c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
8 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
scrawl b2019d31c7 Mark thread safe methods in BsaFile 9 years ago
cc9cii 003b0d48be Move resource names listing code out of CSMWorld::Resources ctor in order to avoid multiple scan of the same resources.
- The resources are still scanned twice, once when the archive/directory is added and another time when the names are listed.
9 years ago
Arthur Moore 4c0c20b1a0 Changed relative includes to library header format 9 years ago
cc9cii bb250a236b Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch). 10 years ago
cc9cii b920e1bde7 Support MSVC 2015. Tested(*) with updated dependencies:
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763

(*) only tested compilation and startup of the each app
10 years ago
scrawl fe15f31f3e Remove strings.h wrapper 10 years ago
scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
10 years ago
scrawl 510375aa63 Add virtual file system (VFS) replacing the low level parts of the old resource system 10 years ago
Nathan Aclander 48e2ec2840 Fix comparison of integers of different signs
Clang reported comparison of unsigned long with long. This cast should fix it.
10 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
scrawl d4dff6ed55 Port BSAFile to istream, remove OGRE bsa resource system 10 years ago
cc9cii 312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
10 years ago
scrawl fc4f069d0f Remove old BSA tests 10 years ago
gus 5fd599b5de minor corrections 11 years ago
gus 2092e5fe22 compile fixes 11 years ago
greye 493f8c6050 fix opening BSA on Unicode path 11 years ago
Marek Kochanowicz 6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl d5c7a26041 Fix broken loose file resources when using Ogre 1.9 12 years ago
Emanuel Guevel 3adf3f5121 Revive bsatool 12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 9b7957cf20 fixed a missing inlcude 12 years ago
scrawl 109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 85697e4628 reverted to C++03 12 years ago
scrawl 3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson e5f040a06f Improve filename pattern matching 12 years ago
scrawl e4f140841e Make OpenMW work with Ogre 1.9 12 years ago
Nathan Jeffords 44031ec3d7 fleshed out BSAArchive and DirArchive.
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
12 years ago
Marc Zinnschlag d1e51ebf42 silenced some warnings 12 years ago
Nathan Jeffords 67491f6c49 reworked DirArchive to improve performance
Replaced old file index with a simple map. The map works by storing the
file's relative path with path seperators normalized, and in lower case if
not in strict mode. Incoming searches are normalized in the same way then
the name is searched in the map. The value in the map is the original full
path to the file which is then used to created a ConstrainedDataStream. In
addition to changing the index, the commonly used Archive methods are
implemented so that they don't fall back on the default FileSystemArchive
implementations.
12 years ago
Nathan Jeffords 43cd88a24e include members of BSAArchives in Ogres resource indices 12 years ago
Nathan Jeffords 5c7f1bd497 moved ConstrainedDataStream into its own file
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
12 years ago
scrawl 84a4fd56c3 consider all files in Splash directory 12 years ago
Michael Mc Donnell 7f802a22b5 Compare with stream position instead of int.
Fixes compilation of Debug build on Windows.
13 years ago
Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
13 years ago
guidoj a021165d9f Changed standard C lib includes to C++ format 13 years ago
Chris Robinson b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	components/bsa/bsa_archive.cpp
13 years ago
Marc Zinnschlag 871b1d1c9b silenced a warning 13 years ago
Chris Robinson bc0a6bffcf Remove outdated comment 13 years ago
Chris Robinson a8ebb39883 Avoid Mangle for BSA accesses
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
13 years ago
Chris Robinson 386ac56bda Remove the NIF loader and code to manually transform the vertices
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
Jason Hooks c4c8288af8 Seven digit scales 13 years ago
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
Jason Hooks 57299571d5 Preparing for clothes/armor 13 years ago
Alexander "Ace" Olofsson 54ce95cfaf Make sure it doesn't find the wrong file 13 years ago
Marc Zinnschlag 08f8701b33 workaround for tga problem 13 years ago
Alexander "Ace" Olofsson 3b0dc408ae Debug-b-gone 13 years ago
Alexander "Ace" Olofsson 06a34b9e0d Strange problems call for strange solutions. 13 years ago
Alexander "Ace" Olofsson 8e07b7e050 Better (less) debug output 13 years ago
Alexander "Ace" Olofsson 8d9100c77b Debug output 13 years ago
Alexander "Ace" Olofsson fc4e4dc336 Case sensitiviy? 13 years ago
Alexander "Ace" Olofsson 8ac9dd8e70 Always use the same type of slashes 13 years ago
Alexander "Ace" Olofsson d2f8539a42 Forgot to remove some old code that didn't do anything 13 years ago
Alexander "Ace" Olofsson 4a9a416d46 Can find files even if no .bsa file exists now 13 years ago
Alexander "Ace" Olofsson 60b95e7992 Sorting the file lists properly 13 years ago
Alexander "Ace" Olofsson 6acd900577 Better name 13 years ago
Alexander "Ace" Olofsson c3944d3e1a Use a normal binary search 13 years ago