Skip to content

Commit 22aaf3a

Browse files
committed
define shape before using it in supportPoints.jl
1 parent 8f33e9b commit 22aaf3a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/Composition/supportPoints.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ function supportPoint(obj::Composition.Object3D{F}, e::SVector{3,T})::SVector{3,
66
obj_R_abs = SMatrix{3,3,T,9}(obj.R_abs)
77

88
if shapeKind == Modia3D.SphereKind
9-
#sphere::Modia3D.Shapes.Sphere = obj.shape
10-
return Modia3D.supportPoint_Sphere(obj.shape, obj_r_abs, obj_R_abs, e)
9+
sphere::Modia3D.Shapes.Sphere{F} = obj.shape
10+
return Modia3D.supportPoint_Sphere(sphere, obj_r_abs, obj_R_abs, e)
1111
elseif shapeKind == Modia3D.EllipsoidKind
12-
#ellipsoid::Modia3D.Shapes.Ellipsoid = obj.shape
13-
return Modia3D.supportPoint_Ellipsoid(obj.shape, obj_r_abs, obj_R_abs, e)
12+
ellipsoid::Modia3D.Shapes.Ellipsoid{F} = obj.shape
13+
return Modia3D.supportPoint_Ellipsoid(ellipsoid, obj_r_abs, obj_R_abs, e)
1414
elseif shapeKind == Modia3D.BoxKind
15-
#box::Modia3D.Shapes.Box = obj.shape
16-
return Modia3D.supportPoint_Box(obj.shape, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
15+
box::Modia3D.Shapes.Box{F} = obj.shape
16+
return Modia3D.supportPoint_Box(box, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
1717
elseif shapeKind == Modia3D.CylinderKind
18-
#cylinder::Modia3D.Shapes.Cylinder = obj.shape
19-
return Modia3D.supportPoint_Cylinder(obj.shape, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
18+
cylinder::Modia3D.Shapes.Cylinder{F} = obj.shape
19+
return Modia3D.supportPoint_Cylinder(cylinder, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
2020
elseif shapeKind == Modia3D.ConeKind
21-
#cone::Modia3D.Shapes.Cone = obj.shape
22-
return Modia3D.supportPoint_Cone(obj.shape, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
21+
cone::Modia3D.Shapes.Cone{F} = obj.shape
22+
return Modia3D.supportPoint_Cone(cone, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
2323
elseif shapeKind == Modia3D.CapsuleKind
24-
#capsule::Modia3D.Shapes.Capsule = obj.shape
25-
return Modia3D.supportPoint_Capsule(obj.shape, obj_r_abs, obj_R_abs, e)
24+
capsule::Modia3D.Shapes.Capsule{F} = obj.shape
25+
return Modia3D.supportPoint_Capsule(capsule, obj_r_abs, obj_R_abs, e)
2626
elseif shapeKind == Modia3D.BeamKind
27-
#beam::Modia3D.Shapes.Beam = obj.shape
28-
return Modia3D.supportPoint_Beam(obj.shape, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
27+
beam::Modia3D.Shapes.Beam{F} = obj.shape
28+
return Modia3D.supportPoint_Beam(beam, obj_r_abs, obj_R_abs, e, collisionSmoothingRadius)
2929
elseif shapeKind == Modia3D.FileMeshKind
30-
#fileMesh::Modia3D.Shapes.FileMesh = obj.shape
31-
return Modia3D.supportPoint_FileMesh(obj.shape, obj_r_abs, obj_R_abs, e)
30+
fileMesh::Modia3D.Shapes.FileMesh = obj.shape
31+
return Modia3D.supportPoint_FileMesh(fileMesh, obj_r_abs, obj_R_abs, e)
3232
else
3333
error("not supported shape for support points")
3434
end

0 commit comments

Comments
 (0)