Revision: 76362
http://sourceforge.net/p/brlcad/code/76362
Author: starseeker
Date: 2020-07-17 17:21:01 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
Get everything compiling again
Modified Paths:
--------------
brlcad/branches/bioh/src/libged/3ptarb/3ptarb.c
brlcad/branches/bioh/src/libged/CMakeLists.txt
brlcad/branches/bioh/src/libged/ae2dir/ae2dir.c
brlcad/branches/bioh/src/libged/analyze/analyze.c
brlcad/branches/bioh/src/libged/arb/arb.c
brlcad/branches/bioh/src/libged/arot/arot.c
brlcad/branches/bioh/src/libged/attr/attr.cpp
brlcad/branches/bioh/src/libged/autoview/autoview.c
brlcad/branches/bioh/src/libged/bb/bb.c
brlcad/branches/bioh/src/libged/bev/bev.c
brlcad/branches/bioh/src/libged/bigE/bigE.c
brlcad/branches/bioh/src/libged/bot_condense/bot_condense.c
brlcad/branches/bioh/src/libged/bot_dump/bot_dump.c
brlcad/branches/bioh/src/libged/bot_face_fuse/bot_face_fuse.c
brlcad/branches/bioh/src/libged/bot_flip/bot_flip.c
brlcad/branches/bioh/src/libged/bot_fuse/bot_fuse.c
brlcad/branches/bioh/src/libged/bot_merge/bot_merge.c
brlcad/branches/bioh/src/libged/bot_smooth/bot_smooth.c
brlcad/branches/bioh/src/libged/bot_split/bot_split.c
brlcad/branches/bioh/src/libged/bot_sync/bot_sync.c
brlcad/branches/bioh/src/libged/bot_vertex_fuse/bot_vertex_fuse.c
brlcad/branches/bioh/src/libged/cat/cat.c
brlcad/branches/bioh/src/libged/cc/cc.c
brlcad/branches/bioh/src/libged/clone/clone.c
brlcad/branches/bioh/src/libged/color/color.c
brlcad/branches/bioh/src/libged/comb/comb.c
brlcad/branches/bioh/src/libged/combmem/combmem.c
brlcad/branches/bioh/src/libged/concat/concat.cpp
brlcad/branches/bioh/src/libged/copy/copy.c
brlcad/branches/bioh/src/libged/copyeval/copyeval.c
brlcad/branches/bioh/src/libged/copymat/copymat.c
brlcad/branches/bioh/src/libged/cpi/cpi.c
brlcad/branches/bioh/src/libged/dag/dag.cpp
brlcad/branches/bioh/src/libged/dbip/dbip.c
brlcad/branches/bioh/src/libged/debug/debug.cpp
brlcad/branches/bioh/src/libged/debugbu/debugbu.c
brlcad/branches/bioh/src/libged/debugdir/debugdir.c
brlcad/branches/bioh/src/libged/debuglib/debuglib.c
brlcad/branches/bioh/src/libged/debugnmg/debugnmg.c
brlcad/branches/bioh/src/libged/decompose/decompose.c
brlcad/branches/bioh/src/libged/delay/delay.c
brlcad/branches/bioh/src/libged/dir2ae/dir2ae.c
brlcad/branches/bioh/src/libged/display_list/display_list.c
brlcad/branches/bioh/src/libged/draw/draw.c
brlcad/branches/bioh/src/libged/dsp/dsp.c
brlcad/branches/bioh/src/libged/dump/dump.c
brlcad/branches/bioh/src/libged/dup/dup.c
brlcad/branches/bioh/src/libged/eac/eac.c
brlcad/branches/bioh/src/libged/echo/echo.c
brlcad/branches/bioh/src/libged/edarb/edarb.c
brlcad/branches/bioh/src/libged/edcodes/edcodes.c
brlcad/branches/bioh/src/libged/edit/edit.c
brlcad/branches/bioh/src/libged/edit_metaball/edit_metaball.c
brlcad/branches/bioh/src/libged/edmater/edmater.c
brlcad/branches/bioh/src/libged/env/env.c
brlcad/branches/bioh/src/libged/erase/erase.c
brlcad/branches/bioh/src/libged/exists/exists.c
brlcad/branches/bioh/src/libged/expand/expand.c
brlcad/branches/bioh/src/libged/eye_pos/eye_pos.c
brlcad/branches/bioh/src/libged/facedef/facedef.c
brlcad/branches/bioh/src/libged/facetize/facetize.cpp
brlcad/branches/bioh/src/libged/facetize_log/facetize_log.c
brlcad/branches/bioh/src/libged/find/find.c
brlcad/branches/bioh/src/libged/fracture/fracture.c
brlcad/branches/bioh/src/libged/gdiff/gdiff.c
brlcad/branches/bioh/src/libged/ged_util/ged_util.c
brlcad/branches/bioh/src/libged/get_autoview/get_autoview.c
brlcad/branches/bioh/src/libged/get_comb/get_comb.c
brlcad/branches/bioh/src/libged/get_eyemodel/get_eyemodel.c
brlcad/branches/bioh/src/libged/get_obj_bounds/get_obj_bounds.c
brlcad/branches/bioh/src/libged/get_solid_kp/get_solid_kp.c
brlcad/branches/bioh/src/libged/get_type/get_type.c
brlcad/branches/bioh/src/libged/gqa/gqa.c
brlcad/branches/bioh/src/libged/grid/grid.c
brlcad/branches/bioh/src/libged/grid2model_lu/grid2model_lu.c
brlcad/branches/bioh/src/libged/grid2view_lu/grid2view_lu.c
brlcad/branches/bioh/src/libged/group/group.c
brlcad/branches/bioh/src/libged/heal/heal.c
brlcad/branches/bioh/src/libged/hide/hide.c
brlcad/branches/bioh/src/libged/how/how.c
brlcad/branches/bioh/src/libged/illum/illum.c
brlcad/branches/bioh/src/libged/importFg4Section/importFg4Section.c
brlcad/branches/bioh/src/libged/inside/inside.c
brlcad/branches/bioh/src/libged/instance/instance.c
brlcad/branches/bioh/src/libged/isize/isize.c
brlcad/branches/bioh/src/libged/joint/joint.c
brlcad/branches/bioh/src/libged/joint2/joint2.c
brlcad/branches/bioh/src/libged/keep/keep.c
brlcad/branches/bioh/src/libged/keypoint/keypoint.c
brlcad/branches/bioh/src/libged/kill/kill.c
brlcad/branches/bioh/src/libged/killall/killall.c
brlcad/branches/bioh/src/libged/killrefs/killrefs.c
brlcad/branches/bioh/src/libged/killtree/killtree.c
brlcad/branches/bioh/src/libged/lint/lint.cpp
brlcad/branches/bioh/src/libged/list/list.c
brlcad/branches/bioh/src/libged/loadview/loadview.c
brlcad/branches/bioh/src/libged/lod/lod.c
brlcad/branches/bioh/src/libged/lookat/lookat.c
brlcad/branches/bioh/src/libged/ls/ls.c
brlcad/branches/bioh/src/libged/lt/lt.c
brlcad/branches/bioh/src/libged/m2v_point/m2v_point.c
brlcad/branches/bioh/src/libged/make/make.c
brlcad/branches/bioh/src/libged/match/match.c
brlcad/branches/bioh/src/libged/mater/mater.cpp
brlcad/branches/bioh/src/libged/model2grid_lu/model2grid_lu.c
brlcad/branches/bioh/src/libged/model2view/model2view.c
brlcad/branches/bioh/src/libged/model2view_lu/model2view_lu.c
brlcad/branches/bioh/src/libged/move/move.c
brlcad/branches/bioh/src/libged/move_all/move_all.c
brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
brlcad/branches/bioh/src/libged/mrot/mrot.c
brlcad/branches/bioh/src/libged/nirt/nirt.c
brlcad/branches/bioh/src/libged/nmg/nmg.c
brlcad/branches/bioh/src/libged/nmg_cmface/nmg_cmface.c
brlcad/branches/bioh/src/libged/nmg_collapse/nmg_collapse.c
brlcad/branches/bioh/src/libged/nmg_fix_normals/nmg_fix_normals.c
brlcad/branches/bioh/src/libged/nmg_kill_f/nmg_kill_f.c
brlcad/branches/bioh/src/libged/nmg_kill_v/nmg_kill_v.c
brlcad/branches/bioh/src/libged/nmg_make_v/nmg_make_v.c
brlcad/branches/bioh/src/libged/nmg_mm/nmg_mm.c
brlcad/branches/bioh/src/libged/nmg_move_v/nmg_move_v.c
brlcad/branches/bioh/src/libged/nmg_simplify/nmg_simplify.c
brlcad/branches/bioh/src/libged/ocenter/ocenter.c
brlcad/branches/bioh/src/libged/open/open.c
brlcad/branches/bioh/src/libged/orient/orient.c
brlcad/branches/bioh/src/libged/orotate/orotate.c
brlcad/branches/bioh/src/libged/oscale/oscale.c
brlcad/branches/bioh/src/libged/otranslate/otranslate.c
brlcad/branches/bioh/src/libged/overlay/overlay.c
brlcad/branches/bioh/src/libged/pathlist/pathlist.c
brlcad/branches/bioh/src/libged/pathsum/pathsum.c
brlcad/branches/bioh/src/libged/perspective/perspective.c
brlcad/branches/bioh/src/libged/plot/plot.c
brlcad/branches/bioh/src/libged/pmat/pmat.c
brlcad/branches/bioh/src/libged/pmodel2view/pmodel2view.c
brlcad/branches/bioh/src/libged/png/png.c
brlcad/branches/bioh/src/libged/pnts/pnts.cpp
brlcad/branches/bioh/src/libged/prcolor/prcolor.c
brlcad/branches/bioh/src/libged/prefix/prefix.c
brlcad/branches/bioh/src/libged/preview/preview.c
brlcad/branches/bioh/src/libged/process/process.c
brlcad/branches/bioh/src/libged/protate/protate.c
brlcad/branches/bioh/src/libged/ps/ps.c
brlcad/branches/bioh/src/libged/pscale/pscale.c
brlcad/branches/bioh/src/libged/pset/pset.c
brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c
brlcad/branches/bioh/src/libged/pull/pull.c
brlcad/branches/bioh/src/libged/push/push.c
brlcad/branches/bioh/src/libged/put_comb/put_comb.c
brlcad/branches/bioh/src/libged/putmat/putmat.c
brlcad/branches/bioh/src/libged/qray/qray.c
brlcad/branches/bioh/src/libged/qvrot/qvrot.c
brlcad/branches/bioh/src/libged/rcodes/rcodes.c
brlcad/branches/bioh/src/libged/rect/rect.c
brlcad/branches/bioh/src/libged/red/red.c
brlcad/branches/bioh/src/libged/region/region.c
brlcad/branches/bioh/src/libged/remove/remove.c
brlcad/branches/bioh/src/libged/rfarb/rfarb.c
brlcad/branches/bioh/src/libged/rmap/rmap.c
brlcad/branches/bioh/src/libged/rmat/rmat.c
brlcad/branches/bioh/src/libged/rot/rot.c
brlcad/branches/bioh/src/libged/rot_point/rot_point.c
brlcad/branches/bioh/src/libged/rotate_about/rotate_about.c
brlcad/branches/bioh/src/libged/rotate_arb_face/rotate_arb_face.c
brlcad/branches/bioh/src/libged/rotate_eto/rotate_eto.c
brlcad/branches/bioh/src/libged/rotate_extrude/rotate_extrude.c
brlcad/branches/bioh/src/libged/rotate_hyp/rotate_hyp.c
brlcad/branches/bioh/src/libged/rotate_tgc/rotate_tgc.c
brlcad/branches/bioh/src/libged/rrt/rrt.c
brlcad/branches/bioh/src/libged/rt/rt.c
brlcad/branches/bioh/src/libged/rtabort/rtabort.c
brlcad/branches/bioh/src/libged/rtcheck/rtcheck.c
brlcad/branches/bioh/src/libged/rtwizard/rtwizard.c
brlcad/branches/bioh/src/libged/savekey/savekey.c
brlcad/branches/bioh/src/libged/saveview/saveview.c
brlcad/branches/bioh/src/libged/scale/scale.c
brlcad/branches/bioh/src/libged/scale_ehy/scale_ehy.c
brlcad/branches/bioh/src/libged/scale_ell/scale_ell.c
brlcad/branches/bioh/src/libged/scale_epa/scale_epa.c
brlcad/branches/bioh/src/libged/scale_eto/scale_eto.c
brlcad/branches/bioh/src/libged/scale_extrude/scale_extrude.c
brlcad/branches/bioh/src/libged/scale_hyp/scale_hyp.c
brlcad/branches/bioh/src/libged/scale_part/scale_part.c
brlcad/branches/bioh/src/libged/scale_rhc/scale_rhc.c
brlcad/branches/bioh/src/libged/scale_rpc/scale_rpc.c
brlcad/branches/bioh/src/libged/scale_superell/scale_superell.c
brlcad/branches/bioh/src/libged/scale_tgc/scale_tgc.c
brlcad/branches/bioh/src/libged/scale_tor/scale_tor.c
brlcad/branches/bioh/src/libged/screengrab/screengrab.c
brlcad/branches/bioh/src/libged/search/search.c
brlcad/branches/bioh/src/libged/select/select.c
brlcad/branches/bioh/src/libged/set_transparency/set_transparency.c
brlcad/branches/bioh/src/libged/setview/setview.c
brlcad/branches/bioh/src/libged/shaded_mode/shaded_mode.c
brlcad/branches/bioh/src/libged/shells/shells.c
brlcad/branches/bioh/src/libged/showmats/showmats.c
brlcad/branches/bioh/src/libged/slew/slew.c
brlcad/branches/bioh/src/libged/solid_report/solid_report.c
brlcad/branches/bioh/src/libged/solids_on_ray/solids_on_ray.c
brlcad/branches/bioh/src/libged/sphgroup/sphgroup.c
brlcad/branches/bioh/src/libged/summary/summary.c
brlcad/branches/bioh/src/libged/sync/sync.c
brlcad/branches/bioh/src/libged/tables/tables.c
brlcad/branches/bioh/src/libged/title/title.c
brlcad/branches/bioh/src/libged/tol/tol.c
brlcad/branches/bioh/src/libged/tops/tops.c
brlcad/branches/bioh/src/libged/tra/tra.c
brlcad/branches/bioh/src/libged/trace/trace.c
brlcad/branches/bioh/src/libged/translate_extrude/translate_extrude.c
brlcad/branches/bioh/src/libged/translate_tgc/translate_tgc.c
brlcad/branches/bioh/src/libged/tree/tree.c
brlcad/branches/bioh/src/libged/typein/typein.c
brlcad/branches/bioh/src/libged/unhide/unhide.c
brlcad/branches/bioh/src/libged/units/units.c
brlcad/branches/bioh/src/libged/v2m_point/v2m_point.c
brlcad/branches/bioh/src/libged/vdraw/vdraw.c
brlcad/branches/bioh/src/libged/version/version.c
brlcad/branches/bioh/src/libged/view2grid_lu/view2grid_lu.c
brlcad/branches/bioh/src/libged/view2model/view2model.c
brlcad/branches/bioh/src/libged/view2model_lu/view2model_lu.c
brlcad/branches/bioh/src/libged/view2model_vec/view2model_vec.c
brlcad/branches/bioh/src/libged/viewdir/viewdir.c
brlcad/branches/bioh/src/libged/voxelize/voxelize.c
brlcad/branches/bioh/src/libged/vrot/vrot.c
brlcad/branches/bioh/src/libged/vutil/vutil.c
brlcad/branches/bioh/src/libged/wcodes/wcodes.c
brlcad/branches/bioh/src/libged/whatid/whatid.c
brlcad/branches/bioh/src/libged/which/which.cpp
brlcad/branches/bioh/src/libged/which_shader/which_shader.c
brlcad/branches/bioh/src/libged/xpush/xpush.c
brlcad/branches/bioh/src/libged/zap/zap.c
Added Paths:
-----------
brlcad/branches/bioh/src/libged/ged.c
brlcad/branches/bioh/src/libged/pnts_util.c
Removed Paths:
-------------
brlcad/branches/bioh/src/libged/ged/
brlcad/branches/bioh/src/libged/pnts_util/
Modified: brlcad/branches/bioh/src/libged/3ptarb/3ptarb.c
===================================================================
--- brlcad/branches/bioh/src/libged/3ptarb/3ptarb.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/3ptarb/3ptarb.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -32,7 +32,7 @@
#include "rt/geom.h"
#include "ged/objects.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static char *p_arb3pt[] = {
Modified: brlcad/branches/bioh/src/libged/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/libged/CMakeLists.txt 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/CMakeLists.txt 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -23,6 +23,7 @@
set(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS} ${AVOID_INCLUDE_DIR})
endif(ADAPTAGRAMS_FOUND)
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/debug")
set(DEBUG_CMD_CPP "${CMAKE_CURRENT_BINARY_DIR}/debug_cmd.cpp")
add_custom_command(OUTPUT ${DEBUG_CMD_CPP}
@@ -30,9 +31,10 @@
DEPENDS debug2c
COMMENT "[DEBUG2C] Scanning for debugging variables"
)
-set_source_files_properties(debug.cpp PROPERTIES OBJECT_DEPENDS
${DEBUG_CMD_CPP})
DISTCLEAN(${DEBUG_CMD_CPP})
+set_source_files_properties(debug/debug.cpp PROPERTIES OBJECT_DEPENDS
${DEBUG_CMD_CPP})
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/env")
set(ENV_CMD_C "${CMAKE_CURRENT_BINARY_DIR}/env_cmd.c")
add_custom_command(OUTPUT ${ENV_CMD_C}
@@ -40,8 +42,8 @@
DEPENDS env2c
COMMENT "[ENV2C] Scanning for environment variable usage"
)
-set_source_files_properties(env.c PROPERTIES OBJECT_DEPENDS ${ENV_CMD_C})
DISTCLEAN(${ENV_CMD_C})
+set_source_files_properties(env/env.c PROPERTIES OBJECT_DEPENDS ${ENV_CMD_C})
set(LIBGED_SOURCES
${LIBGED_SOURCES}
@@ -155,7 +157,7 @@
fracture/fracture.c
gdiff/gdiff.c
gdiff/gdiff.c
- ged/ged.c
+ ged.c
ged_util/ged_util.c
get/get.c
get_autoview/get_autoview.c
@@ -243,7 +245,7 @@
png/png.c
png2fb/png2fb.c
pnts/pnts.cpp
- pnts_util/pnts_util.c
+ pnts_util.c
polyclip/polyclip.cpp
prcolor/prcolor.c
prefix/prefix.c
Modified: brlcad/branches/bioh/src/libged/ae2dir/ae2dir.c
===================================================================
--- brlcad/branches/bioh/src/libged/ae2dir/ae2dir.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/ae2dir/ae2dir.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/analyze/analyze.c
===================================================================
--- brlcad/branches/bioh/src/libged/analyze/analyze.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/analyze/analyze.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -38,7 +38,7 @@
#include "raytrace.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/**
* TODO: primitives that still need implementing
Modified: brlcad/branches/bioh/src/libged/arb/arb.c
===================================================================
--- brlcad/branches/bioh/src/libged/arb/arb.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/arb/arb.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/arot/arot.c
===================================================================
--- brlcad/branches/bioh/src/libged/arot/arot.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/arot/arot.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
ged_arot_args(struct ged *gedp, int argc, const char *argv[], mat_t rmat)
Modified: brlcad/branches/bioh/src/libged/attr/attr.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/attr/attr.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/attr/attr.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -33,7 +33,7 @@
#include "bu/getopt.h"
#include "bu/path.h"
#include "bu/sort.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
typedef enum {
Modified: brlcad/branches/bioh/src/libged/autoview/autoview.c
===================================================================
--- brlcad/branches/bioh/src/libged/autoview/autoview.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/autoview/autoview.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
* Auto-adjust the view so that all displayed geometry is in view
Modified: brlcad/branches/bioh/src/libged/bb/bb.c
===================================================================
--- brlcad/branches/bioh/src/libged/bb/bb.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/bb/bb.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -34,7 +34,7 @@
#include "bu/units.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bev/bev.c
===================================================================
--- brlcad/branches/bioh/src/libged/bev/bev.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/bev/bev.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "bu/getopt.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static union tree *bev_facetize_tree;
Modified: brlcad/branches/bioh/src/libged/bigE/bigE.c
===================================================================
--- brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -40,7 +40,7 @@
#include "raytrace.h"
#include "rt/func.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* #define debug 1 */
Modified: brlcad/branches/bioh/src/libged/bot_condense/bot_condense.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_condense/bot_condense.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_condense/bot_condense.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_dump/bot_dump.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_dump/bot_dump.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_dump/bot_dump.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -49,7 +49,7 @@
#include "dm/bview.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define V3ARGS_SCALE(_a) (_a)[X]*cfactor, (_a)[Y]*cfactor, (_a)[Z]*cfactor
Modified: brlcad/branches/bioh/src/libged/bot_face_fuse/bot_face_fuse.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_face_fuse/bot_face_fuse.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_face_fuse/bot_face_fuse.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_flip/bot_flip.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_flip/bot_flip.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_flip/bot_flip.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -32,7 +32,7 @@
#include "bu/path.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_fuse/bot_fuse.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_fuse/bot_fuse.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_fuse/bot_fuse.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -34,7 +34,7 @@
#include "rt/geom.h"
#include "bn/plot3.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static size_t
Modified: brlcad/branches/bioh/src/libged/bot_merge/bot_merge.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_merge/bot_merge.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_merge/bot_merge.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_smooth/bot_smooth.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_smooth/bot_smooth.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_smooth/bot_smooth.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_split/bot_split.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_split/bot_split.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_split/bot_split.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "bu/path.h"
#include "rt/geom.h" /* for rt_bot_split (in raytrace.h) */
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_sync/bot_sync.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_sync/bot_sync.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_sync/bot_sync.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -32,7 +32,7 @@
#include "bu/path.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/bot_vertex_fuse/bot_vertex_fuse.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_vertex_fuse/bot_vertex_fuse.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/bot_vertex_fuse/bot_vertex_fuse.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/cat/cat.c
===================================================================
--- brlcad/branches/bioh/src/libged/cat/cat.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/cat/cat.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/cc/cc.c
===================================================================
--- brlcad/branches/bioh/src/libged/cc/cc.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/cc/cc.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "wdb.h"
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
* List constraint objects in this database
Modified: brlcad/branches/bioh/src/libged/clone/clone.c
===================================================================
--- brlcad/branches/bioh/src/libged/clone/clone.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/clone/clone.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -62,7 +62,7 @@
#include "rt/db4.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define CLONE_BUFPARTSIZE 511
Modified: brlcad/branches/bioh/src/libged/color/color.c
===================================================================
--- brlcad/branches/bioh/src/libged/color/color.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/color/color.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -36,7 +36,7 @@
#include "rt/db4.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/**
Modified: brlcad/branches/bioh/src/libged/comb/comb.c
===================================================================
--- brlcad/branches/bioh/src/libged/comb/comb.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/comb/comb.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -34,7 +34,7 @@
#include "wdb.h"
#include "analyze.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
HIDDEN int
region_flag_set(struct ged *gedp, struct directory *dp) {
Modified: brlcad/branches/bioh/src/libged/combmem/combmem.c
===================================================================
--- brlcad/branches/bioh/src/libged/combmem/combmem.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/combmem/combmem.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include <string.h>
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
enum etypes {
ETYPES_NULL = -1,
Modified: brlcad/branches/bioh/src/libged/concat/concat.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/concat/concat.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/concat/concat.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -35,7 +35,7 @@
#include "bu/getopt.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/**
Modified: brlcad/branches/bioh/src/libged/copy/copy.c
===================================================================
--- brlcad/branches/bioh/src/libged/copy/copy.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/copy/copy.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "bu/str.h"
#include "bu/units.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/copyeval/copyeval.c
===================================================================
--- brlcad/branches/bioh/src/libged/copyeval/copyeval.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/copyeval/copyeval.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/copymat/copymat.c
===================================================================
--- brlcad/branches/bioh/src/libged/copymat/copymat.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/copymat/copymat.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/cpi/cpi.c
===================================================================
--- brlcad/branches/bioh/src/libged/cpi/cpi.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/cpi/cpi.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/dag/dag.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/dag/dag.cpp 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/dag/dag.cpp 2020-07-17 17:21:01 UTC (rev
76362)
@@ -801,7 +801,7 @@
#else
-#include "ged_private.h"
+#include "../ged_private.h"
/**
* Dummy graph function in case no Adaptagrams library is found.
Modified: brlcad/branches/bioh/src/libged/dbip/dbip.c
===================================================================
--- brlcad/branches/bioh/src/libged/dbip/dbip.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/dbip/dbip.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/debug/debug.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/debug/debug.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/debug/debug.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -33,7 +33,7 @@
#include "rt/debug.h"
#include "nmg/debug.h"
#include "optical/debug.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* Generated by the debug2c command in misc/tools at build time */
#include "./debug_cmd.cpp"
Modified: brlcad/branches/bioh/src/libged/debugbu/debugbu.c
===================================================================
--- brlcad/branches/bioh/src/libged/debugbu/debugbu.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/debugbu/debugbu.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include <string.h>
#include "bu/debug.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/debugdir/debugdir.c
===================================================================
--- brlcad/branches/bioh/src/libged/debugdir/debugdir.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/debugdir/debugdir.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/debuglib/debuglib.c
===================================================================
--- brlcad/branches/bioh/src/libged/debuglib/debuglib.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/debuglib/debuglib.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include <string.h>
#include "bu/debug.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/debugnmg/debugnmg.c
===================================================================
--- brlcad/branches/bioh/src/libged/debugnmg/debugnmg.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/debugnmg/debugnmg.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/decompose/decompose.c
===================================================================
--- brlcad/branches/bioh/src/libged/decompose/decompose.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/decompose/decompose.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
ged_decompose(struct ged *gedp, int argc, const char *argv[])
Modified: brlcad/branches/bioh/src/libged/delay/delay.c
===================================================================
--- brlcad/branches/bioh/src/libged/delay/delay.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/delay/delay.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -31,7 +31,7 @@
#include "bsocket.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/dir2ae/dir2ae.c
===================================================================
--- brlcad/branches/bioh/src/libged/dir2ae/dir2ae.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/dir2ae/dir2ae.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/display_list/display_list.c
===================================================================
--- brlcad/branches/bioh/src/libged/display_list/display_list.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/display_list/display_list.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -34,7 +34,7 @@
#include "bn/plot3.h"
#include "rt/solid.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
Modified: brlcad/branches/bioh/src/libged/draw/draw.c
===================================================================
--- brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/draw/draw.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -35,7 +35,7 @@
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* declare our callbacks used by _ged_drawtrees() */
static int drawtrees_depth = 0;
Modified: brlcad/branches/bioh/src/libged/dsp/dsp.c
===================================================================
--- brlcad/branches/bioh/src/libged/dsp/dsp.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/dsp/dsp.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -32,7 +32,7 @@
#include "bu/opt.h"
#include "rt/geom.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* FIXME - we want the DSP macro for convenience here - should this be in
include/rt/dsp.h ? */
#include "../librt/primitives/dsp/dsp.h"
Modified: brlcad/branches/bioh/src/libged/dump/dump.c
===================================================================
--- brlcad/branches/bioh/src/libged/dump/dump.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/dump/dump.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/dup/dup.c
===================================================================
--- brlcad/branches/bioh/src/libged/dup/dup.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/dup/dup.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
struct dir_check_stuff {
Modified: brlcad/branches/bioh/src/libged/eac/eac.c
===================================================================
--- brlcad/branches/bioh/src/libged/eac/eac.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/eac/eac.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/echo/echo.c
===================================================================
--- brlcad/branches/bioh/src/libged/echo/echo.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/echo/echo.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/edarb/edarb.c
===================================================================
--- brlcad/branches/bioh/src/libged/edarb/edarb.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/edarb/edarb.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
#include "rt/arb_edit.h"
-#include "ged_private.h"
+#include "../ged_private.h"
/*
* An ARB edge is moved by finding the direction of the line
Modified: brlcad/branches/bioh/src/libged/edcodes/edcodes.c
===================================================================
--- brlcad/branches/bioh/src/libged/edcodes/edcodes.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/edcodes/edcodes.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -33,7 +33,7 @@
#include "bu/file.h"
#include "bu/getopt.h"
#include "bu/sort.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define EDCODES_OK GED_OK
Modified: brlcad/branches/bioh/src/libged/edit/edit.c
===================================================================
--- brlcad/branches/bioh/src/libged/edit/edit.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/edit/edit.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "rt/db4.h"
#include "raytrace.h"
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/edit_metaball/edit_metaball.c
===================================================================
--- brlcad/branches/bioh/src/libged/edit_metaball/edit_metaball.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/edit_metaball/edit_metaball.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -33,7 +33,7 @@
#include "raytrace.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define GED_METABALL_SCALE(_d, _scale) \
Modified: brlcad/branches/bioh/src/libged/edmater/edmater.c
===================================================================
--- brlcad/branches/bioh/src/libged/edmater/edmater.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/edmater/edmater.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -34,7 +34,7 @@
#include "bu/app.h"
#include "bu/file.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/env/env.c
===================================================================
--- brlcad/branches/bioh/src/libged/env/env.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/env/env.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "bu/env.h"
#include "bu/path.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* Generated by the env2c command in misc/tools at build time */
#include "./env_cmd.c"
Modified: brlcad/branches/bioh/src/libged/erase/erase.c
===================================================================
--- brlcad/branches/bioh/src/libged/erase/erase.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/erase/erase.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
* Erase objects from the display.
Modified: brlcad/branches/bioh/src/libged/exists/exists.c
===================================================================
--- brlcad/branches/bioh/src/libged/exists/exists.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/exists/exists.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -54,7 +54,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#ifndef __arraycount
# define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
Modified: brlcad/branches/bioh/src/libged/expand/expand.c
===================================================================
--- brlcad/branches/bioh/src/libged/expand/expand.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/expand/expand.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "bu/path.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static void
Modified: brlcad/branches/bioh/src/libged/eye_pos/eye_pos.c
===================================================================
--- brlcad/branches/bioh/src/libged/eye_pos/eye_pos.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/eye_pos/eye_pos.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/facedef/facedef.c
===================================================================
--- brlcad/branches/bioh/src/libged/facedef/facedef.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/facedef/facedef.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -31,7 +31,7 @@
#include "vmath.h"
#include "rt/geom.h"
#include "raytrace.h"
-#include "ged_private.h"
+#include "../ged_private.h"
char *p_rotfb[] = {
Modified: brlcad/branches/bioh/src/libged/facetize/facetize.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-07-17
17:21:01 UTC (rev 76362)
@@ -47,7 +47,7 @@
#include "raytrace.h"
#include "analyze.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define SOLID_OBJ_NAME 1
#define COMB_OBJ_NAME 2
Modified: brlcad/branches/bioh/src/libged/facetize_log/facetize_log.c
===================================================================
--- brlcad/branches/bioh/src/libged/facetize_log/facetize_log.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/facetize_log/facetize_log.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "bu/hook.h"
#include "bu/vls.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static int
_ged_facetize_bomb_hook(void *cdata, void *str)
Modified: brlcad/branches/bioh/src/libged/find/find.c
===================================================================
--- brlcad/branches/bioh/src/libged/find/find.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/find/find.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
HIDDEN void
Modified: brlcad/branches/bioh/src/libged/fracture/fracture.c
===================================================================
--- brlcad/branches/bioh/src/libged/fracture/fracture.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/fracture/fracture.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
static int frac_stat;
Modified: brlcad/branches/bioh/src/libged/gdiff/gdiff.c
===================================================================
--- brlcad/branches/bioh/src/libged/gdiff/gdiff.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/gdiff/gdiff.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -31,7 +31,7 @@
#include "bu/opt.h"
#include "analyze.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
ged_gdiff(struct ged *gedp, int argc, const char *argv[])
Copied: brlcad/branches/bioh/src/libged/ged.c (from rev 76361,
brlcad/branches/bioh/src/libged/ged/ged.c)
===================================================================
--- brlcad/branches/bioh/src/libged/ged.c (rev 0)
+++ brlcad/branches/bioh/src/libged/ged.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -0,0 +1,712 @@
+/* G E D . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2000-2020 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.
+ */
+/** @addtogroup libged */
+/** @{ */
+/** @file libged/ged.c
+ *
+ * A quasi-object-oriented database interface.
+ *
+ * A database object contains the attributes and methods for
+ * controlling a BRL-CAD database.
+ *
+ * Also include routines to allow libwdb to use librt's import/export
+ * interface, rather than having to know about the database formats directly.
+ *
+ */
+/** @} */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+
+#include "bu/sort.h"
+#include "vmath.h"
+#include "bn.h"
+#include "rt/geom.h"
+#include "raytrace.h"
+#include "bn/plot3.h"
+
+#include "rt/solid.h"
+
+#include "./ged_private.h"
+#include "./qray.h"
+
+
+/* FIXME: this function should not exist. passing pointers as strings
+ * indicates a failure in design and lazy coding.
+ */
+int
+ged_decode_dbip(const char *dbip_string, struct db_i **dbipp)
+{
+ if (sscanf(dbip_string, "%p", (void **)dbipp) != 1) {
+ return GED_ERROR;
+ }
+
+ /* Could core dump */
+ RT_CK_DBI(*dbipp);
+
+ return GED_OK;
+}
+
+
+void
+ged_close(struct ged *gedp)
+{
+ if (gedp == GED_NULL)
+ return;
+
+ if (gedp->ged_wdbp) {
+ wdb_close(gedp->ged_wdbp);
+ gedp->ged_wdbp = RT_WDB_NULL;
+ }
+
+ /* Terminate any ged subprocesses */
+ if (gedp != GED_NULL) {
+ struct ged_subprocess *rrp;
+ for (BU_LIST_FOR(rrp, ged_subprocess, &gedp->gd_headSubprocess.l)) {
+ if (!rrp->aborted) {
+ bu_terminate(bu_process_pid(rrp->p));
+ rrp->aborted = 1;
+ }
+ }
+ }
+
+ ged_free(gedp);
+}
+
+static void
+free_selection_set(struct bu_hash_tbl *t)
+{
+ int i;
+ struct rt_selection_set *selection_set;
+ struct bu_ptbl *selections;
+ struct bu_hash_entry *entry = bu_hash_next(t, NULL);
+ void (*free_selection)(struct rt_selection *);
+
+ while (entry) {
+ selection_set = (struct rt_selection_set *)bu_hash_value(entry, NULL);
+ selections = &selection_set->selections;
+ free_selection = selection_set->free_selection;
+
+ /* free all selection objects and containing items */
+ for (i = BU_PTBL_LEN(selections) - 1; i >= 0; --i) {
+ long *s = BU_PTBL_GET(selections, i);
+ free_selection((struct rt_selection *)s);
+ bu_ptbl_rm(selections, s);
+ }
+ bu_ptbl_free(selections);
+ BU_FREE(selection_set, struct rt_selection_set);
+ /* Get next entry */
+ entry = bu_hash_next(t, entry);
+ }
+}
+
+static void
+free_object_selections(struct bu_hash_tbl *t)
+{
+ struct rt_object_selections *obj_selections;
+ struct bu_hash_entry *entry = bu_hash_next(t, NULL);
+
+ while (entry) {
+ obj_selections = (struct rt_object_selections *)bu_hash_value(entry,
NULL);
+ /* free entries */
+ free_selection_set(obj_selections->sets);
+ /* free table itself */
+ bu_hash_destroy(obj_selections->sets);
+ /* free object */
+ bu_free(obj_selections, "ged selections entry");
+ /* Get next entry */
+ entry = bu_hash_next(t, entry);
+ }
+}
+
+void
+ged_free(struct ged *gedp)
+{
+ struct solid *sp;
+
+ if (gedp == GED_NULL)
+ return;
+
+ gedp->ged_wdbp = RT_WDB_NULL;
+
+ if (gedp->ged_gdp != GED_DRAWABLE_NULL) {
+ if (gedp->ged_gdp->gd_headDisplay)
+ BU_PUT(gedp->ged_gdp->gd_headDisplay, struct bu_vls);
+ if (gedp->ged_gdp->gd_headVDraw)
+ BU_PUT(gedp->ged_gdp->gd_headVDraw, struct bu_vls);
+ qray_free(gedp->ged_gdp);
+ BU_PUT(gedp->ged_gdp, struct ged_drawable);
+ }
+
+ if (gedp->ged_log) {
+ bu_vls_free(gedp->ged_log);
+ BU_PUT(gedp->ged_log, struct bu_vls);
+ }
+
+ if (gedp->ged_results) {
+ ged_results_free(gedp->ged_results);
+ BU_PUT(gedp->ged_results, struct ged_results);
+ }
+
+ if (gedp->ged_result_str) {
+ bu_vls_free(gedp->ged_result_str);
+ BU_PUT(gedp->ged_result_str, struct bu_vls);
+ }
+
+ {
+ struct solid *nsp;
+ sp = BU_LIST_NEXT(solid, &gedp->freesolid->l);
+ while (BU_LIST_NOT_HEAD(sp, &gedp->freesolid->l)) {
+ nsp = BU_LIST_PNEXT(solid, sp);
+ BU_LIST_DEQUEUE(&((sp)->l));
+ FREE_SOLID(sp, &gedp->freesolid->l);
+ sp = nsp;
+ }
+ }
+ BU_PUT(gedp->freesolid, struct solid);
+
+ free_object_selections(gedp->ged_selections);
+ bu_hash_destroy(gedp->ged_selections);
+
+}
+
+
+HIDDEN int
+cmds_add(struct ged *gedp, const struct ged_cmd *cmd)
+{
+ struct ged_cmd *copy;
+ BU_GET(copy, struct ged_cmd);
+ memcpy(copy, cmd, sizeof(struct ged_cmd));
+ BU_LIST_INIT_MAGIC(&(copy->l), GED_CMD_MAGIC);
+ BU_LIST_PUSH(&(gedp->cmds->l), copy);
+ return 0;
+}
+
+
+HIDDEN int
+cmds_del(struct ged *gedp, const char *name)
+{
+ struct ged_cmd *cmd;
+ for (BU_LIST_FOR(cmd, ged_cmd, &(gedp->cmds->l))) {
+ if (BU_STR_EQUIV(cmd->name, name)) {
+ BU_LIST_POP(ged_cmd, &(gedp->cmds->l), cmd);
+ BU_PUT(cmd, struct ged_cmd);
+ break;
+ }
+ }
+
+ return 0;
+}
+
+
+HIDDEN int
+cmds_run(struct ged *gedp, int ac, char *av[])
+{
+ struct ged_cmd *cmd;
+ for (BU_LIST_FOR(cmd, ged_cmd, &(gedp->cmds->l))) {
+ if (BU_STR_EQUIV(cmd->name, av[0])) {
+ return cmd->exec(gedp, ac, (const char **)av);
+ }
+ }
+
+ return 0;
+}
+
+
+void
+ged_init(struct ged *gedp)
+{
+ struct solid *freesolid;
+
+ if (gedp == GED_NULL)
+ return;
+
+ BU_LIST_INIT(&gedp->l);
+ gedp->ged_wdbp = RT_WDB_NULL;
+
+ BU_GET(gedp->ged_log, struct bu_vls);
+ bu_vls_init(gedp->ged_log);
+
+ BU_GET(gedp->ged_results, struct ged_results);
+ (void)_ged_results_init(gedp->ged_results);
+
+ BU_LIST_INIT(&gedp->gd_headSubprocess.l);
+
+ /* For now, we're keeping the string... will go once no one uses it */
+ BU_GET(gedp->ged_result_str, struct bu_vls);
+ bu_vls_init(gedp->ged_result_str);
+
+ BU_GET(gedp->ged_gdp, struct ged_drawable);
+ BU_GET(gedp->ged_gdp->gd_headDisplay, struct bu_list);
+ BU_LIST_INIT(gedp->ged_gdp->gd_headDisplay);
+ BU_GET(gedp->ged_gdp->gd_headVDraw, struct bu_list);
+ BU_LIST_INIT(gedp->ged_gdp->gd_headVDraw);
+
+ gedp->ged_gdp->gd_uplotOutputMode = PL_OUTPUT_MODE_BINARY;
+ qray_init(gedp->ged_gdp);
+
+ gedp->ged_selections = bu_hash_create(32);
+
+ /* init the solid list */
+ BU_GET(freesolid, struct solid);
+ BU_LIST_INIT(&freesolid->l);
+ gedp->freesolid = freesolid;
+ gedp->ged_gdp->gd_freeSolids = freesolid;
+
+ /* (in)sanity */
+ gedp->ged_gvp = NULL;
+ gedp->ged_dmp = NULL;
+ gedp->ged_refresh_clientdata = NULL;
+ gedp->ged_refresh_handler = NULL;
+ gedp->ged_output_handler = NULL;
+ gedp->ged_output_script = NULL;
+ gedp->ged_internal_call = 0;
+
+ /* set up our command registration container */
+ BU_GET(gedp->cmds, struct ged_cmd);
+ BU_LIST_INIT(&(gedp->cmds->l));
+ gedp->add = &cmds_add;
+ gedp->del = &cmds_del;
+ gedp->run = &cmds_run;
+}
+
+
+void
+ged_view_init(struct bview *gvp)
+{
+ if (gvp == GED_VIEW_NULL)
+ return;
+
+ gvp->gv_scale = 500.0;
+ gvp->gv_size = 2.0 * gvp->gv_scale;
+ gvp->gv_isize = 1.0 / gvp->gv_size;
+ VSET(gvp->gv_aet, 35.0, 25.0, 0.0);
+ VSET(gvp->gv_eye_pos, 0.0, 0.0, 1.0);
+ MAT_IDN(gvp->gv_rotation);
+ MAT_IDN(gvp->gv_center);
+ VSETALL(gvp->gv_keypoint, 0.0);
+ gvp->gv_coord = 'v';
+ gvp->gv_rotate_about = 'v';
+ gvp->gv_minMouseDelta = -20;
+ gvp->gv_maxMouseDelta = 20;
+ gvp->gv_rscale = 0.4;
+ gvp->gv_sscale = 2.0;
+
+ gvp->gv_adc.a1 = 45.0;
+ gvp->gv_adc.a2 = 45.0;
+ VSET(gvp->gv_adc.line_color, 255, 255, 0);
+ VSET(gvp->gv_adc.tick_color, 255, 255, 255);
+
+ VSET(gvp->gv_grid.anchor, 0.0, 0.0, 0.0);
+ gvp->gv_grid.res_h = 1.0;
+ gvp->gv_grid.res_v = 1.0;
+ gvp->gv_grid.res_major_h = 5;
+ gvp->gv_grid.res_major_v = 5;
+ VSET(gvp->gv_grid.color, 255, 255, 255);
+
+ gvp->gv_rect.draw = 0;
+ gvp->gv_rect.pos[0] = 128;
+ gvp->gv_rect.pos[1] = 128;
+ gvp->gv_rect.dim[0] = 256;
+ gvp->gv_rect.dim[1] = 256;
+ VSET(gvp->gv_rect.color, 255, 255, 255);
+
+ gvp->gv_view_axes.draw = 0;
+ VSET(gvp->gv_view_axes.axes_pos, 0.85, -0.85, 0.0);
+ gvp->gv_view_axes.axes_size = 0.2;
+ gvp->gv_view_axes.line_width = 0;
+ gvp->gv_view_axes.pos_only = 1;
+ VSET(gvp->gv_view_axes.axes_color, 255, 255, 255);
+ VSET(gvp->gv_view_axes.label_color, 255, 255, 0);
+ gvp->gv_view_axes.triple_color = 1;
+
+ gvp->gv_model_axes.draw = 0;
+ VSET(gvp->gv_model_axes.axes_pos, 0.0, 0.0, 0.0);
+ gvp->gv_model_axes.axes_size = 2.0;
+ gvp->gv_model_axes.line_width = 0;
+ gvp->gv_model_axes.pos_only = 0;
+ VSET(gvp->gv_model_axes.axes_color, 255, 255, 255);
+ VSET(gvp->gv_model_axes.label_color, 255, 255, 0);
+ gvp->gv_model_axes.triple_color = 0;
+ gvp->gv_model_axes.tick_enabled = 1;
+ gvp->gv_model_axes.tick_length = 4;
+ gvp->gv_model_axes.tick_major_length = 8;
+ gvp->gv_model_axes.tick_interval = 100;
+ gvp->gv_model_axes.ticks_per_major = 10;
+ gvp->gv_model_axes.tick_threshold = 8;
+ VSET(gvp->gv_model_axes.tick_color, 255, 255, 0);
+ VSET(gvp->gv_model_axes.tick_major_color, 255, 0, 0);
+
+ gvp->gv_center_dot.gos_draw = 0;
+ VSET(gvp->gv_center_dot.gos_line_color, 255, 255, 0);
+
+ gvp->gv_prim_labels.gos_draw = 0;
+ VSET(gvp->gv_prim_labels.gos_text_color, 255, 255, 0);
+
+ gvp->gv_view_params.gos_draw = 0;
+ VSET(gvp->gv_view_params.gos_text_color, 255, 255, 0);
+
+ gvp->gv_view_scale.gos_draw = 0;
+ VSET(gvp->gv_view_scale.gos_line_color, 255, 255, 0);
+ VSET(gvp->gv_view_scale.gos_text_color, 255, 255, 255);
+
+ gvp->gv_data_vZ = 1.0;
+
+ /* FIXME: this causes the shaders.sh regression to fail */
+ /* _ged_mat_aet(gvp); */
+
+ // Higher values indicate more aggressive behavior (i.e. points further
away will be snapped).
+ gvp->gv_snap_tol_factor = 10;
+ gvp->gv_snap_lines = 0;
+
+ bview_update(gvp);
+}
+
+
+struct ged *
+ged_open(const char *dbtype, const char *filename, int existing_only)
+{
+ struct ged *gedp;
+ struct rt_wdb *wdbp;
+ struct mater *save_materp = MATER_NULL;
+
+ if (filename == NULL)
+ return GED_NULL;
+
+ save_materp = rt_material_head();
+ rt_new_material_head(MATER_NULL);
+
+ if (BU_STR_EQUAL(dbtype, "db")) {
+ struct db_i *dbip;
+
+ if ((dbip = _ged_open_dbip(filename, existing_only)) == DBI_NULL) {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
+ return GED_NULL;
+ }
+
+ RT_CK_DBI(dbip);
+
+ wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK);
+ } else if (BU_STR_EQUAL(dbtype, "file")) {
+ wdbp = wdb_fopen(filename);
+ } else {
+ struct db_i *dbip;
+
+ /* FIXME: this call should not exist. passing pointers as
+ * strings indicates a failure in design and lazy coding.
+ */
+ if (sscanf(filename, "%p", (void **)&dbip) != 1) {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
+ return GED_NULL;
+ }
+
+ if (dbip == DBI_NULL) {
+ int i;
+
+ BU_ALLOC(dbip, struct db_i);
+ dbip->dbi_eof = (b_off_t)-1L;
+ dbip->dbi_fp = NULL;
+ dbip->dbi_mf = NULL;
+ dbip->dbi_read_only = 0;
+
+ /* Initialize fields */
+ for (i = 0; i <RT_DBNHASH; i++) {
+ dbip->dbi_Head[i] = RT_DIR_NULL;
+ }
+
+ dbip->dbi_local2base = 1.0; /* mm */
+ dbip->dbi_base2local = 1.0;
+ dbip->dbi_title = bu_strdup("Untitled BRL-CAD Database");
+ dbip->dbi_uses = 1;
+ dbip->dbi_filename = NULL;
+ dbip->dbi_filepath = NULL;
+ dbip->dbi_version = 5;
+
+ bu_ptbl_init(&dbip->dbi_clients, 128, "dbi_clients[]");
+ dbip->dbi_magic = DBI_MAGIC; /* Now it's valid */
+ }
+
+ /* Could core dump */
+ RT_CK_DBI(dbip);
+
+ if (BU_STR_EQUAL(dbtype, "disk"))
+ wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK);
+ else if (BU_STR_EQUAL(dbtype, "disk_append"))
+ wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK_APPEND_ONLY);
+ else if (BU_STR_EQUAL(dbtype, "inmem"))
+ wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_INMEM);
+ else if (BU_STR_EQUAL(dbtype, "inmem_append"))
+ wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_INMEM_APPEND_ONLY);
+ else {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
+ bu_log("wdb_open %s target type not recognized", dbtype);
+ return GED_NULL;
+ }
+ }
+
+ BU_GET(gedp, struct ged);
+ GED_INIT(gedp, wdbp);
+
+ return gedp;
+}
+
+
+/**
+ * @brief
+ * Open/Create the database and build the in memory directory.
+ */
+struct db_i *
+_ged_open_dbip(const char *filename, int existing_only)
+{
+ struct db_i *dbip;
+
+ /* open database */
+ if (((dbip = db_open(filename, DB_OPEN_READWRITE)) == DBI_NULL) &&
+ ((dbip = db_open(filename, DB_OPEN_READONLY)) == DBI_NULL)) {
+
+ /*
+ * Check to see if we can access the database
+ */
+ if (bu_file_exists(filename, NULL) && !bu_file_readable(filename)) {
+ bu_log("_ged_open_dbip: %s is not readable", filename);
+
+ return DBI_NULL;
+ }
+
+ if (existing_only)
+ return DBI_NULL;
+
+ /* db_create does a db_dirbuild */
+ if ((dbip = db_create(filename, 5)) == DBI_NULL) {
+ bu_log("_ged_open_dbip: failed to create %s\n", filename);
+
+ return DBI_NULL;
+ }
+ } else
+ /* --- Scan geometry database and build in-memory directory --- */
+ db_dirbuild(dbip);
+
+
+ return dbip;
+}
+
+
+HIDDEN int
+_ged_cmp_attr(const void *p1, const void *p2, void *UNUSED(arg))
+{
+ return bu_strcmp(((struct bu_attribute_value_pair *)p1)->name,
+ ((struct bu_attribute_value_pair *)p2)->name);
+}
+
+
+void
+_ged_print_node(struct ged *gedp,
+ struct directory *dp,
+ size_t pathpos,
+ int indentSize,
+ char prefix,
+ unsigned flags,
+ int displayDepth,
+ int currdisplayDepth)
+{
+ size_t i;
+ struct directory *nextdp;
+ struct rt_db_internal intern;
+ struct rt_comb_internal *comb;
+ unsigned aflag = (flags & _GED_TREE_AFLAG);
+ unsigned cflag = (flags & _GED_TREE_CFLAG);
+ struct bu_vls tmp_str = BU_VLS_INIT_ZERO;
+
+ /* cflag = don't show shapes, so return if this is not a combination */
+ if (cflag && !(dp->d_flags & RT_DIR_COMB)) {
+ return;
+ }
+
+ /* set up spacing from the left margin */
+ for (i = 0; i < pathpos; i++) {
+ if (indentSize < 0) {
+ bu_vls_printf(gedp->ged_result_str, "\t");
+ if (aflag)
+ bu_vls_printf(&tmp_str, "\t");
+
+ } else {
+ int j;
+ for (j = 0; j < indentSize; j++) {
+ bu_vls_printf(gedp->ged_result_str, " ");
+ if (aflag)
+ bu_vls_printf(&tmp_str, " ");
+ }
+ }
+ }
+
+ /* add the prefix if desired */
+ if (prefix) {
+ bu_vls_printf(gedp->ged_result_str, "%c ", prefix);
+ if (aflag)
+ bu_vls_printf(&tmp_str, " ");
+ }
+
+ /* now the object name */
+ bu_vls_printf(gedp->ged_result_str, "%s", dp->d_namep);
+
+ /* suffix name if appropriate */
+ /* Output Comb and Region flags (-F?) */
+ if (dp->d_flags & RT_DIR_COMB)
+ bu_vls_printf(gedp->ged_result_str, "/");
+ if (dp->d_flags & RT_DIR_REGION)
+ bu_vls_printf(gedp->ged_result_str, "R");
+
+ bu_vls_printf(gedp->ged_result_str, "\n");
+
+ /* output attributes if any and if desired */
+ if (aflag) {
+ struct bu_attribute_value_set avs;
+ bu_avs_init_empty(&avs);
+ if (db5_get_attributes(gedp->ged_wdbp->dbip, &avs, dp)) {
+ bu_vls_printf(gedp->ged_result_str, "Cannot get attributes for
object %s\n", dp->d_namep);
+ /* need a bombing macro or set an error code here: return
GED_ERROR; */
+ bu_vls_free(&tmp_str);
+ return;
+ }
+
+ /* FIXME: manually list all the attributes, if any. should be
+ * calling ged_attr() show so output formatting is consistent.
+ */
+ if (avs.count) {
+ struct bu_attribute_value_pair *avpp;
+ int max_attr_name_len = 0;
+
+ /* sort attribute-value set array by attribute name */
+ bu_sort(&avs.avp[0], avs.count, sizeof(struct
bu_attribute_value_pair), _ged_cmp_attr, NULL);
+
+ for (i = 0, avpp = avs.avp; i < avs.count; i++, avpp++) {
+ int len = (int)strlen(avpp->name);
+ if (len > max_attr_name_len) {
+ max_attr_name_len = len;
+ }
+ }
+ for (i = 0, avpp = avs.avp; i < avs.count; i++, avpp++) {
+ bu_vls_printf(gedp->ged_result_str, "%s @ %-*.*s %s\n",
+ tmp_str.vls_str,
+ max_attr_name_len, max_attr_name_len,
+ avpp->name, avpp->value);
+ }
+ }
+ bu_vls_free(&tmp_str);
+ }
+
+ if (!(dp->d_flags & RT_DIR_COMB))
+ return;
+
+ /*
+ * This node is a combination (e.g., a directory).
+ * Process all the arcs (e.g., directory members).
+ */
+
+ if (rt_db_get_internal(&intern, dp, gedp->ged_wdbp->dbip, (fastf_t *)NULL,
&rt_uniresource) < 0) {
+ bu_vls_printf(gedp->ged_result_str, "Database read error, aborting");
+ return;
+ }
+ comb = (struct rt_comb_internal *)intern.idb_ptr;
+
+ if (comb->tree) {
+ size_t node_count;
+ size_t actual_count;
+ struct rt_tree_array *rt_tree_array;
+
+ if (comb->tree && db_ck_v4gift_tree(comb->tree) < 0) {
+ db_non_union_push(comb->tree, &rt_uniresource);
+ if (db_ck_v4gift_tree(comb->tree) < 0) {
+ bu_vls_printf(gedp->ged_result_str, "Cannot flatten tree for
listing");
+ return;
+ }
+ }
+ node_count = db_tree_nleaves(comb->tree);
+ if (node_count > 0) {
+ rt_tree_array = (struct rt_tree_array *)bu_calloc(node_count,
+ sizeof(struct
rt_tree_array), "tree list");
+ actual_count = (struct rt_tree_array *)db_flatten_tree(
+ rt_tree_array, comb->tree, OP_UNION,
+ 1, &rt_uniresource) - rt_tree_array;
+ BU_ASSERT(actual_count == node_count);
+ comb->tree = TREE_NULL;
+ } else {
+ actual_count = 0;
+ rt_tree_array = NULL;
+ }
+
+ for (i = 0; i < actual_count; i++) {
+ char op;
+
+ switch (rt_tree_array[i].tl_op) {
+ case OP_UNION:
+ op = DB_OP_UNION;
+ break;
+ case OP_INTERSECT:
+ op = DB_OP_INTERSECT;
+ break;
+ case OP_SUBTRACT:
+ op = DB_OP_SUBTRACT;
+ break;
+ default:
+ op = '?';
+ break;
+ }
+
+ if ((nextdp = db_lookup(gedp->ged_wdbp->dbip,
rt_tree_array[i].tl_tree->tr_l.tl_name, LOOKUP_QUIET)) == RT_DIR_NULL) {
+ size_t j;
+
+ for (j = 0; j < pathpos+1; j++)
+ bu_vls_printf(gedp->ged_result_str, "\t");
+
+ bu_vls_printf(gedp->ged_result_str, "%c ", op);
+ bu_vls_printf(gedp->ged_result_str, "%s\n",
rt_tree_array[i].tl_tree->tr_l.tl_name);
+ } else {
+ if (currdisplayDepth < displayDepth) {
+ _ged_print_node(gedp, nextdp, pathpos+1, indentSize, op,
flags, displayDepth, currdisplayDepth+1);
+ }
+ }
+ db_free_tree(rt_tree_array[i].tl_tree, &rt_uniresource);
+ }
+ if (rt_tree_array) bu_free((char *)rt_tree_array, "printnode:
rt_tree_array");
+ }
+ rt_db_free_internal(&intern);
+}
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Modified: brlcad/branches/bioh/src/libged/ged_util/ged_util.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged_util/ged_util.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/ged_util/ged_util.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -38,7 +38,7 @@
#include "bu/vls.h"
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
_ged_results_init(struct ged_results *results)
Modified: brlcad/branches/bioh/src/libged/get_autoview/get_autoview.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_autoview/get_autoview.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/get_autoview/get_autoview.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -27,7 +27,7 @@
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
* Get the view size and center such that all displayed solids would be in view
Modified: brlcad/branches/bioh/src/libged/get_comb/get_comb.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_comb/get_comb.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/get_comb/get_comb.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
static void
Modified: brlcad/branches/bioh/src/libged/get_eyemodel/get_eyemodel.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_eyemodel/get_eyemodel.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/get_eyemodel/get_eyemodel.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/get_obj_bounds/get_obj_bounds.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_obj_bounds/get_obj_bounds.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/get_obj_bounds/get_obj_bounds.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "bu/str.h"
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/get_solid_kp/get_solid_kp.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_solid_kp/get_solid_kp.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/get_solid_kp/get_solid_kp.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include "nmg.h"
#include "raytrace.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/get_type/get_type.c
===================================================================
--- brlcad/branches/bioh/src/libged/get_type/get_type.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/get_type/get_type.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/gqa/gqa.c
===================================================================
--- brlcad/branches/bioh/src/libged/gqa/gqa.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/gqa/gqa.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -48,7 +48,7 @@
#include "bn/plot3.h"
#include "analyze.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
struct analyze_densities *_gd_densities;
char *_gd_densities_source;
Modified: brlcad/branches/bioh/src/libged/grid/grid.c
===================================================================
--- brlcad/branches/bioh/src/libged/grid/grid.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/grid/grid.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "vmath.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/grid2model_lu/grid2model_lu.c
===================================================================
--- brlcad/branches/bioh/src/libged/grid2model_lu/grid2model_lu.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/grid2model_lu/grid2model_lu.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/grid2view_lu/grid2view_lu.c
===================================================================
--- brlcad/branches/bioh/src/libged/grid2view_lu/grid2view_lu.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/grid2view_lu/grid2view_lu.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/group/group.c
===================================================================
--- brlcad/branches/bioh/src/libged/group/group.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/group/group.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/heal/heal.c
===================================================================
--- brlcad/branches/bioh/src/libged/heal/heal.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/heal/heal.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "bg/chull.h"
#include "rt/geom.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/hide/hide.c
===================================================================
--- brlcad/branches/bioh/src/libged/hide/hide.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/hide/hide.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/how/how.c
===================================================================
--- brlcad/branches/bioh/src/libged/how/how.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/how/how.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "bu/cmd.h"
#include "bu/str.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/illum/illum.c
===================================================================
--- brlcad/branches/bioh/src/libged/illum/illum.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/illum/illum.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -27,7 +27,7 @@
#include <string.h>
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/importFg4Section/importFg4Section.c
===================================================================
--- brlcad/branches/bioh/src/libged/importFg4Section/importFg4Section.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/importFg4Section/importFg4Section.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
*/
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
extern int wdb_importFg4Section_cmd(void *data, int argc, const char *argv[]);
Modified: brlcad/branches/bioh/src/libged/inside/inside.c
===================================================================
--- brlcad/branches/bioh/src/libged/inside/inside.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/inside/inside.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -38,7 +38,7 @@
#include "raytrace.h"
#include "rt/db4.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static char *p_arb4[] = {
Modified: brlcad/branches/bioh/src/libged/instance/instance.c
===================================================================
--- brlcad/branches/bioh/src/libged/instance/instance.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/instance/instance.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/isize/isize.c
===================================================================
--- brlcad/branches/bioh/src/libged/isize/isize.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/isize/isize.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/joint/joint.c
===================================================================
--- brlcad/branches/bioh/src/libged/joint/joint.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/joint/joint.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -36,7 +36,7 @@
#include "raytrace.h"
#include "./joint.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static unsigned int J_DEBUG = 0;
#define DEBUG_J_MESH 0x00000001
Modified: brlcad/branches/bioh/src/libged/joint2/joint2.c
===================================================================
--- brlcad/branches/bioh/src/libged/joint2/joint2.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/joint2/joint2.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -33,7 +33,7 @@
#include "rt/geom.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static struct _ged_funtab joint_subcommand_table[] = {
{"joint ", "", "Joint command table",
NULL, 0, 0, FALSE},
Modified: brlcad/branches/bioh/src/libged/keep/keep.c
===================================================================
--- brlcad/branches/bioh/src/libged/keep/keep.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/keep/keep.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "bu/getopt.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
struct keep_node_data {
Modified: brlcad/branches/bioh/src/libged/keypoint/keypoint.c
===================================================================
--- brlcad/branches/bioh/src/libged/keypoint/keypoint.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/keypoint/keypoint.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/kill/kill.c
===================================================================
--- brlcad/branches/bioh/src/libged/kill/kill.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/kill/kill.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/killall/killall.c
===================================================================
--- brlcad/branches/bioh/src/libged/killall/killall.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/killall/killall.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/killrefs/killrefs.c
===================================================================
--- brlcad/branches/bioh/src/libged/killrefs/killrefs.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/killrefs/killrefs.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/killtree/killtree.c
===================================================================
--- brlcad/branches/bioh/src/libged/killtree/killtree.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/killtree/killtree.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define AV_STEP BU_PAGE_SIZE
Modified: brlcad/branches/bioh/src/libged/lint/lint.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/lint/lint.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/lint/lint.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -32,7 +32,7 @@
#include "bu/opt.h"
#include "bg/trimesh.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
}
struct _ged_lint_opts {
Modified: brlcad/branches/bioh/src/libged/list/list.c
===================================================================
--- brlcad/branches/bioh/src/libged/list/list.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/list/list.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -32,7 +32,7 @@
#include "bu/getopt.h"
#include "bu/units.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
void
Modified: brlcad/branches/bioh/src/libged/loadview/loadview.c
===================================================================
--- brlcad/branches/bioh/src/libged/loadview/loadview.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/loadview/loadview.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
vect_t _ged_eye_model;
Modified: brlcad/branches/bioh/src/libged/lod/lod.c
===================================================================
--- brlcad/branches/bioh/src/libged/lod/lod.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/lod/lod.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/lookat/lookat.c
===================================================================
--- brlcad/branches/bioh/src/libged/lookat/lookat.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/lookat/lookat.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/ls/ls.c
===================================================================
--- brlcad/branches/bioh/src/libged/ls/ls.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/ls/ls.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -34,7 +34,7 @@
#include "bu/sort.h"
#include "bu/units.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static void
vls_long_dpp(struct ged *gedp,
Modified: brlcad/branches/bioh/src/libged/lt/lt.c
===================================================================
--- brlcad/branches/bioh/src/libged/lt/lt.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/lt/lt.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/getopt.h"
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static int
Modified: brlcad/branches/bioh/src/libged/m2v_point/m2v_point.c
===================================================================
--- brlcad/branches/bioh/src/libged/m2v_point/m2v_point.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/m2v_point/m2v_point.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <ctype.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/make/make.c
===================================================================
--- brlcad/branches/bioh/src/libged/make/make.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/make/make.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -34,7 +34,7 @@
#include "rt/geom.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/match/match.c
===================================================================
--- brlcad/branches/bioh/src/libged/match/match.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/match/match.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "bu/path.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/mater/mater.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/mater/mater.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/mater/mater.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -35,7 +35,7 @@
#include "bu/path.h"
#include "analyze.h"
#include "ged.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#include <string.h>
Modified: brlcad/branches/bioh/src/libged/model2grid_lu/model2grid_lu.c
===================================================================
--- brlcad/branches/bioh/src/libged/model2grid_lu/model2grid_lu.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/model2grid_lu/model2grid_lu.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/model2view/model2view.c
===================================================================
--- brlcad/branches/bioh/src/libged/model2view/model2view.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/model2view/model2view.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
/**
Modified: brlcad/branches/bioh/src/libged/model2view_lu/model2view_lu.c
===================================================================
--- brlcad/branches/bioh/src/libged/model2view_lu/model2view_lu.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/model2view_lu/model2view_lu.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/move/move.c
===================================================================
--- brlcad/branches/bioh/src/libged/move/move.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/move/move.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -31,7 +31,7 @@
#include "bu/cmd.h"
#include "bu/str.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/move_all/move_all.c
===================================================================
--- brlcad/branches/bioh/src/libged/move_all/move_all.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/move_all/move_all.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -33,7 +33,7 @@
#include "bu/getopt.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
HIDDEN int
move_all_func(struct ged *gedp, int nflag, const char *old_name, const char
*new_name)
Modified: brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
===================================================================
--- brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/move_arb_edge/move_arb_edge.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -32,7 +32,7 @@
#include "rt/arb_edit.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
===================================================================
--- brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/move_arb_face/move_arb_face.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "rt/geom.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/* The arbX_faces arrays are used for relative face movement. */
Modified: brlcad/branches/bioh/src/libged/mrot/mrot.c
===================================================================
--- brlcad/branches/bioh/src/libged/mrot/mrot.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/mrot/mrot.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/nirt/nirt.c
===================================================================
--- brlcad/branches/bioh/src/libged/nirt/nirt.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/nirt/nirt.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -48,8 +48,8 @@
#include "bu/process.h"
#include "vmath.h"
-#include "./qray.h"
-#include "./ged_private.h"
+#include "../qray.h"
+#include "../ged_private.h"
/**
* Invoke nirt with the current view & stuff
Modified: brlcad/branches/bioh/src/libged/nmg/nmg.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg/nmg.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/nmg/nmg.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "rt/geom.h"
#include "wdb.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
extern int ged_nmg_mm(struct ged *gedp, int argc, const char *argv[]);
extern int ged_nmg_cmface(struct ged *gedp, int argc, const char *argv[]);
Modified: brlcad/branches/bioh/src/libged/nmg_cmface/nmg_cmface.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_cmface/nmg_cmface.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_cmface/nmg_cmface.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -32,7 +32,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
struct tmp_v {
point_t pt;
Modified: brlcad/branches/bioh/src/libged/nmg_collapse/nmg_collapse.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_collapse/nmg_collapse.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_collapse/nmg_collapse.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/nmg_fix_normals/nmg_fix_normals.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_fix_normals/nmg_fix_normals.c
2020-07-17 16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_fix_normals/nmg_fix_normals.c
2020-07-17 17:21:01 UTC (rev 76362)
@@ -31,7 +31,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/nmg_kill_f/nmg_kill_f.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_kill_f/nmg_kill_f.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_kill_f/nmg_kill_f.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
void remove_face(const struct model* m, long int fid)
{
Modified: brlcad/branches/bioh/src/libged/nmg_kill_v/nmg_kill_v.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_kill_v/nmg_kill_v.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_kill_v/nmg_kill_v.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
void remove_vertex(const struct model* m, point_t rv)
{
Modified: brlcad/branches/bioh/src/libged/nmg_make_v/nmg_make_v.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_make_v/nmg_make_v.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_make_v/nmg_make_v.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -32,7 +32,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
struct tmp_v {
point_t pt;
Modified: brlcad/branches/bioh/src/libged/nmg_mm/nmg_mm.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_mm/nmg_mm.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_mm/nmg_mm.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -31,7 +31,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
ged_nmg_mm(struct ged *gedp, int argc, const char *argv[])
Modified: brlcad/branches/bioh/src/libged/nmg_move_v/nmg_move_v.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_move_v/nmg_move_v.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_move_v/nmg_move_v.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
void move_vertex(const struct model* m, point_t v_old, point_t v_new)
{
Modified: brlcad/branches/bioh/src/libged/nmg_simplify/nmg_simplify.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg_simplify/nmg_simplify.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/nmg_simplify/nmg_simplify.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "bu/cmd.h"
#include "rt/geom.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/ocenter/ocenter.c
===================================================================
--- brlcad/branches/bioh/src/libged/ocenter/ocenter.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/ocenter/ocenter.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/open/open.c
===================================================================
--- brlcad/branches/bioh/src/libged/open/open.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/open/open.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/orient/orient.c
===================================================================
--- brlcad/branches/bioh/src/libged/orient/orient.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/orient/orient.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/orotate/orotate.c
===================================================================
--- brlcad/branches/bioh/src/libged/orotate/orotate.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/orotate/orotate.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/oscale/oscale.c
===================================================================
--- brlcad/branches/bioh/src/libged/oscale/oscale.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/oscale/oscale.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/otranslate/otranslate.c
===================================================================
--- brlcad/branches/bioh/src/libged/otranslate/otranslate.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/otranslate/otranslate.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -26,7 +26,7 @@
#include "common.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/overlay/overlay.c
===================================================================
--- brlcad/branches/bioh/src/libged/overlay/overlay.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/overlay/overlay.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -31,7 +31,7 @@
#include "icv.h"
#include "dm.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static int
image_mime(struct bu_vls *msg, size_t argc, const char **argv, void *set_mime)
Modified: brlcad/branches/bioh/src/libged/pathlist/pathlist.c
===================================================================
--- brlcad/branches/bioh/src/libged/pathlist/pathlist.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/pathlist/pathlist.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static int pathListNoLeaf = 0;
Modified: brlcad/branches/bioh/src/libged/pathsum/pathsum.c
===================================================================
--- brlcad/branches/bioh/src/libged/pathsum/pathsum.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/pathsum/pathsum.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/cmd.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/perspective/perspective.c
===================================================================
--- brlcad/branches/bioh/src/libged/perspective/perspective.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/perspective/perspective.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/plot/plot.c
===================================================================
--- brlcad/branches/bioh/src/libged/plot/plot.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/plot/plot.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "bn.h"
#include "bn/plot3.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#if defined(HAVE_POPEN) && !defined(HAVE_DECL_POPEN) && !defined(popen)
extern FILE *popen(const char *command, const char *type);
Modified: brlcad/branches/bioh/src/libged/pmat/pmat.c
===================================================================
--- brlcad/branches/bioh/src/libged/pmat/pmat.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/pmat/pmat.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/pmodel2view/pmodel2view.c
===================================================================
--- brlcad/branches/bioh/src/libged/pmodel2view/pmodel2view.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/pmodel2view/pmodel2view.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/png/png.c
===================================================================
--- brlcad/branches/bioh/src/libged/png/png.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/png/png.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -36,7 +36,7 @@
#include "bn.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static unsigned int size = 512;
Modified: brlcad/branches/bioh/src/libged/pnts/pnts.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/pnts/pnts.cpp 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/pnts/pnts.cpp 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -44,8 +44,8 @@
#include "rt/geom.h"
#include "wdb.h"
#include "analyze.h"
-#include "./ged_private.h"
-#include "./pnts_util.h"
+#include "../ged_private.h"
+#include "../pnts_util.h"
}
HIDDEN void
Copied: brlcad/branches/bioh/src/libged/pnts_util.c (from rev 76361,
brlcad/branches/bioh/src/libged/pnts_util/pnts_util.c)
===================================================================
--- brlcad/branches/bioh/src/libged/pnts_util.c (rev 0)
+++ brlcad/branches/bioh/src/libged/pnts_util.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -0,0 +1,403 @@
+/* P N T S _ U T I L. C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2020 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/pnts_util.c
+ *
+ * utility functionality for simple Point Set (pnts) primitive operations.
+ *
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "bu/color.h"
+#include "rt/geom.h"
+#include "./ged_private.h"
+#include "./pnts_util.h"
+
+#define PNT_V_IN(_pt, _key, _v) \
+ switch (_key) { \
+ case 'x': \
+ ((struct _pt *)point)->v[X] = _v; \
+ break; \
+ case 'y': \
+ ((struct _pt *)point)->v[Y] = _v; \
+ break; \
+ case 'z': \
+ ((struct _pt *)point)->v[Z] = _v; \
+ break; \
+ }
+
+#define PNT_C_IN(_pt, _key, _v) \
+ switch (_key) { \
+ case 'r': \
+ ((struct _pt *)point)->c.buc_rgb[0] = _v; \
+ break; \
+ case 'g': \
+ ((struct _pt *)point)->c.buc_rgb[1] = _v; \
+ break; \
+ case 'b': \
+ ((struct _pt *)point)->c.buc_rgb[2] = _v; \
+ break; \
+ }
+
+#define PNT_S_IN(_pt, _key, _v) \
+ switch (_key) { \
+ case 's': \
+ ((struct _pt *)point)->s = _v; \
+ break; \
+ }
+
+#define PNT_N_IN(_pt, _key, _v) \
+ switch (_key) { \
+ case 'i': \
+ ((struct _pt *)point)->n[X] = _v; \
+ break; \
+ case 'j': \
+ ((struct _pt *)point)->n[Y] = _v; \
+ break; \
+ case 'k': \
+ ((struct _pt *)point)->n[Z] = _v; \
+ break; \
+ }
+
+
+const char *
+_ged_pnt_default_fmt_str(rt_pnt_type type) {
+ static const char *pntfmt = "xyz";
+ static const char *colfmt = "xyzrgb";
+ static const char *scafmt = "xyzs";
+ static const char *nrmfmt = "xyzijk";
+ static const char *colscafmt = "xyzsrgb";
+ static const char *colnrmfmt = "xyzijkrgb";
+ static const char *scanrmfmt = "xyzijks";
+ static const char *colscanrmfmt = "xyzijksrgb";
+
+ switch (type) {
+ case RT_PNT_TYPE_PNT:
+ return pntfmt;
+ break;
+ case RT_PNT_TYPE_COL:
+ return colfmt;
+ break;
+ case RT_PNT_TYPE_SCA:
+ return scafmt;
+ break;
+ case RT_PNT_TYPE_NRM:
+ return nrmfmt;
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ return colscafmt;
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ return colnrmfmt;
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ return scanrmfmt;
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ return colscanrmfmt;
+ break;
+ default:
+ return NULL;
+ break;
+ }
+}
+
+void
+_ged_pnt_v_set(void *point, rt_pnt_type type, char key, fastf_t val) {
+ switch (type) {
+ case RT_PNT_TYPE_PNT:
+ PNT_V_IN(pnt, key, val);
+ break;
+ case RT_PNT_TYPE_COL:
+ PNT_V_IN(pnt_color, key, val);
+ break;
+ case RT_PNT_TYPE_SCA:
+ PNT_V_IN(pnt_scale, key, val);
+ break;
+ case RT_PNT_TYPE_NRM:
+ PNT_V_IN(pnt_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ PNT_V_IN(pnt_color_scale, key, val);
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ PNT_V_IN(pnt_color_normal, key, val);
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ PNT_V_IN(pnt_scale_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ PNT_V_IN(pnt_color_scale_normal, key, val);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+_ged_pnt_c_set(void *point, rt_pnt_type type, char key, fastf_t val) {
+ switch (type) {
+ case RT_PNT_TYPE_COL:
+ PNT_C_IN(pnt_color, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ PNT_C_IN(pnt_color_scale, key, val);
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ PNT_C_IN(pnt_color_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ PNT_C_IN(pnt_color_scale_normal, key, val);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+_ged_pnt_s_set(void *point, rt_pnt_type type, char key, fastf_t val) {
+ switch (type) {
+ case RT_PNT_TYPE_SCA:
+ PNT_S_IN(pnt_scale, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ PNT_S_IN(pnt_color_scale, key, val);
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ PNT_S_IN(pnt_scale_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ PNT_S_IN(pnt_color_scale_normal, key, val);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+_ged_pnt_n_set(void *point, rt_pnt_type type, char key, fastf_t val) {
+ switch (type) {
+ case RT_PNT_TYPE_NRM:
+ PNT_N_IN(pnt_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ PNT_N_IN(pnt_color_normal, key, val);
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ PNT_N_IN(pnt_scale_normal, key, val);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ PNT_N_IN(pnt_color_scale_normal, key, val);
+ break;
+ default:
+ break;
+ }
+}
+
+
+rt_pnt_type
+_ged_pnts_fmt_type(const char *fc)
+{
+ int has_pnt = 0;
+ int has_nrm = 0;
+ int has_s = 0;
+ int has_c = 0;
+
+ if (!fc || !strlen(fc)) return RT_PNT_UNKNOWN;
+ if (strchr(fc, 'x') && strchr(fc, 'y') && strchr(fc, 'z')) has_pnt = 1;
+ if (strchr(fc, 'i') && strchr(fc, 'j') && strchr(fc, 'k')) has_nrm = 1;
+ if (strchr(fc, 's')) has_s = 1;
+ if (strchr(fc, 'r') && strchr(fc, 'g') && strchr(fc, 'b')) has_c = 1;
+
+ if (has_pnt && has_nrm && has_s && has_c) return RT_PNT_TYPE_COL_SCA_NRM;
+ if (has_pnt && has_nrm && has_s) return RT_PNT_TYPE_SCA_NRM;
+ if (has_pnt && has_nrm && has_c) return RT_PNT_TYPE_COL_NRM;
+ if (has_pnt && has_nrm) return RT_PNT_TYPE_NRM;
+ if (has_pnt && has_s && has_c) return RT_PNT_TYPE_COL_SCA;
+ if (has_pnt && has_s) return RT_PNT_TYPE_SCA;
+ if (has_pnt && has_c) return RT_PNT_TYPE_SCA;
+ if (has_pnt) return RT_PNT_TYPE_PNT;
+
+ return RT_PNT_UNKNOWN;
+}
+
+rt_pnt_type
+_ged_pnts_fmt_guess(int numcnt) {
+ switch (numcnt) {
+ case 3:
+ return RT_PNT_TYPE_PNT;
+ break;
+ case 4:
+ return RT_PNT_TYPE_SCA;
+ break;
+ case 6:
+ bu_log("Warning - found 6 numbers, which is ambiguous - assuming
RT_PNT_TYPE_NRM. To read in as RT_PNT_TYPE_COL, specify the format string
\"xyzrgb\"\n");
+ return RT_PNT_TYPE_NRM;
+ break;
+ case 7:
+ bu_log("Warning - found 7 numbers, which is ambiguous - assuming
RT_PNT_TYPE_COL_SCA. To read in as RT_PNT_TYPE_SCA_NRM, specify the format
string \"xyzijks\"\n");
+ return RT_PNT_TYPE_COL_SCA;
+ break;
+ case 9:
+ return RT_PNT_TYPE_COL_NRM;
+ break;
+ case 10:
+ return RT_PNT_TYPE_COL_SCA_NRM;
+ break;
+ default:
+ return RT_PNT_UNKNOWN;
+ break;
+ }
+}
+
+int
+_ged_pnts_fmt_match(rt_pnt_type t, int numcnt)
+{
+ if (t == RT_PNT_UNKNOWN || numcnt < 3 || numcnt > 10) return 0;
+
+ if (numcnt == 3 && t == RT_PNT_TYPE_PNT) return 1;
+ if (numcnt == 4 && t == RT_PNT_TYPE_SCA) return 1;
+ if (numcnt == 6 && t == RT_PNT_TYPE_NRM) return 1;
+ if (numcnt == 6 && t == RT_PNT_TYPE_COL) return 1;
+ if (numcnt == 7 && t == RT_PNT_TYPE_COL_SCA) return 1;
+ if (numcnt == 7 && t == RT_PNT_TYPE_SCA_NRM) return 1;
+ if (numcnt == 9 && t == RT_PNT_TYPE_COL_NRM) return 1;
+ if (numcnt == 10 && t == RT_PNT_TYPE_COL_SCA_NRM) return 1;
+
+ return 0;
+}
+
+void
+_ged_pnts_init_head_pnt(struct rt_pnts_internal *pnts)
+{
+ if (!pnts) return;
+ switch (pnts->type) {
+ case RT_PNT_TYPE_PNT:
+ BU_LIST_INIT(&(((struct pnt *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_COL:
+ BU_LIST_INIT(&(((struct pnt_color *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_SCA:
+ BU_LIST_INIT(&(((struct pnt_scale *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_NRM:
+ BU_LIST_INIT(&(((struct pnt_normal *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ BU_LIST_INIT(&(((struct pnt_color_scale *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ BU_LIST_INIT(&(((struct pnt_color_normal *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ BU_LIST_INIT(&(((struct pnt_scale_normal *)pnts->point)->l));
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ BU_LIST_INIT(&(((struct pnt_color_scale_normal *)pnts->point)->l));
+ break;
+ default:
+ break;
+ }
+}
+
+
+void *
+_ged_pnts_new_pnt(rt_pnt_type t)
+{
+ void *point = NULL;
+ if (t == RT_PNT_UNKNOWN) return NULL;
+ switch (t) {
+ case RT_PNT_TYPE_PNT:
+ BU_ALLOC(point, struct pnt);
+ break;
+ case RT_PNT_TYPE_COL:
+ BU_ALLOC(point, struct pnt_color);
+ break;
+ case RT_PNT_TYPE_SCA:
+ BU_ALLOC(point, struct pnt_scale);
+ break;
+ case RT_PNT_TYPE_NRM:
+ BU_ALLOC(point, struct pnt_normal);
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ BU_ALLOC(point, struct pnt_color_scale);
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ BU_ALLOC(point, struct pnt_color_normal);
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ BU_ALLOC(point, struct pnt_scale_normal);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ BU_ALLOC(point, struct pnt_color_scale_normal);
+ break;
+ default:
+ break;
+ }
+ return point;
+}
+
+void
+_ged_pnts_add(struct rt_pnts_internal *pnts, void *point)
+{
+ switch (pnts->type) {
+ case RT_PNT_TYPE_PNT:
+ BU_LIST_PUSH(&(((struct pnt *)pnts->point)->l), &((struct pnt
*)point)->l);
+ break;
+ case RT_PNT_TYPE_COL:
+ BU_LIST_PUSH(&(((struct pnt_color *)pnts->point)->l), &((struct
pnt_color *)point)->l);
+ break;
+ case RT_PNT_TYPE_SCA:
+ BU_LIST_PUSH(&(((struct pnt_scale *)pnts->point)->l), &((struct
pnt_scale *)point)->l);
+ break;
+ case RT_PNT_TYPE_NRM:
+ BU_LIST_PUSH(&(((struct pnt_normal *)pnts->point)->l), &((struct
pnt_normal *)point)->l);
+ break;
+ case RT_PNT_TYPE_COL_SCA:
+ BU_LIST_PUSH(&(((struct pnt_color_scale *)pnts->point)->l),
&((struct pnt_color_scale *)point)->l);
+ break;
+ case RT_PNT_TYPE_COL_NRM:
+ BU_LIST_PUSH(&(((struct pnt_color_normal *)pnts->point)->l),
&((struct pnt_color_normal *)point)->l);
+ break;
+ case RT_PNT_TYPE_SCA_NRM:
+ BU_LIST_PUSH(&(((struct pnt_scale_normal *)pnts->point)->l),
&((struct pnt_scale_normal *)point)->l);
+ break;
+ case RT_PNT_TYPE_COL_SCA_NRM:
+ BU_LIST_PUSH(&(((struct pnt_color_scale_normal *)pnts->point)->l),
&((struct pnt_color_scale_normal *)point)->l);
+ break;
+ default:
+ break;
+ }
+}
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Modified: brlcad/branches/bioh/src/libged/prcolor/prcolor.c
===================================================================
--- brlcad/branches/bioh/src/libged/prcolor/prcolor.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/prcolor/prcolor.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -32,7 +32,7 @@
#include "rt/db4.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static void
Modified: brlcad/branches/bioh/src/libged/prefix/prefix.c
===================================================================
--- brlcad/branches/bioh/src/libged/prefix/prefix.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/prefix/prefix.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
static void
Modified: brlcad/branches/bioh/src/libged/preview/preview.c
===================================================================
--- brlcad/branches/bioh/src/libged/preview/preview.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/preview/preview.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -34,7 +34,7 @@
#include "bu/cmd.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static struct bn_vlblock *preview_vbp;
Modified: brlcad/branches/bioh/src/libged/process/process.c
===================================================================
--- brlcad/branches/bioh/src/libged/process/process.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/process/process.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include "bu/path.h"
#include "bu/process.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
HIDDEN void
Modified: brlcad/branches/bioh/src/libged/protate/protate.c
===================================================================
--- brlcad/branches/bioh/src/libged/protate/protate.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/protate/protate.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "rt/geom.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/ps/ps.c
===================================================================
--- brlcad/branches/bioh/src/libged/ps/ps.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/ps/ps.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -35,7 +35,7 @@
#include "bn.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
static fastf_t ps_default_ppi = 72.0;
Modified: brlcad/branches/bioh/src/libged/pscale/pscale.c
===================================================================
--- brlcad/branches/bioh/src/libged/pscale/pscale.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/pscale/pscale.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -30,7 +30,7 @@
#include "rt/geom.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/pset/pset.c
===================================================================
--- brlcad/branches/bioh/src/libged/pset/pset.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/pset/pset.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -30,7 +30,7 @@
#include "rt/geom.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c
===================================================================
--- brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c 2020-07-17
16:45:51 UTC (rev 76361)
+++ brlcad/branches/bioh/src/libged/ptranslate/ptranslate.c 2020-07-17
17:21:01 UTC (rev 76362)
@@ -30,7 +30,7 @@
#include "rt/geom.h"
#include "raytrace.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/pull/pull.c
===================================================================
--- brlcad/branches/bioh/src/libged/pull/pull.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/pull/pull.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -34,7 +34,7 @@
#include "bu/getopt.h"
#include "bn.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
void
Modified: brlcad/branches/bioh/src/libged/push/push.c
===================================================================
--- brlcad/branches/bioh/src/libged/push/push.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/push/push.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -32,7 +32,7 @@
#include "bu/cmd.h"
#include "bu/getopt.h"
-#include "./ged_private.h"
+#include "../ged_private.h"
#define PUSH_MAGIC_ID 0x50495323
Modified: brlcad/branches/bioh/src/libged/put_comb/put_comb.c
===================================================================
--- brlcad/branches/bioh/src/libged/put_comb/put_comb.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/put_comb/put_comb.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
struct line_list{
Modified: brlcad/branches/bioh/src/libged/putmat/putmat.c
===================================================================
--- brlcad/branches/bioh/src/libged/putmat/putmat.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/putmat/putmat.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
int
Modified: brlcad/branches/bioh/src/libged/qray/qray.c
===================================================================
--- brlcad/branches/bioh/src/libged/qray/qray.c 2020-07-17 16:45:51 UTC (rev
76361)
+++ brlcad/branches/bioh/src/libged/qray/qray.c 2020-07-17 17:21:01 UTC (rev
76362)
@@ -33,7 +33,7 @@
#include "vmath.h"
#include "ged.h"
-#include "./qray.h"
+#include "../qray.h"
static void qray_print_fmts(struct ged *gedp);
Modified: brlcad/branches/bioh/src/libged/qvrot/qvrot.c
===================================================================
--- brlcad/branches/bioh/src/libged/qvrot/qvrot.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/qvrot/qvrot.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <string.h>
-#include "./ged_private.h"
+#include "../ged_private.h"
/*
Modified: brlcad/branches/bioh/src/libged/rcodes/rcodes.c
===================================================================
--- brlcad/branches/bioh/src/libged/rcodes/rcodes.c 2020-07-17 16:45:51 UTC
(rev 76361)
+++ brlcad/branches/bioh/src/libged/rcodes/rcodes.c 2020-07-17 17:21:01 UTC
(rev 76362)
@@ -29,7 +29,7 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
