From 170e73969a2545e2f150639ccbc425053c39dbcc Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Tue, 18 Sep 2018 19:15:19 +0800 Subject: [PATCH] constraint: fix Perpendicular constraint Fixes #119 --- constraint.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/constraint.py b/constraint.py index a07e0a0..6ed022a 100644 --- a/constraint.py +++ b/constraint.py @@ -1141,15 +1141,16 @@ class Perpendicular(Base): def prepare(cls,obj,solver): system = solver.system e1,e2 = cls.getEntities(obj,solver)[:2] - isPlane = isinstance(e1,list),isinstance(e2,list) + isPlane = isinstance(e1,PlaneInfo),isinstance(e2,PlaneInfo) if all(isPlane): - ret = system.addPerpendicular(e1[2],e2[2],group=solver.group) + ret = system.addPerpendicular( + e1.normal.entity,e2.normal.entity,group=solver.group) elif not any(isPlane): ret = system.addPerpendicular(e1,e2,group=solver.group) elif isPlane[0]: - ret = system.addParallel(e1[2],e2,group=solver.group) + ret = system.addParallel(e1.normal.entity,e2,group=solver.group) else: - ret = system.addParallel(e1,e2[2],group=solver.group) + ret = system.addParallel(e1,e2.normal.entity,group=solver.group) return ret