mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2026-07-26 18:00:38 +00:00
refactor: physpreset codestyle (#928)
* chore: adjust phys preset code to use similar code style * fix: infinity friction for t6 * fix: t6 phys preset canFloat qboolean * chore: move iw5 phys preset enum strings to enum strings header * chore: add phys preset tests for all games * chore: rename PhysPresetFields headers
This commit is contained in:
Jan Laupetin
@@ -0,0 +1,46 @@
|
||||
#include "Game/IW3/PhysPreset/RawLoaderPhysPresetIW3.h"
|
||||
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace IW3;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (IW3)", "[iw3][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\sndAliasPrefix\physics_metal)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\tempDefaultToCylinder\1)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::IW3, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderIW3(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
|
||||
}
|
||||
} // namespace
|
||||
@@ -0,0 +1,47 @@
|
||||
#include "Game/IW4/PhysPreset/RawLoaderPhysPresetIW4.h"
|
||||
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace IW4;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (IW4)", "[iw4][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\sndAliasPrefix\physics_metal)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\tempDefaultToCylinder\1\perSurfaceSndAlias\1)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::IW4, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderIW4(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
|
||||
REQUIRE(loadedPhysPreset->perSurfaceSndAlias == true);
|
||||
}
|
||||
} // namespace
|
||||
@@ -0,0 +1,56 @@
|
||||
#include "Game/IW5/PhysPreset/RawLoaderPhysPresetIW5.h"
|
||||
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace IW5;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (IW5)", "[iw5][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1.25\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\sndAliasPrefix\physics_metal)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\minMomentum\1.0\maxMomentum\2.0)"
|
||||
R"(\minPitch\3.0\maxPitch\4.0)"
|
||||
R"(\volumeType\linear\pitchType\quadratic)"
|
||||
R"(\tempDefaultToCylinder\1\perSurfaceSndAlias\1)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::IW5, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderIW5(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(std::numeric_limits<float>::max()));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->minMomentum == Approx(1.0f));
|
||||
REQUIRE(loadedPhysPreset->maxMomentum == Approx(2.0f));
|
||||
REQUIRE(loadedPhysPreset->minPitch == Approx(3.0f));
|
||||
REQUIRE(loadedPhysPreset->maxPitch == Approx(4.0f));
|
||||
REQUIRE(loadedPhysPreset->volumeType == PHYSPRESET_SCALING_LINEAR);
|
||||
REQUIRE(loadedPhysPreset->pitchType == PHYSPRESET_SCALING_QUADRATIC);
|
||||
REQUIRE(loadedPhysPreset->tempDefaultToCylinder == true);
|
||||
REQUIRE(loadedPhysPreset->perSurfaceSndAlias == true);
|
||||
}
|
||||
} // namespace
|
||||
@@ -0,0 +1,48 @@
|
||||
#include "Game/T4/PhysPreset/RawLoaderPhysPresetT4.h"
|
||||
|
||||
#include "Game/T4/ObjConstantsT4.h"
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace T4;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (T4)", "[t4][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\sndAliasPrefix\physics_metal)"
|
||||
R"(\mass\1250\friction\0.5\isFrictionInfinity\1\bounce\0.25)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\tempDefaultToCylinder\1\canFloat\1\gravityScale\2)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::T4, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderT4(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(std::string(loadedPhysPreset->sndAliasPrefix) == "physics_metal");
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->canFloat == 1);
|
||||
REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
|
||||
}
|
||||
} // namespace
|
||||
@@ -0,0 +1,58 @@
|
||||
#include "Game/T5/PhysPreset/RawLoaderPhysPresetT5.h"
|
||||
|
||||
#include "Game/T5/ObjConstantsT5.h"
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace T5;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (T5)", "[t5][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1250\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\canFloat\1\gravityScale\2)"
|
||||
R"(\massOffsetX\1\massOffsetY\2\massOffsetZ\3)"
|
||||
R"(\buoyancyMinX\3\buoyancyMinY\4\buoyancyMinZ\5)"
|
||||
R"(\buoyancyMaxX\6\buoyancyMaxY\7\buoyancyMaxZ\8)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::T5, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderT5(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->canFloat == 1);
|
||||
REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.x == Approx(1.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.y == Approx(2.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.z == Approx(3.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.x == Approx(3.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.y == Approx(4.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.z == Approx(5.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.x == Approx(6.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.y == Approx(7.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.z == Approx(8.0f));
|
||||
}
|
||||
} // namespace
|
||||
@@ -0,0 +1,58 @@
|
||||
#include "Game/T6/PhysPreset/RawLoaderPhysPresetT6.h"
|
||||
|
||||
#include "Game/T6/ObjConstantsT6.h"
|
||||
#include "SearchPath/MockSearchPath.h"
|
||||
|
||||
#include <catch2/catch_approx.hpp>
|
||||
#include <catch2/catch_test_macros.hpp>
|
||||
|
||||
using namespace T6;
|
||||
using namespace Catch;
|
||||
|
||||
namespace
|
||||
{
|
||||
TEST_CASE("PhysPreset loader restores stock raw fields (T6)", "[t6][physpreset][system]")
|
||||
{
|
||||
constexpr auto RAW_PHYS_PRESET = R"(PHYSIC\mass\1250\bounce\0.25\friction\0.5\isFrictionInfinity\1)"
|
||||
R"(\bulletForceScale\0.5\explosiveForceScale\0.75)"
|
||||
R"(\piecesSpreadFraction\0.125\piecesUpwardVelocity\64)"
|
||||
R"(\canFloat\1\gravityScale\2)"
|
||||
R"(\massOffsetX\1\massOffsetY\2\massOffsetZ\3)"
|
||||
R"(\buoyancyMinX\3\buoyancyMinY\4\buoyancyMinZ\5)"
|
||||
R"(\buoyancyMaxX\6\buoyancyMaxY\7\buoyancyMaxZ\8)";
|
||||
|
||||
MockSearchPath loadingSearchPath;
|
||||
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
|
||||
|
||||
Zone loadingZone("LoadingZone", 0, GameId::T6, GamePlatform::PC);
|
||||
AssetCreatorCollection creatorCollection(loadingZone);
|
||||
IgnoredAssetLookup ignoredAssetLookup;
|
||||
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
|
||||
const auto loader = phys_preset::CreateRawLoaderT6(loadingZone.Memory(), loadingSearchPath, loadingZone);
|
||||
const auto result = loader->CreateAsset("test_phys_preset", loadingContext);
|
||||
|
||||
REQUIRE(result.HasBeenSuccessful());
|
||||
const auto* loadedAssetInfo = reinterpret_cast<XAssetInfo<PhysPreset>*>(result.GetAssetInfo());
|
||||
const auto* loadedPhysPreset = loadedAssetInfo->Asset();
|
||||
|
||||
REQUIRE(std::string(loadedPhysPreset->name) == "test_phys_preset");
|
||||
REQUIRE(loadedPhysPreset->mass == Approx(1.25f));
|
||||
REQUIRE(loadedPhysPreset->bounce == Approx(0.25f));
|
||||
REQUIRE(loadedPhysPreset->friction == Approx(PHYS_PRESET_MAX_FRICTION));
|
||||
REQUIRE(loadedPhysPreset->bulletForceScale == Approx(0.5f));
|
||||
REQUIRE(loadedPhysPreset->explosiveForceScale == Approx(0.75f));
|
||||
REQUIRE(loadedPhysPreset->piecesSpreadFraction == Approx(0.125f));
|
||||
REQUIRE(loadedPhysPreset->piecesUpwardVelocity == Approx(64.0f));
|
||||
REQUIRE(loadedPhysPreset->canFloat == 1);
|
||||
REQUIRE(loadedPhysPreset->gravityScale == Approx(2.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.x == Approx(1.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.y == Approx(2.0f));
|
||||
REQUIRE(loadedPhysPreset->centerOfMassOffset.z == Approx(3.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.x == Approx(3.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.y == Approx(4.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMin.z == Approx(5.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.x == Approx(6.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.y == Approx(7.0f));
|
||||
REQUIRE(loadedPhysPreset->buoyancyBoxMax.z == Approx(8.0f));
|
||||
}
|
||||
} // namespace
|
||||
Reference in New Issue
Block a user