Added PlaneShape::GetMaterial/SetMaterial

See: godotengine/godot#100748
jrouwe · Dec 29, 2024 · 18bb698 · 18bb698
1 parent 2a28ecc
commit 18bb698
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Jolt/Physics/Collision/Shape/PlaneShape.h b/Jolt/Physics/Collision/Shape/PlaneShape.h
@@ -71,7 +71,7 @@ class JPH_EXPORT PlaneShape final : public Shape
 	virtual MassProperties			GetMassProperties() const override;
 
 	// See Shape::GetMaterial
-	virtual const PhysicsMaterial *	GetMaterial(const SubShapeID &inSubShapeID) const override	{ JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return mMaterial != nullptr? mMaterial : PhysicsMaterial::sDefault; }
+	virtual const PhysicsMaterial *	GetMaterial(const SubShapeID &inSubShapeID) const override	{ JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return GetMaterial(); }
 
 	// See Shape::GetSurfaceNormal
 	virtual Vec3					GetSurfaceNormal(const SubShapeID &inSubShapeID, Vec3Arg inLocalSurfacePosition) const override { JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return mPlane.GetNormal(); }
@@ -114,6 +114,10 @@ class JPH_EXPORT PlaneShape final : public Shape
 	// See Shape::GetVolume
 	virtual float					GetVolume() const override									{ return 0; }
 
+	/// Material of the shape
+	void							SetMaterial(const PhysicsMaterial *inMaterial)				{ mMaterial = inMaterial; }
+	const PhysicsMaterial *			GetMaterial() const											{ return mMaterial != nullptr? mMaterial : PhysicsMaterial::sDefault; }
+
 	// Register shape functions with the registry
 	static void						sRegister();