Skip to content

WIP: create arc entities from revolved points. The direction of the arcs d… #1631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: create arc entities from revolved points. The direction of the arcs d… #1631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions src/group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,15 @@ void Group::Generate(EntityList *entity, ParamList *param)
h.param(1), h.param(2), h.param(3), h.param(4), h.param(5),
h.param(6), NO_PARAM, CopyAs::N_ROT_AA);

// Arcs are not generated for revolve groups, for now, because our current arc
// entity is not chiral, and dragging a revolve may break the arc by inverting it.
// MakeLatheCircles(entity, param, he, axis_pos, axis_dir);
e = &(entity->Get(i)); // because we copied.
if (e->IsPoint()) {
// for points this copy is used for the circle centers
CopyEntity(entity, e, 0, REMAP_LATHE_ARC_CENTER,
NO_PARAM, NO_PARAM, NO_PARAM,
NO_PARAM, NO_PARAM, NO_PARAM, NO_PARAM, NO_PARAM,
CopyAs::NUMERIC);
MakeLatheCircles(entity, param, he, axis_pos, axis_dir);
};
MakeLatheSurfacesSelectable(entity, he, axis_dir);
}
MakeRevolveEndFaces(entity, pt, ai, af);
Expand Down Expand Up @@ -918,8 +924,17 @@ void Group::MakeLatheCircles(EntityList *el, ParamList *param, hEntity in, Vecto
// A point gets revolved to form an arc.
en.point[0] = Remap(ep->h, REMAP_LATHE_ARC_CENTER);
en.point[1] = Remap(ep->h, REMAP_LATHE_START);
en.point[2] = en.point[1]; //Remap(ep->h, REMAP_LATHE_END);

if(type == Type::LATHE) {
en.point[2] = en.point[1];
} else {
en.point[2] = Remap(ep->h, REMAP_LATHE_END);
// when rotating the other way we need to swap start and end points
// if (SK.GetParam(h.param(3))->val < 0.0)
// {
// swap(en.point[1], en.point[2]);
// }
}

// Get arc center and point on arc.
Entity *pc = SK.GetEntity(en.point[0]);
Entity *pp = SK.GetEntity(en.point[1]);
Expand All @@ -946,6 +961,13 @@ void Group::MakeLatheCircles(EntityList *el, ParamList *param, hEntity in, Vecto
// Create basis for the normal.
Vector nu = pp->numPoint.Minus(pc->numPoint).WithMagnitude(1.0);
Vector nv = nu.Cross(axis).WithMagnitude(1.0);

// this doesn't work here. The angle is always positive on creation.
if(type == Type::REVOLVE) {
if(SK.GetParam(h.param(3))->val < 0.0)
nv = nv.ScaledBy(-1.0);
}

n.numNormal = Quaternion::From(nv, nu);

// The point determines where the normal gets displayed on-screen;
Expand Down