Skip to content

Commit 23a46a1

Browse files
CapostrophicCapostrophic
committed
Merge branch 'vfs_normalized_path_22' into 'master'
Use normalized path for KeyframeManager::get (#8138) See merge request OpenMW/openmw!4463
2 parents 2aa249e + a550a8a commit 23a46a1

File tree

8 files changed

+84
-83
lines changed

8 files changed

+84
-83
lines changed

‎apps/components_tests/nifloader/testbulletnifloader.cpp

+45-42
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ namespace
295295
using namespace Nif::Testing;
296296
using NifBullet::BulletNifLoader;
297297

298+
constexpr VFS::Path::NormalizedView testNif("test.nif");
299+
constexpr VFS::Path::NormalizedView xtestNif("xtest.nif");
300+
298301
void copy(const btTransform& src, Nif::NiTransform& dst)
299302
{
300303
dst.mTranslation = osg::Vec3f(src.getOrigin().x(), src.getOrigin().y(), src.getOrigin().z());
@@ -366,7 +369,7 @@ namespace
366369

367370
TEST_F(TestBulletNifLoader, for_zero_num_roots_should_return_default)
368371
{
369-
Nif::NIFFile file("test.nif");
372+
Nif::NIFFile file(testNif);
370373
file.mHash = mHash;
371374

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

381384
TEST_F(TestBulletNifLoader, should_ignore_nullptr_root)
382385
{
383-
Nif::NIFFile file("test.nif");
386+
Nif::NIFFile file(testNif);
384387
file.mRoots.push_back(nullptr);
385388
file.mHash = mHash;
386389

@@ -393,7 +396,7 @@ namespace
393396

394397
TEST_F(TestBulletNifLoader, for_default_root_nif_node_should_return_default)
395398
{
396-
Nif::NIFFile file("test.nif");
399+
Nif::NIFFile file(testNif);
397400
file.mRoots.push_back(&mNode);
398401
file.mHash = mHash;
399402

@@ -408,7 +411,7 @@ namespace
408411
{
409412
mNode.recType = Nif::RC_RootCollisionNode;
410413

411-
Nif::NIFFile file("test.nif");
414+
Nif::NIFFile file(testNif);
412415
file.mRoots.push_back(&mNode);
413416
file.mHash = mHash;
414417

@@ -421,7 +424,7 @@ namespace
421424

422425
TEST_F(TestBulletNifLoader, for_default_root_nif_node_and_filename_starting_with_x_should_return_default)
423426
{
424-
Nif::NIFFile file("xtest.nif");
427+
Nif::NIFFile file(xtestNif);
425428
file.mRoots.push_back(&mNode);
426429
file.mHash = mHash;
427430

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

442-
Nif::NIFFile file("test.nif");
445+
Nif::NIFFile file(testNif);
443446
file.mRoots.push_back(&mNode);
444447
file.mHash = mHash;
445448

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

464-
Nif::NIFFile file("test.nif");
467+
Nif::NIFFile file(testNif);
465468
file.mRoots.push_back(&mNiNode);
466469
file.mHash = mHash;
467470

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

490-
Nif::NIFFile file("test.nif");
493+
Nif::NIFFile file(testNif);
491494
file.mRoots.push_back(&mNiNode);
492495
file.mHash = mHash;
493496

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

522-
Nif::NIFFile file("test.nif");
525+
Nif::NIFFile file(testNif);
523526
file.mRoots.push_back(&mNiNode);
524527
file.mHash = mHash;
525528

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

554-
Nif::NIFFile file("test.nif");
557+
Nif::NIFFile file(testNif);
555558
file.mRoots.push_back(&mNiNode);
556559
file.mHash = mHash;
557560

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

573-
Nif::NIFFile file("test.nif");
576+
Nif::NIFFile file(testNif);
574577
file.mRoots.push_back(&mNode);
575578
file.mHash = mHash;
576579

@@ -583,7 +586,7 @@ namespace
583586

584587
TEST_F(TestBulletNifLoader, for_tri_shape_root_node_should_return_static_shape)
585588
{
586-
Nif::NIFFile file("test.nif");
589+
Nif::NIFFile file(testNif);
587590
file.mRoots.push_back(&mNiTriShape);
588591
file.mHash = mHash;
589592

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

612-
Nif::NIFFile file("test.nif");
615+
Nif::NIFFile file(testNif);
613616
file.mRoots.push_back(&mNiTriShape);
614617
file.mHash = mHash;
615618

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

637-
Nif::NIFFile file("test.nif");
640+
Nif::NIFFile file(testNif);
638641
file.mRoots.push_back(&mNiNode);
639642
file.mHash = mHash;
640643

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

664-
Nif::NIFFile file("test.nif");
667+
Nif::NIFFile file(testNif);
665668
file.mRoots.push_back(&mNiNode);
666669
file.mHash = mHash;
667670

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

690-
Nif::NIFFile file("test.nif");
693+
Nif::NIFFile file(testNif);
691694
file.mRoots.push_back(&mNiNode);
692695
file.mHash = mHash;
693696

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

722-
Nif::NIFFile file("xtest.nif");
725+
Nif::NIFFile file(xtestNif);
723726
file.mRoots.push_back(&mNiNode);
724727
file.mHash = mHash;
725728

@@ -743,7 +746,7 @@ namespace
743746
copy(mTransform, mNiTriShape.mTransform);
744747
mNiTriShape.mTransform.mScale = 3;
745748

746-
Nif::NIFFile file("xtest.nif");
749+
Nif::NIFFile file(xtestNif);
747750
file.mRoots.push_back(&mNiTriShape);
748751
file.mHash = mHash;
749752

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

772-
Nif::NIFFile file("xtest.nif");
775+
Nif::NIFFile file(xtestNif);
773776
file.mRoots.push_back(&mNiNode);
774777
file.mHash = mHash;
775778

@@ -801,7 +804,7 @@ namespace
801804

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

804-
Nif::NIFFile file("xtest.nif");
807+
Nif::NIFFile file(xtestNif);
805808
file.mRoots.push_back(&mNiNode);
806809
file.mHash = mHash;
807810

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

839-
Nif::NIFFile file("test.nif");
842+
Nif::NIFFile file(testNif);
840843
file.mRoots.push_back(&mNiNode);
841844
file.mHash = mHash;
842845

@@ -872,7 +875,7 @@ namespace
872875
};
873876
mNiNode.mTransform.mScale = 4;
874877

875-
Nif::NIFFile file("test.nif");
878+
Nif::NIFFile file(testNif);
876879
file.mRoots.push_back(&mNiNode);
877880
file.mHash = mHash;
878881

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

906-
Nif::NIFFile file("xtest.nif");
909+
Nif::NIFFile file(xtestNif);
907910
file.mRoots.push_back(&mNiNode);
908911
file.mRoots.push_back(&mNiTriShape2);
909912
file.mHash = mHash;
@@ -938,7 +941,7 @@ namespace
938941
mNiNode.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
939942
mNiNode.recType = Nif::RC_AvoidNode;
940943

941-
Nif::NIFFile file("test.nif");
944+
Nif::NIFFile file(testNif);
942945
file.mRoots.push_back(&mNiNode);
943946
file.mHash = mHash;
944947

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

966-
Nif::NIFFile file("test.nif");
969+
Nif::NIFFile file(testNif);
967970
file.mRoots.push_back(&mNiNode);
968971
file.mHash = mHash;
969972

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

985-
Nif::NIFFile file("test.nif");
988+
Nif::NIFFile file(testNif);
986989
file.mRoots.push_back(&mNiNode);
987990
file.mHash = mHash;
988991

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

1005-
Nif::NIFFile file("test.nif");
1008+
Nif::NIFFile file(testNif);
10061009
file.mRoots.push_back(&mNiNode);
10071010
file.mHash = mHash;
10081011

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

1036-
Nif::NIFFile file("test.nif");
1039+
Nif::NIFFile file(testNif);
10371040
file.mRoots.push_back(&mNiNode);
10381041
file.mHash = mHash;
10391042

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

1065-
Nif::NIFFile file("test.nif");
1068+
Nif::NIFFile file(testNif);
10661069
file.mRoots.push_back(&mNiNode);
10671070
file.mHash = mHash;
10681071

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

1095-
Nif::NIFFile file("test.nif");
1098+
Nif::NIFFile file(testNif);
10961099
file.mRoots.push_back(&mNiNode);
10971100
file.mHash = mHash;
10981101

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

1123-
Nif::NIFFile file("test.nif");
1126+
Nif::NIFFile file(testNif);
11241127
file.mRoots.push_back(&mNiNode);
11251128
file.mHash = mHash;
11261129

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

1158-
Nif::NIFFile file("test.nif");
1161+
Nif::NIFFile file(testNif);
11591162
file.mRoots.push_back(&mNiNode);
11601163
file.mHash = mHash;
11611164

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

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

1208-
Nif::NIFFile file("test.nif");
1211+
Nif::NIFFile file(testNif);
12091212
file.mRoots.push_back(&mNiNode);
12101213
file.mHash = mHash;
12111214

@@ -1218,7 +1221,7 @@ namespace
12181221

12191222
TEST_F(TestBulletNifLoader, for_tri_strips_root_node_should_return_static_shape)
12201223
{
1221-
Nif::NIFFile file("test.nif");
1224+
Nif::NIFFile file(testNif);
12221225
file.mRoots.push_back(&mNiTriStrips);
12231226
file.mHash = mHash;
12241227

@@ -1242,7 +1245,7 @@ namespace
12421245
{
12431246
mNiTriStripsData.mStrips.clear();
12441247

1245-
Nif::NIFFile file("test.nif");
1248+
Nif::NIFFile file(testNif);
12461249
file.mRoots.push_back(&mNiTriStrips);
12471250
file.mHash = mHash;
12481251

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

1260-
Nif::NIFFile file("test.nif");
1263+
Nif::NIFFile file(testNif);
12611264
file.mRoots.push_back(&mNiTriStrips);
12621265
file.mHash = mHash;
12631266

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

1278-
Nif::NIFFile file("test.nif");
1281+
Nif::NIFFile file(testNif);
12791282
file.mRoots.push_back(&mNiTriStrips);
12801283
file.mHash = mHash;
12811284

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

1295-
Nif::NIFFile file("xtest.nif");
1298+
Nif::NIFFile file(xtestNif);
12961299
file.mRoots.push_back(&mNiNode);
12971300
file.mHash = mHash;
12981301

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

1312-
Nif::NIFFile file("xtest.nif");
1315+
Nif::NIFFile file(xtestNif);
13131316
file.mRoots.push_back(&mNiNode);
13141317
file.mRoots.push_back(&mNiTriStrips);
13151318
file.mHash = mHash;
@@ -1340,7 +1343,7 @@ namespace
13401343
mNiNode2.mChildren = Nif::NiAVObjectList{ Nif::NiAVObjectPtr(&mNiTriShape) };
13411344
mNiNode2.mTransform.mScale = 3;
13421345

1343-
Nif::NIFFile file("xtest.nif");
1346+
Nif::NIFFile file(xtestNif);
13441347
file.mRoots.push_back(&mNiNode);
13451348
file.mRoots.push_back(&mNiNode2);
13461349
file.mHash = mHash;
@@ -1378,7 +1381,7 @@ namespace
13781381

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

1381-
Nif::NIFFile file("test.nif");
1384+
Nif::NIFFile file(testNif);
13821385
file.mRoots.push_back(&mNiNode);
13831386

13841387
const auto result = mLoader.load(file);

0 commit comments

Comments
 (0)