suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider plane faces when zooming to fit.

Browse Source
This commit is contained in:
EvilSpirit 2016-03-25 13:32:11 +06:00 committed by whitequark
parent 83f5b60228
commit 98e0a30a98
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/graphicswin.cpp
View File

@ -318,6 +318,7 @@ void GraphicsWindow::HandlePointForZoomToFit(Vector p, Point2d *pmax, Point2d *p
*wmin = min(*wmin, w); *wmin = min(*wmin, w);
} }
void GraphicsWindow::LoopOverPoints(const std::vector<Entity *> &entities, void GraphicsWindow::LoopOverPoints(const std::vector<Entity *> &entities,
const std::vector<hEntity> &faces,
Point2d *pmax, Point2d *pmin, double *wmin, Point2d *pmax, Point2d *pmin, double *wmin,
bool usePerspective, bool includeMesh) { bool usePerspective, bool includeMesh) {
@ -350,16 +351,26 @@ void GraphicsWindow::LoopOverPoints(const std::vector<Entity *> &entities,
} }
} }
if(!includeMesh) return; if(!includeMesh && faces.empty()) return;
Group *g = SK.GetGroup(activeGroup); Group *g = SK.GetGroup(activeGroup);
g->GenerateDisplayItems(); g->GenerateDisplayItems();
for(i = 0; i < g->displayMesh.l.n; i++) { for(i = 0; i < g->displayMesh.l.n; i++) {
STriangle *tr = &(g->displayMesh.l.elem[i]); STriangle *tr = &(g->displayMesh.l.elem[i]);
if(!includeMesh) {
bool found = false;
for(const hEntity &face : faces) {
if(face.v != tr->meta.face) continue;
found = true;
break;
}
if(!found) continue;
}
HandlePointForZoomToFit(tr->a, pmax, pmin, wmin, usePerspective); HandlePointForZoomToFit(tr->a, pmax, pmin, wmin, usePerspective);
HandlePointForZoomToFit(tr->b, pmax, pmin, wmin, usePerspective); HandlePointForZoomToFit(tr->b, pmax, pmin, wmin, usePerspective);
HandlePointForZoomToFit(tr->c, pmax, pmin, wmin, usePerspective); HandlePointForZoomToFit(tr->c, pmax, pmin, wmin, usePerspective);
} }
if(!includeMesh) return;
for(i = 0; i < g->polyLoops.l.n; i++) { for(i = 0; i < g->polyLoops.l.n; i++) {
SContour *sc = &(g->polyLoops.l.elem[i]); SContour *sc = &(g->polyLoops.l.elem[i]);
for(j = 0; j < sc->l.n; j++) { for(j = 0; j < sc->l.n; j++) {
@ -369,15 +380,24 @@ void GraphicsWindow::LoopOverPoints(const std::vector<Entity *> &entities,
} }
void GraphicsWindow::ZoomToFit(bool includingInvisibles, bool useSelection) { void GraphicsWindow::ZoomToFit(bool includingInvisibles, bool useSelection) {
std::vector<Entity *> entities; std::vector<Entity *> entities;
bool selectionUsed = useSelection && selection.n > 0; std::vector<hEntity> faces;
if(selectionUsed) {
if(useSelection) {
for(int i = 0; i < selection.n; i++) { for(int i = 0; i < selection.n; i++) {
Selection *s = &selection.elem[i]; Selection *s = &selection.elem[i];
if(s->entity.v == 0) continue; if(s->entity.v == 0) continue;
Entity *e = SK.entity.FindById(s->entity); Entity *e = SK.entity.FindById(s->entity);
if(e->IsFace()) {
faces.push_back(e->h);
continue;
}
entities.push_back(e); entities.push_back(e);
} }
} else { }
bool selectionUsed = !entities.empty() || !faces.empty();
if(!selectionUsed) {
for(int i = 0; i<SK.entity.n; i++) { for(int i = 0; i<SK.entity.n; i++) {
Entity *e = &(SK.entity.elem[i]); Entity *e = &(SK.entity.elem[i]);
// we don't want to handle separate points, because we will iterate them inside entities. // we don't want to handle separate points, because we will iterate them inside entities.
@ -390,7 +410,7 @@ void GraphicsWindow::ZoomToFit(bool includingInvisibles, bool useSelection) {
// On the first run, ignore perspective. // On the first run, ignore perspective.
Point2d pmax = { -1e12, -1e12 }, pmin = { 1e12, 1e12 }; Point2d pmax = { -1e12, -1e12 }, pmin = { 1e12, 1e12 };
double wmin = 1; double wmin = 1;
LoopOverPoints(entities, &pmax, &pmin, &wmin, LoopOverPoints(entities, faces, &pmax, &pmin, &wmin,
/*usePerspective=*/false, /*includeMesh=*/!selectionUsed); /*usePerspective=*/false, /*includeMesh=*/!selectionUsed);
double xm = (pmax.x + pmin.x)/2, ym = (pmax.y + pmin.y)/2; double xm = (pmax.x + pmin.x)/2, ym = (pmax.y + pmin.y)/2;
@ -416,7 +436,7 @@ void GraphicsWindow::ZoomToFit(bool includingInvisibles, bool useSelection) {
pmax.x = -1e12; pmax.y = -1e12; pmax.x = -1e12; pmax.y = -1e12;
pmin.x = 1e12; pmin.y = 1e12; pmin.x = 1e12; pmin.y = 1e12;
wmin = 1; wmin = 1;
LoopOverPoints(entities, &pmax, &pmin, &wmin, LoopOverPoints(entities, faces, &pmax, &pmin, &wmin,
/*usePerspective=*/true, /*includeMesh=*/!selectionUsed); /*usePerspective=*/true, /*includeMesh=*/!selectionUsed);
// Adjust the scale so that no points are behind the camera // Adjust the scale so that no points are behind the camera

2
src/ui.h
View File

@ -519,7 +519,7 @@ public:
Vector VectorFromProjs(Vector rightUpForward); Vector VectorFromProjs(Vector rightUpForward);
void HandlePointForZoomToFit(Vector p, Point2d *pmax, Point2d *pmin, void HandlePointForZoomToFit(Vector p, Point2d *pmax, Point2d *pmin,
double *wmin, bool usePerspective); double *wmin, bool usePerspective);
void LoopOverPoints(const std::vector<Entity *> &entity, Point2d *pmax, Point2d *pmin, void LoopOverPoints(const std::vector<Entity *> &entity, const std::vector<hEntity> &faces, Point2d *pmax, Point2d *pmin,
double *wmin, bool usePerspective, bool includeMesh); double *wmin, bool usePerspective, bool includeMesh);
void ZoomToFit(bool includingInvisibles, bool useSelection = false); void ZoomToFit(bool includingInvisibles, bool useSelection = false);