mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 22:13:21 +00:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Alexei Kotov 2024-04-18 07:43:33 +03:00
parent 96f5ae5a8d
commit 1d65aaee71
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/niftest/niftest.cpp
View File

@ -89,7 +89,6 @@ void readNIF(
} }
} }
void readMaterial( void readMaterial(
const std::filesystem::path& source, const std::filesystem::path& path, const VFS::Manager* vfs, bool quiet) const std::filesystem::path& source, const std::filesystem::path& path, const VFS::Manager* vfs, bool quiet)
{ {

5
components/bgsm/stream.hpp
View File

@ -3,9 +3,9 @@
#include <array> #include <array>
#include <cassert> #include <cassert>
#include <cstdint>
#include <istream> #include <istream>
#include <stdexcept> #include <stdexcept>
#include <cstdint>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@ -58,8 +58,7 @@ namespace Bgsm
Files::IStreamPtr mStream; Files::IStreamPtr mStream;
public: public:
explicit BGSMStream( explicit BGSMStream(const Reader& reader, Files::IStreamPtr&& stream)
const Reader& reader, Files::IStreamPtr&& stream)
: mReader(reader) : mReader(reader)
, mStream(std::move(stream)) , mStream(std::move(stream))
{ {

20
components/nifosg/nifloader.cpp
View File

@ -240,7 +240,8 @@ namespace NifOsg
{ {
public: public:
/// @param filename used for warning messages. /// @param filename used for warning messages.
LoaderImpl(const std::filesystem::path& filename, unsigned int ver, unsigned int userver, unsigned int bethver, Resource::BgsmFileManager* materialMgr) LoaderImpl(const std::filesystem::path& filename, unsigned int ver, unsigned int userver, unsigned int bethver,
Resource::BgsmFileManager* materialMgr)
: mFilename(filename) : mFilename(filename)
, mVersion(ver) , mVersion(ver)
, mUserVersion(userver) , mUserVersion(userver)
@ -783,7 +784,8 @@ namespace NifOsg
else else
{ {
if (args.mHasMarkers) if (args.mHasMarkers)
skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker") || Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker"); skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker")
|| Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker");
} }
if (!skip) if (!skip)
{ {
@ -2162,8 +2164,8 @@ namespace NifOsg
handleTextureControllers(texprop, composite, imageManager, stateset, animflags); handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
} }
void handleShaderMaterial(const std::string& path, osg::StateSet* stateset, Resource::ImageManager* imageManager, void handleShaderMaterial(const std::string& path, osg::StateSet* stateset,
std::vector<unsigned int>& boundTextures) Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures)
{ {
if (!mMaterialMgr) if (!mMaterialMgr)
return; return;
@ -2229,8 +2231,8 @@ namespace NifOsg
stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF); stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
boundTextures.clear(); boundTextures.clear();
} }
std::string filename = Misc::ResourceHelpers::correctTexturePath( std::string filename
bgem->mBaseMap, imageManager->getVFS()); = Misc::ResourceHelpers::correctTexturePath(bgem->mBaseMap, imageManager->getVFS());
osg::ref_ptr<osg::Image> image = imageManager->getImage(filename); osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image); osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
texture2d->setName("diffuseMap"); texture2d->setName("diffuseMap");
@ -2976,9 +2978,11 @@ namespace NifOsg
} }
}; };
osg::ref_ptr<osg::Node> Loader::load(Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialMgr) osg::ref_ptr<osg::Node> Loader::load(
Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialMgr)
{ {
LoaderImpl impl(file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion(), materialMgr); LoaderImpl impl(
file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion(), materialMgr);
return impl.load(file, imageManager); return impl.load(file, imageManager);
} }

3
components/nifosg/nifloader.hpp
View File

@ -31,7 +31,8 @@ namespace NifOsg
public: public:
/// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton
/// if so. /// if so.
static osg::ref_ptr<osg::Node> load(Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager); static osg::ref_ptr<osg::Node> load(
Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager);
/// Load keyframe controllers from the given kf file. /// Load keyframe controllers from the given kf file.
static void loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target); static void loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target);

3
components/resource/resourcesystem.cpp
View File

@ -18,7 +18,8 @@ namespace Resource
mNifFileManager = std::make_unique<NifFileManager>(vfs, encoder); mNifFileManager = std::make_unique<NifFileManager>(vfs, encoder);
mBgsmFileManager = std::make_unique<BgsmFileManager>(vfs, expiryDelay); mBgsmFileManager = std::make_unique<BgsmFileManager>(vfs, expiryDelay);
mImageManager = std::make_unique<ImageManager>(vfs, expiryDelay); mImageManager = std::make_unique<ImageManager>(vfs, expiryDelay);
mSceneManager = std::make_unique<SceneManager>(vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay); mSceneManager = std::make_unique<SceneManager>(
vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay);
mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get(), expiryDelay, encoder); mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get(), expiryDelay, encoder);
addResourceManager(mNifFileManager.get()); addResourceManager(mNifFileManager.get());

3
components/resource/scenemanager.cpp
View File

@ -797,7 +797,8 @@ namespace Resource
} }
osg::ref_ptr<osg::Node> load(VFS::Path::NormalizedView normalizedFilename, const VFS::Manager* vfs, osg::ref_ptr<osg::Node> load(VFS::Path::NormalizedView normalizedFilename, const VFS::Manager* vfs,
Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* materialMgr) Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager,
Resource::BgsmFileManager* materialMgr)
{ {
const std::string_view ext = Misc::getFileExtension(normalizedFilename.value()); const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
if (ext == "nif") if (ext == "nif")