Skip to content

Commit

Permalink
Merge branch 'vfs_normalized_path_22' into 'master'
Browse files Browse the repository at this point in the history 
Use normalized path for KeyframeManager::get (#8138)

See merge request OpenMW/openmw!4463
  • Loading branch information
@Capostrophic
Capostrophic committed Dec 1, 2024
2 parents 2aa249e + a550a8a commit 23a46a1
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 83 deletions.
87 changes: 45 additions & 42 deletions apps/components_tests/nifloader/testbulletnifloader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@ namespace
using namespace Nif::Testing;
using NifBullet::BulletNifLoader;

constexpr VFS::Path::NormalizedView testNif("test.nif");
constexpr VFS::Path::NormalizedView xtestNif("xtest.nif");

void copy(const btTransform& src, Nif::NiTransform& dst)
{
dst.mTranslation = osg::Vec3f(src.getOrigin().x(), src.getOrigin().y(), src.getOrigin().z());
Expand Down Expand Up @@ -366,7 +369,7 @@ namespace

TEST_F(TestBulletNifLoader, for_zero_num_roots_should_return_default)
{
Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mHash = mHash;

const auto result = mLoader.load(file);
Expand All @@ -380,7 +383,7 @@ namespace

TEST_F(TestBulletNifLoader, should_ignore_nullptr_root)
{
Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(nullptr);
file.mHash = mHash;

Expand All @@ -393,7 +396,7 @@ namespace

TEST_F(TestBulletNifLoader, for_default_root_nif_node_should_return_default)
{
Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNode);
file.mHash = mHash;

Expand All @@ -408,7 +411,7 @@ namespace
{
mNode.recType = Nif::RC_RootCollisionNode;

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNode);
file.mHash = mHash;

Expand All @@ -421,7 +424,7 @@ namespace

TEST_F(TestBulletNifLoader, for_default_root_nif_node_and_filename_starting_with_x_should_return_default)
{
Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNode);
file.mHash = mHash;

Expand All @@ -439,7 +442,7 @@ namespace
mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNode);
file.mHash = mHash;

Expand All @@ -461,7 +464,7 @@ namespace
mNode.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -487,7 +490,7 @@ namespace
mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-4, -5, -6);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -519,7 +522,7 @@ namespace
mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-7, -8, -9);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode), Nif::NiAVObjectPtr(&mNode2) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -551,7 +554,7 @@ namespace
mNiNode.mBounds.mBox.mCenter = osg::Vec3f(-7, -8, -9);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNode), Nif::NiAVObjectPtr(&mNode2) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -570,7 +573,7 @@ namespace
mNode.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
mNode.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNode);
file.mHash = mHash;

Expand All @@ -583,7 +586,7 @@ namespace

TEST_F(TestBulletNifLoader, for_tri_shape_root_node_should_return_static_shape)
{
Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriShape);
file.mHash = mHash;

Expand All @@ -609,7 +612,7 @@ namespace
mNiTriShape.mBounds.mBox.mExtents = osg::Vec3f(1, 2, 3);
mNiTriShape.mBounds.mBox.mCenter = osg::Vec3f(-1, -2, -3);

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriShape);
file.mHash = mHash;

Expand All @@ -634,7 +637,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -661,7 +664,7 @@ namespace
mNiNode2.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
mNiTriShape.mParents.push_back(&mNiNode2);

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -687,7 +690,7 @@ namespace
mNiTriShape2.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -719,7 +722,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -743,7 +746,7 @@ namespace
copy(mTransform, mNiTriShape.mTransform);
mNiTriShape.mTransform.mScale = 3;

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiTriShape);
file.mHash = mHash;

Expand All @@ -769,7 +772,7 @@ namespace
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
mNiNode.mTransform.mScale = 4;

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -801,7 +804,7 @@ namespace

mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -836,7 +839,7 @@ namespace
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
mNiNode.mTransform.mScale = 4;

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -872,7 +875,7 @@ namespace
};
mNiNode.mTransform.mScale = 4;

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -903,7 +906,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mRoots.push_back(&mNiTriShape2);
file.mHash = mHash;
Expand Down Expand Up @@ -938,7 +941,7 @@ namespace
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
mNiNode.recType = Nif::RC_AvoidNode;

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -963,7 +966,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -982,7 +985,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -1002,7 +1005,7 @@ namespace
mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1033,7 +1036,7 @@ namespace
mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1062,7 +1065,7 @@ namespace
mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1092,7 +1095,7 @@ namespace
mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1120,7 +1123,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1155,7 +1158,7 @@ namespace
mNiNode.mChildren
= Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&niTriShape), Nif::NiAVObjectPtr(&emptyCollisionNode) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand Down Expand Up @@ -1184,7 +1187,7 @@ namespace
mNiNode.mExtraList.push_back(Nif::ExtraPtr(&mNiIntegerExtraData));
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;
file.mVersion = Nif::NIFStream::generateVersion(10, 0, 1, 0);
Expand All @@ -1205,7 +1208,7 @@ namespace
mNiNode.mExtra = Nif::ExtraPtr(&mNiStringExtraData);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -1218,7 +1221,7 @@ namespace

TEST_F(TestBulletNifLoader, for_tri_strips_root_node_should_return_static_shape)
{
Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriStrips);
file.mHash = mHash;

Expand All @@ -1242,7 +1245,7 @@ namespace
{
mNiTriStripsData.mStrips.clear();

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriStrips);
file.mHash = mHash;

Expand All @@ -1257,7 +1260,7 @@ namespace
{
mNiTriStripsData.mStrips.front() = { 0, 1 };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriStrips);
file.mHash = mHash;

Expand All @@ -1275,7 +1278,7 @@ namespace
mNiNode.recType = Nif::RC_AvoidNode;
mNiTriStripsData.mStrips.front() = { 0, 1 };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiTriStrips);
file.mHash = mHash;

Expand All @@ -1292,7 +1295,7 @@ namespace
mNiTriStrips.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriStrips) };

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mHash = mHash;

Expand All @@ -1309,7 +1312,7 @@ namespace
mNiTriShape.mParents.push_back(&mNiNode);
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mRoots.push_back(&mNiTriStrips);
file.mHash = mHash;
Expand Down Expand Up @@ -1340,7 +1343,7 @@ namespace
mNiNode2.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
mNiNode2.mTransform.mScale = 3;

Nif::NIFFile file("xtest.nif");
Nif::NIFFile file(xtestNif);
file.mRoots.push_back(&mNiNode);
file.mRoots.push_back(&mNiNode2);
file.mHash = mHash;
Expand Down Expand Up @@ -1378,7 +1381,7 @@ namespace

mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape), Nif::NiAVObjectPtr(&mNiTriShape2) };

Nif::NIFFile file("test.nif");
Nif::NIFFile file(testNif);
file.mRoots.push_back(&mNiNode);

const auto result = mLoader.load(file);
Expand Down
Loading

0 comments on commit 23a46a1

Please sign in to comment.