@bloomengine/engine 0.4.0 → 0.4.1

package/native/third_party/JoltPhysics/Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h

@@ -1,161 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
-#include <Jolt/Physics/Collision/Shape/ScaleHelpers.h>
-
-JPH_NAMESPACE_BEGIN
-
-class CollideShapeSettings;
-
-/// Class that constructs a RotatedTranslatedShape
-class JPH_EXPORT RotatedTranslatedShapeSettings final : public DecoratedShapeSettings
-{
-	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, RotatedTranslatedShapeSettings)
-
-public:
-	/// Constructor
-									RotatedTranslatedShapeSettings() = default;
-
-	/// Construct with shape settings, can be serialized.
-									RotatedTranslatedShapeSettings(Vec3Arg inPosition, QuatArg inRotation, const ShapeSettings *inShape) : DecoratedShapeSettings(inShape), mPosition(inPosition), mRotation(inRotation) { }
-
-	/// Variant that uses a concrete shape, which means this object cannot be serialized.
-									RotatedTranslatedShapeSettings(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape): DecoratedShapeSettings(inShape), mPosition(inPosition), mRotation(inRotation) { }
-
-	// See: ShapeSettings
-	virtual ShapeResult				Create() const override;
-
-	Vec3							mPosition;												///< Position of the sub shape
-	Quat							mRotation;												///< Rotation of the sub shape
-};
-
-/// A rotated translated shape will rotate and translate a child shape.
-/// Shifts the child object so that it is centered around the center of mass.
-class JPH_EXPORT RotatedTranslatedShape final : public DecoratedShape
-{
-public:
-	JPH_OVERRIDE_NEW_DELETE
-
-	/// Constructor
-									RotatedTranslatedShape() : DecoratedShape(EShapeSubType::RotatedTranslated) { }
-									RotatedTranslatedShape(const RotatedTranslatedShapeSettings &inSettings, ShapeResult &outResult);
-									RotatedTranslatedShape(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape);
-
-	/// Access the rotation that is applied to the inner shape
-	Quat							GetRotation() const										{ return mRotation; }
-
-	/// Access the translation that has been applied to the inner shape
-	Vec3							GetPosition() const										{ return mCenterOfMass - mRotation * mInnerShape->GetCenterOfMass(); }
-
-	// See Shape::GetCenterOfMass
-	virtual Vec3					GetCenterOfMass() const override						{ return mCenterOfMass; }
-
-	// See Shape::GetLocalBounds
-	virtual AABox					GetLocalBounds() const override;
-
-	// See Shape::GetWorldSpaceBounds
-	virtual AABox					GetWorldSpaceBounds(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale) const override;
-	using Shape::GetWorldSpaceBounds;
-
-	// See Shape::GetInnerRadius
-	virtual float					GetInnerRadius() const override							{ return mInnerShape->GetInnerRadius(); }
-
-	// See Shape::GetMassProperties
-	virtual MassProperties			GetMassProperties() const override;
-
-	// See Shape::GetSubShapeTransformedShape
-	virtual TransformedShape		GetSubShapeTransformedShape(const SubShapeID &inSubShapeID, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, SubShapeID &outRemainder) const override;
-
-	// See Shape::GetSurfaceNormal
-	virtual Vec3					GetSurfaceNormal(const SubShapeID &inSubShapeID, Vec3Arg inLocalSurfacePosition) const override;
-
-	// See Shape::GetSupportingFace
-	virtual void					GetSupportingFace(const SubShapeID &inSubShapeID, Vec3Arg inDirection, Vec3Arg inScale, Mat44Arg inCenterOfMassTransform, SupportingFace &outVertices) const override;
-
-	// See Shape::GetSubmergedVolume
-	virtual void					GetSubmergedVolume(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const Plane &inSurface, float &outTotalVolume, float &outSubmergedVolume, Vec3 &outCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, RVec3Arg inBaseOffset)) const override;
-
-#ifdef JPH_DEBUG_RENDERER
-	// See Shape::Draw
-	virtual void					Draw(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inUseMaterialColors, bool inDrawWireframe) const override;
-
-	// See Shape::DrawGetSupportFunction
-	virtual void					DrawGetSupportFunction(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inDrawSupportDirection) const override;
-
-	// See Shape::DrawGetSupportingFace
-	virtual void					DrawGetSupportingFace(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale) const override;
-#endif // JPH_DEBUG_RENDERER
-
-	// See Shape::CastRay
-	virtual bool					CastRay(const RayCast &inRay, const SubShapeIDCreator &inSubShapeIDCreator, RayCastResult &ioHit) const override;
-	virtual void					CastRay(const RayCast &inRay, const RayCastSettings &inRayCastSettings, const SubShapeIDCreator &inSubShapeIDCreator, CastRayCollector &ioCollector, const ShapeFilter &inShapeFilter = { }) const override;
-
-	// See: Shape::CollidePoint
-	virtual void					CollidePoint(Vec3Arg inPoint, const SubShapeIDCreator &inSubShapeIDCreator, CollidePointCollector &ioCollector, const ShapeFilter &inShapeFilter = { }) const override;
-
-	// See: Shape::CollideSoftBodyVertices
-	virtual void					CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const CollideSoftBodyVertexIterator &inVertices, uint inNumVertices, int inCollidingShapeIndex) const override;
-
-	// See Shape::CollectTransformedShapes
-	virtual void					CollectTransformedShapes(const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, const SubShapeIDCreator &inSubShapeIDCreator, TransformedShapeCollector &ioCollector, const ShapeFilter &inShapeFilter) const override;
-
-	// See Shape::TransformShape
-	virtual void					TransformShape(Mat44Arg inCenterOfMassTransform, TransformedShapeCollector &ioCollector) const override;
-
-	// See Shape::GetTrianglesStart
-	virtual void					GetTrianglesStart(GetTrianglesContext &ioContext, const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale) const override { JPH_ASSERT(false, "Cannot call on non-leaf shapes, use CollectTransformedShapes to collect the leaves first!"); }
-
-	// See Shape::GetTrianglesNext
-	virtual int						GetTrianglesNext(GetTrianglesContext &ioContext, int inMaxTrianglesRequested, Float3 *outTriangleVertices, const PhysicsMaterial **outMaterials = nullptr) const override { JPH_ASSERT(false, "Cannot call on non-leaf shapes, use CollectTransformedShapes to collect the leaves first!"); return 0; }
-
-	// See Shape
-	virtual void					SaveBinaryState(StreamOut &inStream) const override;
-
-	// See Shape::GetStats
-	virtual Stats					GetStats() const override								{ return Stats(sizeof(*this), 0); }
-
-	// See Shape::GetVolume
-	virtual float					GetVolume() const override								{ return mInnerShape->GetVolume(); }
-
-	// See Shape::IsValidScale
-	virtual bool					IsValidScale(Vec3Arg inScale) const override;
-
-	// See Shape::MakeScaleValid
-	virtual Vec3					MakeScaleValid(Vec3Arg inScale) const override;
-
-	/// Transform the scale to the local space of the child shape
-	inline Vec3						TransformScale(Vec3Arg inScale) const
-	{
-		// We don't need to transform uniform scale or if the rotation is identity
-		if (mIsRotationIdentity || ScaleHelpers::IsUniformScale(inScale))
-			return inScale;
-
-		return ScaleHelpers::RotateScale(mRotation, inScale);
-	}
-
-	// Register shape functions with the registry
-	static void						sRegister();
-
-protected:
-	// See: Shape::RestoreBinaryState
-	virtual void					RestoreBinaryState(StreamIn &inStream) override;
-
-private:
-	// Helper functions called by CollisionDispatch
-	static void						sCollideRotatedTranslatedVsShape(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
-	static void						sCollideShapeVsRotatedTranslated(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
-	static void						sCollideRotatedTranslatedVsRotatedTranslated(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
-	static void						sCastRotatedTranslatedVsShape(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector);
-	static void						sCastShapeVsRotatedTranslated(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector);
-	static void						sCastRotatedTranslatedVsRotatedTranslated(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector);
-
-	bool							mIsRotationIdentity;									///< If mRotation is close to identity (put here because it falls in padding bytes)
-	Vec3							mCenterOfMass;											///< Position of the center of mass
-	Quat							mRotation;												///< Rotation of the child shape
-};
-
-JPH_NAMESPACE_END

package/native/third_party/JoltPhysics/Jolt/Physics/Collision/Shape/ScaleHelpers.h

@@ -1,83 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/Physics/PhysicsSettings.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// Helper functions to get properties of a scaling vector
-namespace ScaleHelpers
-{
-	/// Minimum valid scale value. This is used to prevent division by zero when scaling a shape with a zero scale.
-	static constexpr float	cMinScale = 1.0e-6f;
-
-	/// The tolerance used to check if components of the scale vector are the same
-	static constexpr float	cScaleToleranceSq = 1.0e-8f;
-
-	/// Test if a scale is identity
-	inline bool				IsNotScaled(Vec3Arg inScale)									{ return inScale.IsClose(Vec3::sOne(), cScaleToleranceSq); }
-
-	/// Test if a scale is uniform
-	inline bool				IsUniformScale(Vec3Arg inScale)									{ return inScale.Swizzle<SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_X>().IsClose(inScale, cScaleToleranceSq); }
-
-	/// Test if a scale is uniform in XZ
-	inline bool				IsUniformScaleXZ(Vec3Arg inScale)								{ return inScale.Swizzle<SWIZZLE_Z, SWIZZLE_Y, SWIZZLE_X>().IsClose(inScale, ScaleHelpers::cScaleToleranceSq); }
-
-	/// Scale the convex radius of an object
-	inline float			ScaleConvexRadius(float inConvexRadius, Vec3Arg inScale)		{ return min(inConvexRadius * inScale.Abs().ReduceMin(), cDefaultConvexRadius); }
-
-	/// Test if a scale flips an object inside out (which requires flipping all normals and polygon windings)
-	inline bool				IsInsideOut(Vec3Arg inScale)									{ return (CountBits(Vec3::sLess(inScale, Vec3::sZero()).GetTrues() & 0x7) & 1) != 0; }
-
-	/// Test if any of the components of the scale have a value below cMinScale
-	inline bool				IsZeroScale(Vec3Arg inScale)									{ return Vec3::sLess(inScale.Abs(), Vec3::sReplicate(cMinScale)).TestAnyXYZTrue(); }
-
-	/// Ensure that the scale for each component is at least cMinScale
-	inline Vec3				MakeNonZeroScale(Vec3Arg inScale)								{ return inScale.GetSign() * Vec3::sMax(inScale.Abs(), Vec3::sReplicate(cMinScale)); }
-
-	/// Get the average scale if inScale, used to make the scale uniform when a shape doesn't support non-uniform scale
-	inline Vec3				MakeUniformScale(Vec3Arg inScale)								{ return Vec3::sReplicate((inScale.GetX() + inScale.GetY() + inScale.GetZ()) / 3.0f); }
-
-	/// Average the scale in XZ, used to make the scale uniform when a shape doesn't support non-uniform scale in the XZ plane
-	inline Vec3				MakeUniformScaleXZ(Vec3Arg inScale)								{ return 0.5f * (inScale + inScale.Swizzle<SWIZZLE_Z, SWIZZLE_Y, SWIZZLE_X>()); }
-
-	/// Checks in scale can be rotated to child shape
-	/// @param inRotation Rotation of child shape
-	/// @param inScale Scale in local space of parent shape
-	/// @return True if the scale is valid (no shearing introduced)
-	inline bool				CanScaleBeRotated(QuatArg inRotation, Vec3Arg inScale)
-	{
-		// inScale is a scale in local space of the shape, so the transform for the shape (ignoring translation) is: T = Mat44::sScale(inScale) * mRotation.
-		// when we pass the scale to the child it needs to be local to the child, so we want T = mRotation * Mat44::sScale(ChildScale).
-		// Solving for ChildScale: ChildScale = mRotation^-1 * Mat44::sScale(inScale) * mRotation = mRotation^T * Mat44::sScale(inScale) * mRotation
-		// If any of the off diagonal elements are non-zero, it means the scale / rotation is not compatible.
-		Mat44 r = Mat44::sRotation(inRotation);
-		Mat44 child_scale = r.Multiply3x3LeftTransposed(r.PostScaled(inScale));
-
-		// Get the columns, but zero the diagonal
-		Vec4 zero = Vec4::sZero();
-		Vec4 c0 = Vec4::sSelect(child_scale.GetColumn4(0), zero, UVec4(0xffffffff, 0, 0, 0)).Abs();
-		Vec4 c1 = Vec4::sSelect(child_scale.GetColumn4(1), zero, UVec4(0, 0xffffffff, 0, 0)).Abs();
-		Vec4 c2 = Vec4::sSelect(child_scale.GetColumn4(2), zero, UVec4(0, 0, 0xffffffff, 0)).Abs();
-
-		// Check if all elements are less than epsilon
-		Vec4 epsilon = Vec4::sReplicate(1.0e-6f);
-		return UVec4::sAnd(UVec4::sAnd(Vec4::sLess(c0, epsilon), Vec4::sLess(c1, epsilon)), Vec4::sLess(c2, epsilon)).TestAllTrue();
-	}
-
-	/// Adjust scale for rotated child shape
-	/// @param inRotation Rotation of child shape
-	/// @param inScale Scale in local space of parent shape
-	/// @return Rotated scale
-	inline Vec3				RotateScale(QuatArg inRotation, Vec3Arg inScale)
-	{
-		// Get the diagonal of mRotation^T * Mat44::sScale(inScale) * mRotation (see comment at CanScaleBeRotated)
-		Mat44 r = Mat44::sRotation(inRotation);
-		return r.Multiply3x3LeftTransposed(r.PostScaled(inScale)).GetDiagonal3();
-	}
-}
-
-JPH_NAMESPACE_END

package/native/third_party/JoltPhysics/Jolt/Physics/Collision/Shape/ScaledShape.cpp

@@ -1,238 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/Physics/Collision/Shape/ScaledShape.h>
-#include <Jolt/Physics/Collision/Shape/ScaleHelpers.h>
-#include <Jolt/Physics/Collision/RayCast.h>
-#include <Jolt/Physics/Collision/ShapeCast.h>
-#include <Jolt/Physics/Collision/TransformedShape.h>
-#include <Jolt/Physics/Collision/CollisionDispatch.h>
-#include <Jolt/ObjectStream/TypeDeclarations.h>
-#include <Jolt/Core/StreamIn.h>
-#include <Jolt/Core/StreamOut.h>
-
-JPH_NAMESPACE_BEGIN
-
-JPH_IMPLEMENT_SERIALIZABLE_VIRTUAL(ScaledShapeSettings)
-{
-	JPH_ADD_BASE_CLASS(ScaledShapeSettings, DecoratedShapeSettings)
-
-	JPH_ADD_ATTRIBUTE(ScaledShapeSettings, mScale)
-}
-
-ShapeSettings::ShapeResult ScaledShapeSettings::Create() const
-{
-	if (mCachedResult.IsEmpty())
-		Ref<Shape> shape = new ScaledShape(*this, mCachedResult);
-	return mCachedResult;
-}
-
-ScaledShape::ScaledShape(const ScaledShapeSettings &inSettings, ShapeResult &outResult) :
-	DecoratedShape(EShapeSubType::Scaled, inSettings, outResult),
-	mScale(inSettings.mScale)
-{
-	if (outResult.HasError())
-		return;
-
-	if (ScaleHelpers::IsZeroScale(inSettings.mScale))
-	{
-		outResult.SetError("Can't use zero scale!");
-		return;
-	}
-
-	outResult.Set(this);
-}
-
-MassProperties ScaledShape::GetMassProperties() const
-{
-	MassProperties p = mInnerShape->GetMassProperties();
-	p.Scale(mScale);
-	return p;
-}
-
-AABox ScaledShape::GetLocalBounds() const
-{
-	return mInnerShape->GetLocalBounds().Scaled(mScale);
-}
-
-AABox ScaledShape::GetWorldSpaceBounds(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale) const
-{
-	return mInnerShape->GetWorldSpaceBounds(inCenterOfMassTransform, inScale * mScale);
-}
-
-TransformedShape ScaledShape::GetSubShapeTransformedShape(const SubShapeID &inSubShapeID, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, SubShapeID &outRemainder) const
-{
-	// We don't use any bits in the sub shape ID
-	outRemainder = inSubShapeID;
-
-	TransformedShape ts(RVec3(inPositionCOM), inRotation, mInnerShape, BodyID());
-	ts.SetShapeScale(inScale * mScale);
-	return ts;
-}
-
-Vec3 ScaledShape::GetSurfaceNormal(const SubShapeID &inSubShapeID, Vec3Arg inLocalSurfacePosition) const
-{
-	// Transform the surface point to local space and pass the query on
-	Vec3 normal = mInnerShape->GetSurfaceNormal(inSubShapeID, inLocalSurfacePosition / mScale);
-
-	// Need to transform the plane normals using inScale
-	// Transforming a direction with matrix M is done through multiplying by (M^-1)^T
-	// In this case M is a diagonal matrix with the scale vector, so we need to multiply our normal by 1 / scale and renormalize afterwards
-	return (normal / mScale).Normalized();
-}
-
-void ScaledShape::GetSupportingFace(const SubShapeID &inSubShapeID, Vec3Arg inDirection, Vec3Arg inScale, Mat44Arg inCenterOfMassTransform, SupportingFace &outVertices) const
-{
-	mInnerShape->GetSupportingFace(inSubShapeID, inDirection, inScale * mScale, inCenterOfMassTransform, outVertices);
-}
-
-void ScaledShape::GetSubmergedVolume(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const Plane &inSurface, float &outTotalVolume, float &outSubmergedVolume, Vec3 &outCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, RVec3Arg inBaseOffset)) const
-{
-	mInnerShape->GetSubmergedVolume(inCenterOfMassTransform, inScale * mScale, inSurface, outTotalVolume, outSubmergedVolume, outCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, inBaseOffset));
-}
-
-#ifdef JPH_DEBUG_RENDERER
-void ScaledShape::Draw(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inUseMaterialColors, bool inDrawWireframe) const
-{
-	mInnerShape->Draw(inRenderer, inCenterOfMassTransform, inScale * mScale, inColor, inUseMaterialColors, inDrawWireframe);
-}
-
-void ScaledShape::DrawGetSupportFunction(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inDrawSupportDirection) const
-{
-	mInnerShape->DrawGetSupportFunction(inRenderer, inCenterOfMassTransform, inScale * mScale, inColor, inDrawSupportDirection);
-}
-
-void ScaledShape::DrawGetSupportingFace(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale) const
-{
-	mInnerShape->DrawGetSupportingFace(inRenderer, inCenterOfMassTransform, inScale * mScale);
-}
-#endif // JPH_DEBUG_RENDERER
-
-bool ScaledShape::CastRay(const RayCast &inRay, const SubShapeIDCreator &inSubShapeIDCreator, RayCastResult &ioHit) const
-{
-	Vec3 inv_scale = mScale.Reciprocal();
-	RayCast scaled_ray { inv_scale * inRay.mOrigin, inv_scale * inRay.mDirection };
-	return mInnerShape->CastRay(scaled_ray, inSubShapeIDCreator, ioHit);
-}
-
-void ScaledShape::CastRay(const RayCast &inRay, const RayCastSettings &inRayCastSettings, const SubShapeIDCreator &inSubShapeIDCreator, CastRayCollector &ioCollector, const ShapeFilter &inShapeFilter) const
-{
-	// Test shape filter
-	if (!inShapeFilter.ShouldCollide(this, inSubShapeIDCreator.GetID()))
-		return;
-
-	Vec3 inv_scale = mScale.Reciprocal();
-	RayCast scaled_ray { inv_scale * inRay.mOrigin, inv_scale * inRay.mDirection };
-	return mInnerShape->CastRay(scaled_ray, inRayCastSettings, inSubShapeIDCreator, ioCollector, inShapeFilter);
-}
-
-void ScaledShape::CollidePoint(Vec3Arg inPoint, const SubShapeIDCreator &inSubShapeIDCreator, CollidePointCollector &ioCollector, const ShapeFilter &inShapeFilter) const
-{
-	// Test shape filter
-	if (!inShapeFilter.ShouldCollide(this, inSubShapeIDCreator.GetID()))
-		return;
-
-	Vec3 inv_scale = mScale.Reciprocal();
-	mInnerShape->CollidePoint(inv_scale * inPoint, inSubShapeIDCreator, ioCollector, inShapeFilter);
-}
-
-void ScaledShape::CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const CollideSoftBodyVertexIterator &inVertices, uint inNumVertices, int inCollidingShapeIndex) const
-{
-	mInnerShape->CollideSoftBodyVertices(inCenterOfMassTransform, inScale * mScale, inVertices, inNumVertices, inCollidingShapeIndex);
-}
-
-void ScaledShape::CollectTransformedShapes(const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, const SubShapeIDCreator &inSubShapeIDCreator, TransformedShapeCollector &ioCollector, const ShapeFilter &inShapeFilter) const
-{
-	// Test shape filter
-	if (!inShapeFilter.ShouldCollide(this, inSubShapeIDCreator.GetID()))
-		return;
-
-	mInnerShape->CollectTransformedShapes(inBox, inPositionCOM, inRotation, inScale * mScale, inSubShapeIDCreator, ioCollector, inShapeFilter);
-}
-
-void ScaledShape::TransformShape(Mat44Arg inCenterOfMassTransform, TransformedShapeCollector &ioCollector) const
-{
-	mInnerShape->TransformShape(inCenterOfMassTransform * Mat44::sScale(mScale), ioCollector);
-}
-
-void ScaledShape::SaveBinaryState(StreamOut &inStream) const
-{
-	DecoratedShape::SaveBinaryState(inStream);
-
-	inStream.Write(mScale);
-}
-
-void ScaledShape::RestoreBinaryState(StreamIn &inStream)
-{
-	DecoratedShape::RestoreBinaryState(inStream);
-
-	inStream.Read(mScale);
-}
-
-float ScaledShape::GetVolume() const
-{
-	return abs(mScale.GetX() * mScale.GetY() * mScale.GetZ()) * mInnerShape->GetVolume();
-}
-
-bool ScaledShape::IsValidScale(Vec3Arg inScale) const
-{
-	return mInnerShape->IsValidScale(inScale * mScale);
-}
-
-Vec3 ScaledShape::MakeScaleValid(Vec3Arg inScale) const
-{
-	return mInnerShape->MakeScaleValid(mScale * inScale) / mScale;
-}
-
-void ScaledShape::sCollideScaledVsShape(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter)
-{
-	JPH_ASSERT(inShape1->GetSubType() == EShapeSubType::Scaled);
-	const ScaledShape *shape1 = static_cast<const ScaledShape *>(inShape1);
-
-	CollisionDispatch::sCollideShapeVsShape(shape1->GetInnerShape(), inShape2, inScale1 * shape1->GetScale(), inScale2, inCenterOfMassTransform1, inCenterOfMassTransform2, inSubShapeIDCreator1, inSubShapeIDCreator2, inCollideShapeSettings, ioCollector, inShapeFilter);
-}
-
-void ScaledShape::sCollideShapeVsScaled(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter)
-{
-	JPH_ASSERT(inShape2->GetSubType() == EShapeSubType::Scaled);
-	const ScaledShape *shape2 = static_cast<const ScaledShape *>(inShape2);
-
-	CollisionDispatch::sCollideShapeVsShape(inShape1, shape2->GetInnerShape(), inScale1, inScale2 * shape2->GetScale(), inCenterOfMassTransform1, inCenterOfMassTransform2, inSubShapeIDCreator1, inSubShapeIDCreator2, inCollideShapeSettings, ioCollector, inShapeFilter);
-}
-
-void ScaledShape::sCastScaledVsShape(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector)
-{
-	JPH_ASSERT(inShapeCast.mShape->GetSubType() == EShapeSubType::Scaled);
-	const ScaledShape *shape = static_cast<const ScaledShape *>(inShapeCast.mShape);
-
-	ShapeCast scaled_cast(shape->GetInnerShape(), inShapeCast.mScale * shape->GetScale(), inShapeCast.mCenterOfMassStart, inShapeCast.mDirection);
-	CollisionDispatch::sCastShapeVsShapeLocalSpace(scaled_cast, inShapeCastSettings, inShape, inScale, inShapeFilter, inCenterOfMassTransform2, inSubShapeIDCreator1, inSubShapeIDCreator2, ioCollector);
-}
-
-void ScaledShape::sCastShapeVsScaled(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector)
-{
-	JPH_ASSERT(inShape->GetSubType() == EShapeSubType::Scaled);
-	const ScaledShape *shape = static_cast<const ScaledShape *>(inShape);
-
-	CollisionDispatch::sCastShapeVsShapeLocalSpace(inShapeCast, inShapeCastSettings, shape->mInnerShape, inScale * shape->mScale, inShapeFilter, inCenterOfMassTransform2, inSubShapeIDCreator1, inSubShapeIDCreator2, ioCollector);
-}
-
-void ScaledShape::sRegister()
-{
-	ShapeFunctions &f = ShapeFunctions::sGet(EShapeSubType::Scaled);
-	f.mConstruct = []() -> Shape * { return new ScaledShape; };
-	f.mColor = Color::sYellow;
-
-	for (EShapeSubType s : sAllSubShapeTypes)
-	{
-		CollisionDispatch::sRegisterCollideShape(EShapeSubType::Scaled, s, sCollideScaledVsShape);
-		CollisionDispatch::sRegisterCollideShape(s, EShapeSubType::Scaled, sCollideShapeVsScaled);
-		CollisionDispatch::sRegisterCastShape(EShapeSubType::Scaled, s, sCastScaledVsShape);
-		CollisionDispatch::sRegisterCastShape(s, EShapeSubType::Scaled, sCastShapeVsScaled);
-	}
-}
-
-JPH_NAMESPACE_END

package/native/third_party/JoltPhysics/Jolt/Physics/Collision/Shape/ScaledShape.h

@@ -1,145 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
-#include <Jolt/Physics/Collision/Shape/ScaleHelpers.h>
-
-JPH_NAMESPACE_BEGIN
-
-class SubShapeIDCreator;
-class CollideShapeSettings;
-
-/// Class that constructs a ScaledShape
-class JPH_EXPORT ScaledShapeSettings final : public DecoratedShapeSettings
-{
-	JPH_DECLARE_SERIALIZABLE_VIRTUAL(JPH_EXPORT, ScaledShapeSettings)
-
-public:
-	/// Default constructor for deserialization
-									ScaledShapeSettings() = default;
-
-	/// Constructor that decorates another shape with a scale
-									ScaledShapeSettings(const ShapeSettings *inShape, Vec3Arg inScale) : DecoratedShapeSettings(inShape), mScale(inScale) { }
-
-	/// Variant that uses a concrete shape, which means this object cannot be serialized.
-									ScaledShapeSettings(const Shape *inShape, Vec3Arg inScale) : DecoratedShapeSettings(inShape), mScale(inScale) { }
-
-	// See: ShapeSettings
-	virtual ShapeResult				Create() const override;
-
-	Vec3							mScale = Vec3(1, 1, 1);
-};
-
-/// A shape that scales a child shape in local space of that shape. The scale can be non-uniform and can even turn it inside out when one or three components of the scale are negative.
-class JPH_EXPORT ScaledShape final : public DecoratedShape
-{
-public:
-	JPH_OVERRIDE_NEW_DELETE
-
-	/// Constructor
-									ScaledShape() : DecoratedShape(EShapeSubType::Scaled) { }
-									ScaledShape(const ScaledShapeSettings &inSettings, ShapeResult &outResult);
-
-	/// Constructor that decorates another shape with a scale
-									ScaledShape(const Shape *inShape, Vec3Arg inScale)		: DecoratedShape(EShapeSubType::Scaled, inShape), mScale(inScale) { JPH_ASSERT(!ScaleHelpers::IsZeroScale(mScale)); }
-
-	/// Get the scale
-	Vec3							GetScale() const										{ return mScale; }
-
-	// See Shape::GetCenterOfMass
-	virtual Vec3					GetCenterOfMass() const override						{ return mScale * mInnerShape->GetCenterOfMass(); }
-
-	// See Shape::GetLocalBounds
-	virtual AABox					GetLocalBounds() const override;
-
-	// See Shape::GetWorldSpaceBounds
-	virtual AABox					GetWorldSpaceBounds(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale) const override;
-	using Shape::GetWorldSpaceBounds;
-
-	// See Shape::GetInnerRadius
-	virtual float					GetInnerRadius() const override							{ return mScale.ReduceMin() * mInnerShape->GetInnerRadius(); }
-
-	// See Shape::GetMassProperties
-	virtual MassProperties			GetMassProperties() const override;
-
-	// See Shape::GetSubShapeTransformedShape
-	virtual TransformedShape		GetSubShapeTransformedShape(const SubShapeID &inSubShapeID, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, SubShapeID &outRemainder) const override;
-
-	// See Shape::GetSurfaceNormal
-	virtual Vec3					GetSurfaceNormal(const SubShapeID &inSubShapeID, Vec3Arg inLocalSurfacePosition) const override;
-
-	// See Shape::GetSupportingFace
-	virtual void					GetSupportingFace(const SubShapeID &inSubShapeID, Vec3Arg inDirection, Vec3Arg inScale, Mat44Arg inCenterOfMassTransform, SupportingFace &outVertices) const override;
-
-	// See Shape::GetSubmergedVolume
-	virtual void					GetSubmergedVolume(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const Plane &inSurface, float &outTotalVolume, float &outSubmergedVolume, Vec3 &outCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, RVec3Arg inBaseOffset)) const override;
-
-#ifdef JPH_DEBUG_RENDERER
-	// See Shape::Draw
-	virtual void					Draw(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inUseMaterialColors, bool inDrawWireframe) const override;
-
-	// See Shape::DrawGetSupportFunction
-	virtual void					DrawGetSupportFunction(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale, ColorArg inColor, bool inDrawSupportDirection) const override;
-
-	// See Shape::DrawGetSupportingFace
-	virtual void					DrawGetSupportingFace(DebugRenderer *inRenderer, RMat44Arg inCenterOfMassTransform, Vec3Arg inScale) const override;
-#endif // JPH_DEBUG_RENDERER
-
-	// See Shape::CastRay
-	virtual bool					CastRay(const RayCast &inRay, const SubShapeIDCreator &inSubShapeIDCreator, RayCastResult &ioHit) const override;
-	virtual void					CastRay(const RayCast &inRay, const RayCastSettings &inRayCastSettings, const SubShapeIDCreator &inSubShapeIDCreator, CastRayCollector &ioCollector, const ShapeFilter &inShapeFilter = { }) const override;
-
-	// See: Shape::CollidePoint
-	virtual void					CollidePoint(Vec3Arg inPoint, const SubShapeIDCreator &inSubShapeIDCreator, CollidePointCollector &ioCollector, const ShapeFilter &inShapeFilter = { }) const override;
-
-	// See: Shape::CollideSoftBodyVertices
-	virtual void					CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const CollideSoftBodyVertexIterator &inVertices, uint inNumVertices, int inCollidingShapeIndex) const override;
-
-	// See Shape::CollectTransformedShapes
-	virtual void					CollectTransformedShapes(const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale, const SubShapeIDCreator &inSubShapeIDCreator, TransformedShapeCollector &ioCollector, const ShapeFilter &inShapeFilter) const override;
-
-	// See Shape::TransformShape
-	virtual void					TransformShape(Mat44Arg inCenterOfMassTransform, TransformedShapeCollector &ioCollector) const override;
-
-	// See Shape::GetTrianglesStart
-	virtual void					GetTrianglesStart(GetTrianglesContext &ioContext, const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale) const override { JPH_ASSERT(false, "Cannot call on non-leaf shapes, use CollectTransformedShapes to collect the leaves first!"); }
-
-	// See Shape::GetTrianglesNext
-	virtual int						GetTrianglesNext(GetTrianglesContext &ioContext, int inMaxTrianglesRequested, Float3 *outTriangleVertices, const PhysicsMaterial **outMaterials = nullptr) const override { JPH_ASSERT(false, "Cannot call on non-leaf shapes, use CollectTransformedShapes to collect the leaves first!"); return 0; }
-
-	// See Shape
-	virtual void					SaveBinaryState(StreamOut &inStream) const override;
-
-	// See Shape::GetStats
-	virtual Stats					GetStats() const override								{ return Stats(sizeof(*this), 0); }
-
-	// See Shape::GetVolume
-	virtual float					GetVolume() const override;
-
-	// See Shape::IsValidScale
-	virtual bool					IsValidScale(Vec3Arg inScale) const override;
-
-	// See Shape::MakeScaleValid
-	virtual Vec3					MakeScaleValid(Vec3Arg inScale) const override;
-
-	// Register shape functions with the registry
-	static void						sRegister();
-
-protected:
-	// See: Shape::RestoreBinaryState
-	virtual void					RestoreBinaryState(StreamIn &inStream) override;
-
-private:
-	// Helper functions called by CollisionDispatch
-	static void						sCollideScaledVsShape(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
-	static void						sCollideShapeVsScaled(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
-	static void						sCastScaledVsShape(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector);
-	static void						sCastShapeVsScaled(const ShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, const Shape *inShape, Vec3Arg inScale, const ShapeFilter &inShapeFilter, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, CastShapeCollector &ioCollector);
-
-	Vec3							mScale = Vec3(1, 1, 1);
-};
-
-JPH_NAMESPACE_END