caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the point-on-circle constraints work on the infinite cylinder,

Browse Source 
not the sphere; that's more logical behaviour out of plane.

[git-p4: depot-paths = "//depot/solvespace/": change = 1803]
This commit is contained in:
Jonathan Westhues 2008-06-21 23:32:50 -08:00
parent a5189f7f1a
commit fe75efc6aa
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
constraint.cpp
View File

@ -710,10 +710,21 @@ void Constraint::GenerateReal(IdList<Equation,hEquation> *l) {
break;
case PT_ON_CIRCLE: {
// This actually constrains the point to lie on the cylinder.
Entity *circle = SS.GetEntity(entityA);
hEntity center = circle->point[0];
Expr *radius = circle->CircleGetRadiusExpr();
AddEq(l, Distance(workplane, ptA, center)->Minus(radius), 0);
ExprVector center = SS.GetEntity(circle->point[0])->PointGetExprs();
ExprVector pt = SS.GetEntity(ptA)->PointGetExprs();
Entity *normal = SS.GetEntity(circle->normal);
ExprVector u = normal->NormalExprsU(),
v = normal->NormalExprsV();
Expr *du = (center.Minus(pt)).Dot(u),
*dv = (center.Minus(pt)).Dot(v);
Expr *r = circle->CircleGetRadiusExpr();
AddEq(l,
((du->Square())->Plus(dv->Square()))->Minus(r->Square()), 0);
break;
}