GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor PhysicalMaterial to use API bindings

Browse Source
This commit is contained in:
Wojtek Figat
2020-12-21 15:39:14 +01:00
parent 41b938b3cd
commit 7798a7f6d5
7 changed files with 24 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Physics/PhysicalMaterial.cpp
View File

@@ -2,7 +2,6 @@
#include "PhysicalMaterial.h"
#include "PhysicsSettings.h"
#include "Engine/Serialization/JsonTools.h"
#include "Physics.h"
#include <ThirdParty/PhysX/PxPhysics.h>
#include <ThirdParty/PhysX/PxMaterial.h>
@@ -51,18 +50,3 @@ void PhysicalMaterial::UpdatePhysXMaterial()
_material->setRestitutionCombineMode(static_cast<PxCombineMode::Enum>(useRestitutionCombineMode));
}
}
void PhysicalMaterial::Serialize(SerializeStream& stream, const void* otherObj)
{
MISSING_CODE("PhysicalMaterial::Serialize is not implemented");
}
void PhysicalMaterial::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
{
Friction = JsonTools::GetFloat(stream, "Friction", PhysicalMaterial_Friction);
FrictionCombineMode = JsonTools::GetEnum(stream, "FrictionCombineMode", PhysicalMaterial_FrictionCombineMode);
OverrideFrictionCombineMode = JsonTools::GetBool(stream, "OverrideFrictionCombineMode", PhysicalMaterial_OverrideFrictionCombineMode);
Restitution = JsonTools::GetFloat(stream, "Restitution", PhysicalMaterial_Restitution);
RestitutionCombineMode = JsonTools::GetEnum(stream, "RestitutionCombineMode", PhysicalMaterial_RestitutionCombineMode);
OverrideRestitutionCombineMode = JsonTools::GetBool(stream, "OverrideRestitutionCombineMode", PhysicalMaterial_OverrideRestitutionCombineMode);
}