Skip to content

Commit

Permalink
boiler-plate for ged_nmg_make_F subcommand
Browse files Browse the repository at this point in the history
  • Loading branch information
Brad Eric Hollister committed Aug 21, 2015
1 parent 688c64e commit d058369
Show file tree
Hide file tree
Showing 3 changed files with 339 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libged/CMakeLists.txt
View file
Expand Up @@ -171,6 +171,7 @@ set(LIBGED_SOURCES
nmg_kill_f.c
nmg_move_v.c
nmg_make_v.c
nmg_make_f.c
ocenter.c
open.c
orient.c
Expand Down
5 changes: 5 additions & 0 deletions src/libged/nmg.c
View file
Expand Up @@ -41,6 +41,7 @@ extern int ged_nmg_kill_v(struct ged *gedp, int argc, const char *argv[]);
extern int ged_nmg_kill_f(struct ged *gedp, int argc, const char *argv[]);
extern int ged_nmg_move_v(struct ged *gedp, int argc, const char *argv[]);
extern int ged_nmg_make_v(struct ged *gedp, int argc, const char *argv[]);
extern int ged_nmg_make_f(struct ged *gedp, int argc, const char *argv[]);

int
ged_nmg(struct ged *gedp, int argc, const char *argv[])
Expand Down Expand Up @@ -77,6 +78,8 @@ ged_nmg(struct ged *gedp, int argc, const char *argv[])
"z_final.\n");
bu_vls_printf(gedp->ged_result_str, "\tmake V - creates a new "
"vertex in the nmg object.\n");
bu_vls_printf(gedp->ged_result_str, "\tmake F - creates a new "
"face(s) in the nmg object.\n");
return GED_HELP;
}

Expand Down Expand Up @@ -113,6 +116,8 @@ ged_nmg(struct ged *gedp, int argc, const char *argv[])
const char* opt = argv[2];
if ( BU_STR_EQUAL( "V", opt ) ) {
ged_nmg_make_v(gedp, argc, argv);
} else if ( BU_STR_EQUAL( "F", opt ) ) {
ged_nmg_make_f(gedp, argc, argv);
}
}
else {
Expand Down
333 changes: 333 additions & 0 deletions src/libged/nmg_make_f.c
View file
@@ -0,0 +1,333 @@
/* N M G _ M A K E _ F. C
* BRL-CAD
*
* Copyright (c) 2015 United States Government as represented by
* the U.S. Army Research Laboratory.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* version 2.1 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this file; see the file named COPYING for more
* information.
*/
/** @file libged/nmg_make_v.c
*
* The make F subcommand for nmg top-level command.
*
*/

#include "common.h"

#include <string.h>

#include "bu/cmd.h"
#include "rt/geom.h"

#include "./ged_private.h"

#if 0
void remove_vertex(const struct model* m, point_t rv)
{
struct nmgregion *r;
struct shell *s;
struct faceuse *fu;
struct face *f;
struct loopuse *lu;
struct loop *l;
struct edgeuse *eu;
struct edge *e;
struct vertexuse *vu;
struct vertex *v;

NMG_CK_MODEL(m);

/* Traverse NMG model and remove instances of vertexuses.
* In addition to vertex being removed, associated faceuses, loopuses
* and edgeuses need to be removed that contained the deleted vertexuse.
*/

for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
NMG_CK_REGION(r);

if (r->ra_p) {
NMG_CK_REGION_A(r->ra_p);
}

for (BU_LIST_FOR(s, shell, &r->s_hd)) {
NMG_CK_SHELL(s);

if (s->sa_p) {
NMG_CK_SHELL_A(s->sa_p);
}

/* Faces in shell */
for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
NMG_CK_FACEUSE(fu);
f = fu->f_p;
NMG_CK_FACE(f);

if (f->g.magic_p) switch (*f->g.magic_p) {
case NMG_FACE_G_PLANE_MAGIC:
break;
case NMG_FACE_G_SNURB_MAGIC:
break;
}

/* Loops in face */
for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
NMG_CK_LOOPUSE(lu);
l = lu->l_p;
NMG_CK_LOOP(l);

if (l->lg_p) {
NMG_CK_LOOP_G(l->lg_p);
}

if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
/* Loop of Lone vertex */
vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);

/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);

if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);

if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
nmg_klu(lu);
}
}

continue;
}

for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
NMG_CK_EDGEUSE(eu);
e = eu->e_p;
NMG_CK_EDGE(e);

if (eu->g.magic_p) {
switch (*eu->g.magic_p) {
case NMG_EDGE_G_LSEG_MAGIC:
break;
case NMG_EDGE_G_CNURB_MAGIC:
break;
}
}

vu = eu->vu_p;

/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);

if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);

if ( VNEAR_EQUAL(v->vg_p->coord,
rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
nmg_keu(eu);
nmg_klu(lu);
}
}
}
}
}

/* Wire loops in shell */
for (BU_LIST_FOR(lu, loopuse, &s->lu_hd)) {
NMG_CK_LOOPUSE(lu);
l = lu->l_p;
NMG_CK_LOOP(l);

if (l->lg_p) {
NMG_CK_LOOP_G(l->lg_p);
}

if (BU_LIST_FIRST_MAGIC(&lu->down_hd) == NMG_VERTEXUSE_MAGIC) {
/* Wire loop of Lone vertex */
vu = BU_LIST_FIRST(vertexuse, &lu->down_hd);
/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);
if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);
if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
nmg_klu(lu);
}
}
continue;
}

for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
NMG_CK_EDGEUSE(eu);
e = eu->e_p;
NMG_CK_EDGE(e);

if (eu->g.magic_p) switch (*eu->g.magic_p) {
case NMG_EDGE_G_LSEG_MAGIC:
break;
case NMG_EDGE_G_CNURB_MAGIC:
break;
}
vu = eu->vu_p;

/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);

if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);
if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
nmg_keu(eu);
nmg_klu(lu);
}
}
}
}

/* Wire edges in shell */
for (BU_LIST_FOR(eu, edgeuse, &s->eu_hd)) {
NMG_CK_EDGEUSE(eu);
e = eu->e_p;
NMG_CK_EDGE(e);

if (eu->g.magic_p) {
switch (*eu->g.magic_p) {
case NMG_EDGE_G_LSEG_MAGIC:
break;
case NMG_EDGE_G_CNURB_MAGIC:
break;
}
}

vu = eu->vu_p;

/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);

if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);

if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
nmg_keu(eu);
}
}
}

/* Lone vertex in shell */
vu = s->vu_p;

if (vu) {
/* check and remove vertexuse */
NMG_CK_VERTEXUSE(vu);
v = vu->v_p;
NMG_CK_VERTEX(v);

if (v->vg_p) {
NMG_CK_VERTEX_G(v->vg_p);

if ( VNEAR_EQUAL(v->vg_p->coord, rv, BN_TOL_DIST) ) {
nmg_kvu(vu);
}
}
}
}
}
}
#endif

int
ged_nmg_make_f(struct ged* UNUSED(gedp), int UNUSED(argc), const char* UNUSED(argv[]))
{
#if 0
struct rt_db_internal internal;
struct directory *dp;
struct model* m;
const char* name;
point_t vt;

static const char *usage = "kill V x y z";

GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
GED_CHECK_READ_ONLY(gedp, GED_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);

/* initialize result */
bu_vls_trunc(gedp->ged_result_str, 0);

/* must be wanting help */
if (argc < 6) {
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_HELP;
}

/* attempt to resolve and verify */
name = argv[0];

if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
== RT_DIR_NULL ) {
bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
return GED_ERROR;
}

if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
bn_mat_identity, &rt_uniresource) < 0) {
bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
return GED_ERROR;
}

if (internal.idb_type != ID_NMG) {
bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
rt_db_free_internal(&internal);
return GED_ERROR;
}

vt[0] = atof(argv[3]); vt[1] = atof(argv[4]); vt[2] = atof(argv[5]);

m = (struct model *)internal.idb_ptr;
NMG_CK_MODEL(m);

remove_vertex(m, vt);

if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
rt_db_free_internal(&internal);
return GED_ERROR;
}

rt_db_free_internal(&internal);
#endif

return GED_OK;
}

/*
* Local Variables:
* tab-width: 8
* mode: C
* indent-tabs-mode: t
* c-file-style: "stroustrup"
* End:
* ex: shiftwidth=4 tabstop=8
*/

0 comments on commit d058369

Please sign in to comment.