Made the use of 'public' consistent across all classes that use the JPH_DECLARE_SERIALIZABLE_... macros

Fixes #1297

Jolt/Core/LinearCurve.h

@@ -15,15 +15,15 @@ class StreamIn;
 // A set of points (x, y) that form a linear curve
 class JPH_EXPORT LinearCurve
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, LinearCurve)
 
+public:
 	/// A point on the curve
 	class Point
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, Point)
 
+	public:
 		float			mX = 0.0f;
 		float			mY = 0.0f;
 	};

Jolt/Physics/Body/BodyCreationSettings.h

@@ -29,9 +29,9 @@ enum class EOverrideMassProperties : uint8
 /// Settings for constructing a rigid body
 class JPH_EXPORT BodyCreationSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, BodyCreationSettings)
 
+public:
 	/// Constructor
 							BodyCreationSettings() = default;
 							BodyCreationSettings(const ShapeSettings *inShape, RVec3Arg inPosition, QuatArg inRotation, EMotionType inMotionType, ObjectLayer inObjectLayer) : mPosition(inPosition), mRotation(inRotation), mObjectLayer(inObjectLayer), mMotionType(inMotionType), mShape(inShape) { }

Jolt/Physics/Body/MassProperties.h

@@ -14,9 +14,9 @@ class StreamOut;
 /// Describes the mass and inertia properties of a body. Used during body construction only.
 class JPH_EXPORT MassProperties
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, MassProperties)
 
+public:
 	/// Using eigendecomposition, decompose the inertia tensor into a diagonal matrix D and a right-handed rotation matrix R so that the inertia tensor is \f$R \: D \: R^{-1}\f$.
 	/// @see https://en.wikipedia.org/wiki/Moment_of_inertia section 'Principal axes'
 	/// @param outRotation The rotation matrix R

Jolt/Physics/Collision/CollisionGroup.h

@@ -18,9 +18,9 @@ class StreamOut;
 /// - Or if there's no filter for the first object, the second group filter says the objects can collide
 class JPH_EXPORT CollisionGroup
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, CollisionGroup)
 
+public:
 	using GroupID			= uint32;
 	using SubGroupID		= uint32;
 

Jolt/Physics/Collision/GroupFilter.h

@@ -16,9 +16,9 @@ class StreamOut;
 /// Abstract class that checks if two CollisionGroups collide
 class JPH_EXPORT GroupFilter : public SerializableObject, public RefTarget<GroupFilter>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, GroupFilter)
 
+public:
 	/// Virtual destructor
 	virtual						~GroupFilter() override = default;
 

Jolt/Physics/Collision/PhysicsMaterial.h

@@ -21,9 +21,9 @@ class StreamOut;
 /// If you inherit from this material, don't forget to create a suitable default material in sDefault
 class JPH_EXPORT PhysicsMaterial : public SerializableObject, public RefTarget<PhysicsMaterial>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PhysicsMaterial)
 
+public:
 	/// Virtual destructor
 	virtual									~PhysicsMaterial() override = default;
 

Jolt/Physics/Collision/PhysicsMaterialSimple.h

@@ -11,9 +11,9 @@ JPH_NAMESPACE_BEGIN
 /// Sample implementation of PhysicsMaterial that just holds the needed properties directly
 class JPH_EXPORT PhysicsMaterialSimple : public PhysicsMaterial
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PhysicsMaterialSimple)
 
+public:
 	/// Constructor
 											PhysicsMaterialSimple() = default;
 											PhysicsMaterialSimple(const string_view &inName, ColorArg inColor) : mDebugName(inName), mDebugColor(inColor) { }

Jolt/Physics/Collision/Shape/BoxShape.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs a BoxShape
 class JPH_EXPORT BoxShapeSettings final : public ConvexShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, BoxShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							BoxShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/CapsuleShape.h

@@ -13,6 +13,7 @@ class JPH_EXPORT CapsuleShapeSettings final : public ConvexShapeSettings
 {
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, CapsuleShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							CapsuleShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/CompoundShape.h

@@ -16,9 +16,9 @@ class OrientedBox;
 /// Base class settings to construct a compound shape
 class JPH_EXPORT CompoundShapeSettings : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, CompoundShapeSettings)
 
+public:
 	/// Constructor. Use AddShape to add the parts.
 									CompoundShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/ConvexHullShape.h

@@ -16,9 +16,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs a ConvexHullShape
 class JPH_EXPORT ConvexHullShapeSettings final : public ConvexShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, ConvexHullShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							ConvexHullShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/ConvexShape.h

@@ -16,9 +16,9 @@ class CollideShapeSettings;
 /// Class that constructs a ConvexShape (abstract)
 class JPH_EXPORT ConvexShapeSettings : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, ConvexShapeSettings)
 
+public:
 	/// Constructor
 									ConvexShapeSettings() = default;
 	explicit						ConvexShapeSettings(const PhysicsMaterial *inMaterial)		: mMaterial(inMaterial) { }

Jolt/Physics/Collision/Shape/CylinderShape.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs a CylinderShape
 class JPH_EXPORT CylinderShapeSettings final : public ConvexShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, CylinderShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							CylinderShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/DecoratedShape.h

@@ -13,6 +13,7 @@ class JPH_EXPORT DecoratedShapeSettings : public ShapeSettings
 {
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, DecoratedShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 									DecoratedShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/EmptyShape.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs an EmptyShape
 class JPH_EXPORT EmptyShapeSettings final : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, EmptyShapeSettings)
 
+public:
 							EmptyShapeSettings() = default;
 	explicit				EmptyShapeSettings(Vec3Arg inCenterOfMass) : mCenterOfMass(inCenterOfMass) { }
 

Jolt/Physics/Collision/Shape/HeightFieldShape.h

@@ -38,9 +38,9 @@ namespace HeightFieldShapeConstants
 /// Class that constructs a HeightFieldShape
 class JPH_EXPORT HeightFieldShapeSettings final : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, HeightFieldShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 									HeightFieldShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/MeshShape.h

@@ -21,9 +21,9 @@ class CollideShapeSettings;
 /// Class that constructs a MeshShape
 class JPH_EXPORT MeshShapeSettings final : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, MeshShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 									MeshShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/MutableCompoundShape.h

@@ -13,9 +13,9 @@ class CollideShapeSettings;
 /// Class that constructs a MutableCompoundShape.
 class JPH_EXPORT MutableCompoundShapeSettings final : public CompoundShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, MutableCompoundShapeSettings)
 
+public:
 	// See: ShapeSettings
 	virtual ShapeResult				Create() const override;
 };

Jolt/Physics/Collision/Shape/OffsetCenterOfMassShape.h

@@ -13,9 +13,9 @@ class CollideShapeSettings;
 /// Class that constructs an OffsetCenterOfMassShape
 class JPH_EXPORT OffsetCenterOfMassShapeSettings final : public DecoratedShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, OffsetCenterOfMassShapeSettings)
 
+public:
 	/// Constructor
 									OffsetCenterOfMassShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/PlaneShape.h

@@ -15,9 +15,9 @@ class CollideShapeSettings;
 /// Class that constructs a PlaneShape
 class JPH_EXPORT PlaneShapeSettings final : public ShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PlaneShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 									PlaneShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h

@@ -14,9 +14,9 @@ class CollideShapeSettings;
 /// Class that constructs a RotatedTranslatedShape
 class JPH_EXPORT RotatedTranslatedShapeSettings final : public DecoratedShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, RotatedTranslatedShapeSettings)
 
+public:
 	/// Constructor
 									RotatedTranslatedShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/ScaledShape.h

@@ -17,6 +17,7 @@ class JPH_EXPORT ScaledShapeSettings final : public DecoratedShapeSettings
 {
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, ScaledShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 									ScaledShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/Shape.h

@@ -145,9 +145,9 @@ static_assert(size(sSubShapeTypeNames) == NumSubShapeTypes);
 /// data.
 class JPH_EXPORT ShapeSettings : public SerializableObject, public RefTarget<ShapeSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, ShapeSettings)
 
+public:
 	using ShapeResult = Result<Ref<Shape>>;
 
 	/// Create a shape according to the settings specified by this object.

Jolt/Physics/Collision/Shape/SphereShape.h

@@ -11,9 +11,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs a SphereShape
 class JPH_EXPORT SphereShapeSettings final : public ConvexShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, SphereShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							SphereShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/StaticCompoundShape.h

@@ -16,9 +16,9 @@ class TempAllocator;
 /// Class that constructs a StaticCompoundShape. Note that if you only want a compound of 1 shape, use a RotatedTranslatedShape instead.
 class JPH_EXPORT StaticCompoundShapeSettings final : public CompoundShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, StaticCompoundShapeSettings)
 
+public:
 	// See: ShapeSettings
 	virtual ShapeResult				Create() const override;
 

Jolt/Physics/Collision/Shape/TaperedCapsuleShape.h

@@ -16,6 +16,7 @@ class JPH_EXPORT TaperedCapsuleShapeSettings final : public ConvexShapeSettings
 {
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, TaperedCapsuleShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							TaperedCapsuleShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/TaperedCylinderShape.h

@@ -14,6 +14,7 @@ class JPH_EXPORT TaperedCylinderShapeSettings final : public ConvexShapeSettings
 {
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, TaperedCylinderShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							TaperedCylinderShapeSettings() = default;
 

Jolt/Physics/Collision/Shape/TriangleShape.h

@@ -11,9 +11,9 @@ JPH_NAMESPACE_BEGIN
 /// Class that constructs a TriangleShape
 class JPH_EXPORT TriangleShapeSettings final : public ConvexShapeSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, TriangleShapeSettings)
 
+public:
 	/// Default constructor for deserialization
 							TriangleShapeSettings() = default;
 

Jolt/Physics/Constraints/ConeConstraint.h

@@ -13,9 +13,9 @@ JPH_NAMESPACE_BEGIN
 /// Cone constraint settings, used to create a cone constraint
 class JPH_EXPORT ConeConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, ConeConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/Constraint.h

@@ -63,9 +63,9 @@ enum class EConstraintSpace
 /// Class used to store the configuration of a constraint. Allows run-time creation of constraints.
 class JPH_EXPORT ConstraintSettings : public SerializableObject, public RefTarget<ConstraintSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, ConstraintSettings)
 
+public:
 	using ConstraintResult = Result<Ref<ConstraintSettings>>;
 
 	/// Saves the contents of the constraint settings in binary form to inStream.

Jolt/Physics/Constraints/DistanceConstraint.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Distance constraint settings, used to create a distance constraint
 class JPH_EXPORT DistanceConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, DistanceConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/FixedConstraint.h

@@ -13,9 +13,9 @@ JPH_NAMESPACE_BEGIN
 /// Fixed constraint settings, used to create a fixed constraint
 class JPH_EXPORT FixedConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, FixedConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/GearConstraint.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Gear constraint settings
 class JPH_EXPORT GearConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, GearConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/HingeConstraint.h

@@ -15,9 +15,9 @@ JPH_NAMESPACE_BEGIN
 /// Hinge constraint settings, used to create a hinge constraint
 class JPH_EXPORT HingeConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, HingeConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/MotorSettings.h

@@ -24,9 +24,9 @@ enum class EMotorState
 /// See the main page of the API documentation for more information on how to configure a motor.
 class JPH_EXPORT MotorSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, MotorSettings)
 
+public:
 	/// Constructor
 							MotorSettings() = default;
 							MotorSettings(const MotorSettings &) = default;

Jolt/Physics/Constraints/PathConstraint.h

@@ -35,9 +35,9 @@ enum class EPathRotationConstraintType
 /// The reason for all this is that the constraint acts like a slider constraint with the sliding axis being the tangent vector (the assumption here is that delta time will be small enough so that the path is linear for that delta time).
 class JPH_EXPORT PathConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PathConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void					SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/PathConstraintPath.h

@@ -19,9 +19,9 @@ class DebugRenderer;
 /// The path for a path constraint. It allows attaching two bodies to each other while giving the second body the freedom to move along a path relative to the first.
 class JPH_EXPORT PathConstraintPath : public SerializableObject, public RefTarget<PathConstraintPath>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, PathConstraintPath)
 
+public:
 	using PathResult = Result<Ref<PathConstraintPath>>;
 
 	/// Virtual destructor to ensure that derived types get their destructors called

Jolt/Physics/Constraints/PathConstraintPathHermite.h

@@ -11,9 +11,9 @@ JPH_NAMESPACE_BEGIN
 /// A path that follows a Hermite spline
 class JPH_EXPORT PathConstraintPathHermite final : public PathConstraintPath
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PathConstraintPathHermite)
 
+public:
 	// See PathConstraintPath::GetPathMaxFraction
 	virtual float		GetPathMaxFraction() const override									{ return float(IsLooping()? mPoints.size() : mPoints.size() - 1); }
 

Jolt/Physics/Constraints/PointConstraint.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Point constraint settings, used to create a point constraint
 class JPH_EXPORT PointConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PointConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/PulleyConstraint.h

@@ -17,9 +17,9 @@ JPH_NAMESPACE_BEGIN
 /// MinDistance <= Length1 + Ratio * Length2 <= MaxDistance
 class JPH_EXPORT PulleyConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, PulleyConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/RackAndPinionConstraint.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Rack and pinion constraint (slider & gear) settings
 class JPH_EXPORT RackAndPinionConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, RackAndPinionConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/SixDOFConstraint.h

@@ -17,9 +17,9 @@ JPH_NAMESPACE_BEGIN
 /// 6 Degree Of Freedom Constraint setup structure. Allows control over each of the 6 degrees of freedom.
 class JPH_EXPORT SixDOFConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, SixDOFConstraintSettings)
 
+public:
 	/// Constraint is split up into translation/rotation around X, Y and Z axis.
 	enum EAxis
 	{

Jolt/Physics/Constraints/SliderConstraint.h

@@ -15,9 +15,9 @@ JPH_NAMESPACE_BEGIN
 /// Slider constraint settings, used to create a slider constraint
 class JPH_EXPORT SliderConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, SliderConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/SpringSettings.h

@@ -21,9 +21,9 @@ enum class ESpringMode : uint8
 /// Settings for a linear or angular spring
 class JPH_EXPORT SpringSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, SpringSettings)
 
+public:
 	/// Constructor
 								SpringSettings() = default;
 								SpringSettings(const SpringSettings &) = default;

Jolt/Physics/Constraints/SwingTwistConstraint.h

@@ -19,9 +19,9 @@ JPH_NAMESPACE_BEGIN
 /// @image html Docs/SwingTwistConstraint.png
 class JPH_EXPORT SwingTwistConstraintSettings final : public TwoBodyConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, SwingTwistConstraintSettings)
 
+public:
 	// See: ConstraintSettings::SaveBinaryState
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Constraints/TwoBodyConstraint.h

@@ -14,9 +14,9 @@ class TwoBodyConstraint;
 /// Base class for settings for all constraints that involve 2 bodies
 class JPH_EXPORT TwoBodyConstraintSettings : public ConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, TwoBodyConstraintSettings)
 
+public:
 	/// Create an instance of this constraint
 	/// You can use Body::sFixedToWorld for inBody1 if you want to attach inBody2 to the world
 	virtual TwoBodyConstraint *	Create(Body &inBody1, Body &inBody2) const = 0;

Jolt/Physics/PhysicsScene.h

@@ -16,9 +16,9 @@ class PhysicsSystem;
 /// Contains the creation settings of a set of bodies
 class JPH_EXPORT PhysicsScene : public RefTarget<PhysicsScene>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, PhysicsScene)
 
+public:
 	/// Add a body to the scene
 	void									AddBody(const BodyCreationSettings &inBody);
 
@@ -44,9 +44,9 @@ public:
 	/// A constraint and how it is connected to the bodies in the scene
 	class ConnectedConstraint
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, ConnectedConstraint)
 
+	public:
 											ConnectedConstraint() = default;
 											ConnectedConstraint(const TwoBodyConstraintSettings *inSettings, uint inBody1, uint inBody2) : mSettings(inSettings), mBody1(inBody1), mBody2(inBody2) { }
 

Jolt/Physics/Ragdoll/Ragdoll.h

@@ -20,9 +20,9 @@ class PhysicsSystem;
 /// Contains the structure of a ragdoll
 class JPH_EXPORT RagdollSettings : public RefTarget<RagdollSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, RagdollSettings)
 
+public:
 	/// Stabilize the constraints of the ragdoll
 	/// @return True on success, false on failure.
 	bool								Stabilize();
@@ -84,9 +84,9 @@ public:
 	/// A single rigid body sub part of the ragdoll
 	class Part : public BodyCreationSettings
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, Part)
 
+	public:
 		Ref<TwoBodyConstraintSettings>	mToParent;
 	};
 
@@ -96,9 +96,9 @@ public:
 	/// A constraint that connects two bodies in a ragdoll (for non parent child related constraints)
 	class AdditionalConstraint
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, AdditionalConstraint)
 
+	public:
 		/// Constructors
 										AdditionalConstraint() = default;
 										AdditionalConstraint(int inBodyIdx1, int inBodyIdx2, TwoBodyConstraintSettings *inConstraint) : mBodyIdx { inBodyIdx1, inBodyIdx2 }, mConstraint(inConstraint) { }

Jolt/Physics/SoftBody/SoftBodyCreationSettings.h

@@ -16,9 +16,9 @@ JPH_NAMESPACE_BEGIN
 /// Note: Soft bodies are still in development and come with several caveats. Read the Architecture and API documentation for more information!
 class JPH_EXPORT SoftBodyCreationSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, SoftBodyCreationSettings)
 
+public:
 	/// Constructor
 						SoftBodyCreationSettings() = default;
 						SoftBodyCreationSettings(const SoftBodySharedSettings *inSettings, RVec3Arg inPosition, QuatArg inRotation, ObjectLayer inObjectLayer) : mSettings(inSettings), mPosition(inPosition), mRotation(inRotation), mObjectLayer(inObjectLayer) { }

Jolt/Physics/SoftBody/SoftBodySharedSettings.h

@@ -14,9 +14,9 @@ JPH_NAMESPACE_BEGIN
 /// It is used during the simulation and can be shared between multiple soft bodies.
 class JPH_EXPORT SoftBodySharedSettings : public RefTarget<SoftBodySharedSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, SoftBodySharedSettings)
 
+public:
 	/// Which type of bend constraint should be created
 	enum class EBendType
 	{

Jolt/Physics/Vehicle/MotorcycleController.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 /// Note: The motor cycle controller is still in development and may need a lot of tweaks/hacks to work properly!
 class JPH_EXPORT MotorcycleControllerSettings : public WheeledVehicleControllerSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, MotorcycleControllerSettings)
 
+public:
 	// See: VehicleControllerSettings
 	virtual VehicleController *	ConstructController(VehicleConstraint &inConstraint) const override;
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;

Jolt/Physics/Vehicle/TrackedVehicleController.h

@@ -17,9 +17,9 @@ class PhysicsSystem;
 /// WheelSettings object specifically for TrackedVehicleController
 class JPH_EXPORT WheelSettingsTV : public WheelSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, WheelSettingsTV)
 
+public:
 	// See: WheelSettings
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 	virtual void				RestoreBinaryState(StreamIn &inStream) override;
@@ -58,9 +58,9 @@ public:
 /// Note to avoid issues with very heavy objects vs very light objects the mass of the tank should be a lot lower (say 10x) than that of a real tank. That means that the engine/brake torque is also 10x less.
 class JPH_EXPORT TrackedVehicleControllerSettings : public VehicleControllerSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, TrackedVehicleControllerSettings)
 
+public:
 	// Constructor
 								TrackedVehicleControllerSettings();
 

Jolt/Physics/Vehicle/VehicleAntiRollBar.h

@@ -14,9 +14,9 @@ JPH_NAMESPACE_BEGIN
 /// See: https://en.wikipedia.org/wiki/Anti-roll_bar
 class JPH_EXPORT VehicleAntiRollBar
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, VehicleAntiRollBar)
 
+public:
 	/// Saves the contents in binary form to inStream.
 	void					SaveBinaryState(StreamOut &inStream) const;
 

Jolt/Physics/Vehicle/VehicleConstraint.h

@@ -22,9 +22,9 @@ class PhysicsSystem;
 /// See: https://www.asawicki.info/Mirror/Car%20Physics%20for%20Games/Car%20Physics%20for%20Games.html
 class JPH_EXPORT VehicleConstraintSettings : public ConstraintSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, VehicleConstraintSettings)
 
+public:
 	/// Saves the contents of the constraint settings in binary form to inStream.
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;
 

Jolt/Physics/Vehicle/VehicleController.h

@@ -23,9 +23,9 @@ class StateRecorder;
 /// Basic settings object for interface that controls acceleration / deceleration of the vehicle
 class JPH_EXPORT VehicleControllerSettings : public SerializableObject, public RefTarget<VehicleControllerSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_ABSTRACT(JPH_EXPORT, VehicleControllerSettings)
 
+public:
 	/// Saves the contents of the controller settings in binary form to inStream.
 	virtual void				SaveBinaryState(StreamOut &inStream) const = 0;
 

Jolt/Physics/Vehicle/VehicleDifferential.h

@@ -12,9 +12,9 @@ JPH_NAMESPACE_BEGIN
 
 class JPH_EXPORT VehicleDifferentialSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, VehicleDifferentialSettings)
 
+public:
 	/// Saves the contents in binary form to inStream.
 	void					SaveBinaryState(StreamOut &inStream) const;
 

Jolt/Physics/Vehicle/VehicleEngine.h

@@ -19,9 +19,9 @@ JPH_NAMESPACE_BEGIN
 /// Generic properties for a vehicle engine
 class JPH_EXPORT VehicleEngineSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, VehicleEngineSettings)
 
+public:
 	/// Constructor
 							VehicleEngineSettings();
 

Jolt/Physics/Vehicle/VehicleTrack.h

@@ -23,9 +23,9 @@ enum class ETrackSide : uint
 /// Generic properties for tank tracks
 class JPH_EXPORT VehicleTrackSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, VehicleTrackSettings)
 
+public:
 	/// Saves the contents in binary form to inStream.
 	void					SaveBinaryState(StreamOut &inStream) const;
 

Jolt/Physics/Vehicle/VehicleTransmission.h

@@ -21,9 +21,9 @@ enum class ETransmissionMode : uint8
 /// Configuration for the transmission of a vehicle (gear box)
 class JPH_EXPORT VehicleTransmissionSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, VehicleTransmissionSettings)
 
+public:
 	/// Saves the contents in binary form to inStream.
 	void					SaveBinaryState(StreamOut &inStream) const;
 

Jolt/Physics/Vehicle/Wheel.h

@@ -17,9 +17,9 @@ class VehicleConstraint;
 /// Base class for wheel settings, each VehicleController can implement a derived class of this
 class JPH_EXPORT WheelSettings : public SerializableObject, public RefTarget<WheelSettings>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, WheelSettings)
 
+public:
 	/// Saves the contents in binary form to inStream.
 	virtual void			SaveBinaryState(StreamOut &inStream) const;
 

Jolt/Physics/Vehicle/WheeledVehicleController.h

@@ -18,9 +18,9 @@ class PhysicsSystem;
 /// WheelSettings object specifically for WheeledVehicleController
 class JPH_EXPORT WheelSettingsWV : public WheelSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, WheelSettingsWV)
 
+public:
 	/// Constructor
 								WheelSettingsWV();
 
@@ -71,9 +71,9 @@ public:
 /// See: https://www.asawicki.info/Mirror/Car%20Physics%20for%20Games/Car%20Physics%20for%20Games.html
 class JPH_EXPORT WheeledVehicleControllerSettings : public VehicleControllerSettings
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, WheeledVehicleControllerSettings)
 
+public:
 	// See: VehicleControllerSettings
 	virtual VehicleController *	ConstructController(VehicleConstraint &inConstraint) const override;
 	virtual void				SaveBinaryState(StreamOut &inStream) const override;

Jolt/Skeleton/SkeletalAnimation.h

@@ -14,15 +14,15 @@ class SkeletonPose;
 /// Resource for a skinned animation
 class JPH_EXPORT SkeletalAnimation : public RefTarget<SkeletalAnimation>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, SkeletalAnimation)
 
+public:
 	/// Contains the current state of a joint, a local space transformation relative to its parent joint
 	class JointState
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, JointState)
 
+	public:
 		/// Convert from a local space matrix
 		void							FromMatrix(Mat44Arg inMatrix);
 
@@ -36,9 +36,9 @@ public:
 	/// Contains the state of a single joint at a particular time
 	class Keyframe : public JointState
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, Keyframe)
 
+	public:
 		float							mTime = 0.0f;										///< Time of keyframe in seconds
 	};
 
@@ -47,9 +47,9 @@ public:
 	/// Contains the animation for a single joint
 	class AnimatedJoint
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, AnimatedJoint)
 
+	public:
 		String							mJointName;											///< Name of the joint
 		KeyframeVector					mKeyframes;											///< List of keyframes over time
 	};

Jolt/Skeleton/Skeleton.h

@@ -16,17 +16,17 @@ class StreamOut;
 /// Resource that contains the joint hierarchy for a skeleton
 class JPH_EXPORT Skeleton : public RefTarget<Skeleton>
 {
-public:
 	JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, Skeleton)
 
+public:
 	using SkeletonResult = Result<Ref<Skeleton>>;
 
 	/// Declare internal structure for a joint
 	class Joint
 	{
-	public:
 		JPH_DECLARE_SERIALIZABLE_NON_VIRTUAL(JPH_EXPORT, Joint)
 
+	public:
 							Joint() = default;
 							Joint(const string_view &inName, const string_view &inParentName, int inParentJointIndex) : mName(inName), mParentName(inParentName), mParentJointIndex(inParentJointIndex) { }