Revision: 77227
http://sourceforge.net/p/brlcad/code/77227
Author: starseeker
Date: 2020-09-25 15:57:21 +0000 (Fri, 25 Sep 2020)
Log Message:
-----------
dplot command needs to make the transition to the new ged command structure.
Modified Paths:
--------------
brlcad/branches/brep-debug/src/libged/brep/CMakeLists.txt
brlcad/branches/brep-debug/src/libged/brep/brep.cpp
brlcad/branches/brep-debug/src/libged/brep/ged_brep.h
Added Paths:
-----------
brlcad/branches/brep-debug/src/libged/brep/dplot.c
brlcad/branches/brep-debug/src/libged/brep/dplot_parser.lemon
brlcad/branches/brep-debug/src/libged/brep/dplot_reader.c
brlcad/branches/brep-debug/src/libged/brep/dplot_reader.h
brlcad/branches/brep-debug/src/libged/brep/dplot_scanner.perplex
Removed Paths:
-------------
brlcad/branches/brep-debug/src/libged/dplot_parser.lemon
brlcad/branches/brep-debug/src/libged/dplot_reader.c
brlcad/branches/brep-debug/src/libged/dplot_reader.h
brlcad/branches/brep-debug/src/libged/dplot_scanner.perplex
Modified: brlcad/branches/brep-debug/src/libged/brep/CMakeLists.txt
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/CMakeLists.txt 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/brep/CMakeLists.txt 2020-09-25
15:57:21 UTC (rev 77227)
@@ -1,3 +1,18 @@
+
+set(DPLOT_READER dplot)
+
+PERPLEX_TARGET(
+ ${DPLOT_READER}_scanner
+ ${DPLOT_READER}_scanner.perplex
+ OUT_SRC_FILE ${DPLOT_READER}_scanner.c
+ OUT_HDR_FILE ${DPLOT_READER}_scanner.h)
+LEMON_TARGET(
+ ${DPLOT_READER}_parser
+ ${DPLOT_READER}_parser.lemon
+ OUT_SRC_FILE ${DPLOT_READER}_parser.c
+ OUT_HDR_FILE ${DPLOT_READER}_parser.h)
+ADD_PERPLEX_LEMON_DEPENDENCY(${DPLOT_READER}_scanner ${DPLOT_READER}_parser)
+
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_BINARY_DIR}/include
@@ -4,9 +19,14 @@
${BRLCAD_SOURCE_DIR}/include
${BU_INCLUDE_DIRS}
${GED_INCLUDE_DIRS}
+ ${PERPLEX_${DPLOT_READER}_scanner_INCLUDE_DIR}
+ ${LEMON_${DPLOT_READER}_parser_INCLUDE_DIR}
)
set(BREP_SRCS
+ ${PERPLEX_${DPLOT_READER}_scanner_SRC}
+ ${LEMON_${DPLOT_READER}_parser_SRC}
+ dplot.c
brep.cpp
conversion.cpp
csg.cpp
Modified: brlcad/branches/brep-debug/src/libged/brep/brep.cpp
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/brep.cpp 2020-09-25 15:35:15 UTC
(rev 77226)
+++ brlcad/branches/brep-debug/src/libged/brep/brep.cpp 2020-09-25 15:57:21 UTC
(rev 77227)
@@ -1480,9 +1480,11 @@
extern "C" {
struct ged_cmd_impl brep_cmd_impl = { "brep", ged_brep_core,
GED_CMD_DEFAULT };
const struct ged_cmd brep_cmd = { &brep_cmd_impl };
- const struct ged_cmd *brep_cmds[] = { &brep_cmd, NULL };
+ struct ged_cmd_impl dplot_cmd_impl = { "dplot", ged_dplot_core,
GED_CMD_DEFAULT };
+ const struct ged_cmd dplot_cmd = { &dplot_cmd_impl };
+ const struct ged_cmd *brep_cmds[] = { &brep_cmd, &dplot_cmd, NULL };
- static const struct ged_plugin pinfo = { GED_API, brep_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, brep_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Added: brlcad/branches/brep-debug/src/libged/brep/dplot.c
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/dplot.c
(rev 0)
+++ brlcad/branches/brep-debug/src/libged/brep/dplot.c 2020-09-25 15:57:21 UTC
(rev 77227)
@@ -0,0 +1,799 @@
+/* D P L O T . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2014-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 dplot.c
+ *
+ * Brief description
+ *
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "bu/color.h"
+#include "bu/opt.h"
+#include "raytrace.h"
+#include "rt/geom.h"
+#include "wdb.h"
+
+#include "../ged_private.h"
+#include "./dplot_reader.h"
+
+enum {
+ DPLOT_INITIAL,
+ DPLOT_SSX_FIRST,
+ DPLOT_SSX,
+ DPLOT_SSX_EVENTS,
+ DPLOT_ISOCSX_FIRST,
+ DPLOT_ISOCSX,
+ DPLOT_ISOCSX_EVENTS,
+ DPLOT_FACE_CURVES,
+ DPLOT_LINKED_CURVES,
+ DPLOT_SPLIT_FACES
+};
+
+struct dplot_info {
+ struct dplot_data fdata;
+ int mode;
+ struct ged *gedp;
+ FILE *logfile;
+ char *prefix;
+ int ssx_idx;
+ int isocsx_idx;
+ int brep1_surf_idx;
+ int brep2_surf_idx;
+ int brep1_surf_count;
+ int brep2_surf_count;
+ int event_idx;
+ int event_count;
+ int brep1_isocsx_count;
+ int isocsx_count;
+};
+
+#define CLEANUP \
+ fclose(info.logfile); \
+ bu_free(info.prefix, "prefix"); \
+ info.prefix = NULL; \
+ if (info.fdata.ssx) bu_free(info.fdata.ssx, "ssx array");
+
+#define RETURN_MORE \
+ CLEANUP \
+ return GED_MORE;
+
+#define RETURN_ERROR \
+ CLEANUP \
+ info.mode = DPLOT_INITIAL; \
+ return GED_ERROR;
+
+HIDDEN int
+dplot_overlay(
+ struct ged *gedp,
+ const char *prefix,
+ const char *infix,
+ int idx,
+ const char *name)
+{
+ const char *cmd_av[] = {"overlay", "[filename]", "1.0", "[name]"};
+ int ret, cmd_ac = sizeof(cmd_av) / sizeof(char *);
+ struct bu_vls overlay_name = BU_VLS_INIT_ZERO;
+
+ bu_vls_printf(&overlay_name, "%s%s%d.plot3", prefix, infix, idx);
+ cmd_av[1] = cmd_av[3] = bu_vls_cstr(&overlay_name);
+ if (name) {
+ cmd_av[3] = name;
+ }
+ ret = ged_overlay(gedp, cmd_ac, cmd_av);
+ bu_vls_free(&overlay_name);
+
+ if (ret != GED_OK) {
+ bu_vls_printf(gedp->ged_result_str, "error overlaying plot\n");
+ return GED_ERROR;
+ }
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_erase_overlay(
+ struct dplot_info *info,
+ const char *name)
+{
+ const int NUM_EMPTY_PLOTS = 13;
+ int i;
+
+ /* We can't actually erase the old plot without its real name,
+ * which is unknown. Instead, we'll write a plot with the same
+ * base name and color, which will overwrite the old one. We
+ * don't actually know the color either, so we resort to writing
+ * an empty plot with the given name using every color we created
+ * plots with.
+ */
+ for (i = 0; i < NUM_EMPTY_PLOTS; ++i) {
+ int ret = dplot_overlay(info->gedp, info->prefix, "_empty", i, name);
+ if (ret != GED_OK) {
+ return ret;
+ }
+ }
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_ssx(
+ struct dplot_info *info)
+{
+ int i, ret;
+
+ /* draw surfaces, skipping intersecting surfaces if in SSI mode */
+ /* TODO: need to name these overlays so I can selectively erase them */
+ for (i = 0; i < info->brep1_surf_count; ++i) {
+ struct bu_vls name = BU_VLS_INIT_ZERO;
+ bu_vls_printf(&name, "%s_brep1_surface%d", info->prefix, i);
+ dplot_erase_overlay(info, bu_vls_cstr(&name));
+ bu_vls_free(&name);
+ }
+ for (i = 0; i < info->brep2_surf_count; ++i) {
+ struct bu_vls name = BU_VLS_INIT_ZERO;
+ bu_vls_printf(&name, "%s_brep2_surface%d", info->prefix, i);
+ dplot_erase_overlay(info, bu_vls_cstr(&name));
+ bu_vls_free(&name);
+ }
+ if (info->mode == DPLOT_SSX_FIRST || info->mode == DPLOT_SSX || info->mode
== DPLOT_SSX_EVENTS) {
+ for (i = 0; i < info->brep1_surf_count; ++i) {
+ if (info->mode != DPLOT_SSX_FIRST && i == info->brep1_surf_idx) {
+ continue;
+ }
+ ret = dplot_overlay(info->gedp, info->prefix, "_brep1_surface", i,
NULL);
+ if (ret != GED_OK) {
+ return GED_ERROR;
+ }
+ }
+ for (i = 0; i < info->brep2_surf_count; ++i) {
+ if (info->mode != DPLOT_SSX_FIRST && i == info->brep2_surf_idx) {
+ continue;
+ }
+ ret = dplot_overlay(info->gedp, info->prefix, "_brep2_surface", i,
NULL);
+ if (ret != GED_OK) {
+ return GED_ERROR;
+ }
+ }
+ }
+
+ /* draw highlighted surface-surface intersection pair */
+ if (info->mode == DPLOT_SSX || info->mode == DPLOT_SSX_EVENTS) {
+ ret = dplot_overlay(info->gedp, info->prefix,
"_highlight_brep1_surface",
+ info->brep1_surf_idx, "dplot_ssx1");
+ if (ret != GED_OK) {
+ return GED_ERROR;
+ }
+ ret = dplot_overlay(info->gedp, info->prefix,
"_highlight_brep2_surface",
+ info->brep2_surf_idx, "dplot_ssx2");
+ if (ret != GED_OK) {
+ return GED_ERROR;
+ }
+ if (info->mode == DPLOT_SSX) {
+ /* advance past the completed pair */
+ ++info->ssx_idx;
+ }
+ }
+ if (info->mode == DPLOT_SSX_FIRST) {
+ info->mode = DPLOT_SSX;
+ }
+ if (info->mode == DPLOT_SSX && info->ssx_idx < info->fdata.ssx_count) {
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show
surface-"
+ "surface intersection %d", info->ssx_idx);
+ return GED_MORE;
+ }
+ return GED_OK;
+}
+
+void
+dplot_print_event_legend(struct dplot_info *info)
+{
+ bu_vls_printf(info->gedp->ged_result_str, "yellow = transverse\n");
+ bu_vls_printf(info->gedp->ged_result_str, "white = tangent\n");
+ bu_vls_printf(info->gedp->ged_result_str, "green = overlap\n");
+}
+
+HIDDEN int
+dplot_ssx_events(
+ struct dplot_info *info)
+{
+ int ret;
+
+ /* erase old event plots */
+ ret = dplot_erase_overlay(info, "curr_event");
+ if (ret != GED_OK) {
+ return ret;
+ }
+
+ if (info->mode != DPLOT_SSX_EVENTS) {
+ return GED_OK;
+ }
+
+ if (info->event_count > 0) {
+ /* convert event ssx_idx to string */
+ struct bu_vls infix = BU_VLS_INIT_ZERO;
+ bu_vls_printf(&infix, "_ssx%d_event", info->ssx_idx);
+
+ /* plot overlay */
+ ret = dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&infix),
+ info->event_idx, "curr_event");
+ bu_vls_free(&infix);
+
+ if (ret != GED_OK) {
+ return ret;
+ }
+ if (info->event_idx == 0) {
+ dplot_print_event_legend(info);
+ }
+ }
+ /* advance to next event, or return to initial state */
+ if (++info->event_idx < info->event_count) {
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show next
event\n");
+ return GED_MORE;
+ }
+ info->mode = DPLOT_INITIAL;
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_isocsx(
+ struct dplot_info *info)
+{
+ if (info->mode != DPLOT_ISOCSX &&
+ info->mode != DPLOT_ISOCSX_FIRST &&
+ info->mode != DPLOT_ISOCSX_EVENTS)
+ {
+ return GED_OK;
+ }
+
+ if (info->fdata.ssx[info->ssx_idx].isocsx_events == NULL) {
+ bu_vls_printf(info->gedp->ged_result_str, "The isocurves of neither "
+ "surface intersected the opposing surface in surface-surface"
+ " intersection %d.\n", info->ssx_idx);
+ info->mode = DPLOT_INITIAL;
+ return GED_OK;
+ }
+
+ dplot_overlay(info->gedp, info->prefix, "_brep1_surface",
+ info->brep1_surf_idx, "isocsx_b1");
+ dplot_overlay(info->gedp, info->prefix, "_brep2_surface",
+ info->brep2_surf_idx, "isocsx_b2");
+
+ if (info->mode == DPLOT_ISOCSX) {
+ struct bu_vls infix = BU_VLS_INIT_ZERO;
+ /* plot surface and the isocurve that intersects it */
+ if (info->isocsx_idx < info->brep1_isocsx_count) {
+ dplot_overlay(info->gedp, info->prefix, "_highlight_brep2_surface",
+ info->brep2_surf_idx, "isocsx_b2");
+ } else {
+ dplot_overlay(info->gedp, info->prefix, "_highlight_brep1_surface",
+ info->brep1_surf_idx, "isocsx_b1");
+ }
+ bu_vls_printf(&infix, "_highlight_ssx%d_isocurve", info->ssx_idx);
+ dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&infix),
info->isocsx_idx, "isocsx_isocurve");
+ bu_vls_free(&infix);
+ }
+
+ if (info->mode == DPLOT_ISOCSX_FIRST ||
+ info->mode == DPLOT_ISOCSX)
+ {
+ if (info->mode == DPLOT_ISOCSX_FIRST ||
+ ++info->isocsx_idx < info->isocsx_count)
+ {
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show "
+ "isocurve-surface intersection %d", info->isocsx_idx);
+ info->mode = DPLOT_ISOCSX;
+ return GED_MORE;
+ } else {
+ info->mode = DPLOT_INITIAL;
+ }
+ }
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_isocsx_events(struct dplot_info *info)
+{
+ int ret;
+
+ if (info->mode != DPLOT_ISOCSX_EVENTS) {
+ return GED_OK;
+ }
+ ret = dplot_erase_overlay(info, "curr_event");
+ if (ret != GED_OK) {
+ return ret;
+ }
+ if (info->event_count > 0) {
+ /* convert event ssx_idx to string */
+ struct bu_vls infix = BU_VLS_INIT_ZERO;
+ bu_vls_printf(&infix, "_ssx%d_isocsx%d_event", info->ssx_idx,
+ info->isocsx_idx);
+
+ /* plot overlay */
+ ret = dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&infix),
+ info->event_idx, "curr_event");
+ bu_vls_free(&infix);
+
+ if (ret != GED_OK) {
+ bu_vls_printf(info->gedp->ged_result_str,
+ "error overlaying plot\n");
+ return ret;
+ }
+ if (info->event_idx == 0) {
+ dplot_print_event_legend(info);
+ }
+ }
+ /* advance to next event, or return to initial state */
+ if (++info->event_idx < info->event_count) {
+ bu_vls_printf(info->gedp->ged_result_str,
+ "Press [Enter] to show next event\n");
+ return GED_MORE;
+ }
+
+ info->mode = DPLOT_INITIAL;
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_face_curves(struct dplot_info *info)
+{
+ int f1_curves, f2_curves;
+ if (info->mode != DPLOT_FACE_CURVES) {
+ return GED_OK;
+ }
+
+ f1_curves = info->fdata.ssx[info->ssx_idx].face1_clipped_curves;
+ f2_curves = info->fdata.ssx[info->ssx_idx].face2_clipped_curves;
+ info->event_count = f1_curves + f2_curves;
+
+ if (info->event_count == 0) {
+ bu_vls_printf(info->gedp->ged_result_str, "No clipped curves for ssx"
+ " pair %d.\n", info->ssx_idx);
+ return GED_OK;
+ }
+
+ if (info->event_idx < info->event_count) {
+ struct bu_vls prefix;
+
+ dplot_overlay(info->gedp, info->prefix, "_brep1_surface",
+ info->brep1_surf_idx, "face_b1");
+ dplot_overlay(info->gedp, info->prefix, "_brep2_surface",
+ info->brep2_surf_idx, "face_b2");
+
+ BU_VLS_INIT(&prefix);
+ bu_vls_printf(&prefix, "%s_ssx%d", info->prefix, info->ssx_idx);
+ dplot_erase_overlay(info, "clipped_fcurve");
+ if (info->event_idx < f1_curves) {
+ bu_vls_printf(&prefix, "_brep1face_clipped_curve");
+ dplot_overlay(info->gedp, bu_vls_cstr(&prefix), "",
+ info->event_idx, "clipped_fcurve");
+ } else {
+ bu_vls_printf(&prefix, "_brep2face_clipped_curve");
+ dplot_overlay(info->gedp, bu_vls_cstr(&prefix), "",
+ info->event_idx - f1_curves, "clipped_fcurve");
+ }
+ ++info->event_idx;
+ if (info->event_idx < info->event_count) {
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show
the"
+ " next curve.");
+ return GED_MORE;
+ }
+ }
+
+ info->mode = DPLOT_INITIAL;
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_split_faces(
+ struct dplot_info *info)
+{
+ int i, j;
+ struct bu_vls name = BU_VLS_INIT_ZERO;
+ struct bu_vls short_name = BU_VLS_INIT_ZERO;
+ struct split_face split_face;
+
+ if (info->mode != DPLOT_SPLIT_FACES) {
+ return GED_OK;
+ }
+
+ if (info->event_idx >= info->fdata.split_face_count) {
+ for (i = 0; i < info->fdata.split_face_count; ++i) {
+ split_face = info->fdata.face[i];
+
+ bu_vls_trunc(&name, 0);
+ bu_vls_printf(&name, "_split_face%d_outerloop_curve", i);
+ for (j = 0; j < split_face.outerloop_curves; ++j) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sf%do%d", i, j);
+ dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&name), j,
+ bu_vls_cstr(&short_name));
+ }
+
+ bu_vls_trunc(&name, 0);
+ bu_vls_printf(&name, "_split_face%d_innerloop_curve", i);
+ for (j = 0; j < split_face.innerloop_curves; ++j) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sf%di%d", i, j);
+ dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&name), j,
+ bu_vls_cstr(&short_name));
+ }
+ }
+ } else {
+ if (info->event_idx > 0) {
+ /* erase curves of previous split face */
+ split_face = info->fdata.face[info->event_idx - 1];
+ for (i = 0; i < split_face.outerloop_curves; ++i) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sfo%d", i);
+ dplot_erase_overlay(info, bu_vls_cstr(&short_name));
+ }
+ for (i = 0; i < split_face.innerloop_curves; ++i) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sfi%d", i);
+ dplot_erase_overlay(info, bu_vls_cstr(&short_name));
+ }
+ }
+
+ split_face = info->fdata.face[info->event_idx];
+ bu_vls_printf(&name, "_split_face%d_outerloop_curve", info->event_idx);
+ for (i = 0; i < info->fdata.face[info->event_idx].outerloop_curves;
++i) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sfo%d", i);
+
+ dplot_erase_overlay(info, bu_vls_cstr(&short_name));
+ dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&name), i,
+ bu_vls_cstr(&short_name));
+ }
+
+ bu_vls_trunc(&name, 0);
+ bu_vls_printf(&name, "_split_face%d_innerloop_curve", info->event_idx);
+ for (i = 0; i < info->fdata.face[info->event_idx].innerloop_curves;
++i) {
+ bu_vls_trunc(&short_name, 0);
+ bu_vls_printf(&short_name, "sfi%d", i);
+
+ dplot_erase_overlay(info, bu_vls_cstr(&short_name));
+ dplot_overlay(info->gedp, info->prefix, bu_vls_cstr(&name), i,
+ bu_vls_cstr(&short_name));
+ }
+
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show "
+ "split face %d", ++info->event_idx);
+ return GED_MORE;
+ }
+ return GED_OK;
+}
+
+HIDDEN int
+dplot_linked_curves(
+ struct dplot_info *info)
+{
+ int i;
+ if (info->mode != DPLOT_LINKED_CURVES) {
+ return GED_OK;
+ }
+
+ if (info->event_idx >= info->fdata.linked_curve_count) {
+ for (i = 0; i < info->fdata.linked_curve_count; ++i) {
+ dplot_overlay(info->gedp, info->prefix, "_linked_curve", i, NULL);
+ }
+ } else {
+ dplot_overlay(info->gedp, info->prefix, "_linked_curve",
+ info->event_idx, "linked_curve");
+ bu_vls_printf(info->gedp->ged_result_str, "Press [Enter] to show "
+ "linked curve %d", ++info->event_idx);
+ return GED_MORE;
+ }
+ return GED_OK;
+}
+
+HIDDEN void *
+dplot_malloc(size_t s) {
+ return bu_malloc(s, "dplot_malloc");
+}
+
+HIDDEN void
+dplot_free(void *p) {
+ bu_free(p, "dplot_free");
+}
+
+HIDDEN void
+dplot_load_file_data(struct dplot_info *info)
+{
+ int i, j;
+ struct ssx *curr_ssx;
+ struct isocsx *curr_isocsx;
+ int token_id;
+ perplex_t scanner;
+ void *parser;
+
+ /* initialize scanner and parser */
+ parser = ParseAlloc(dplot_malloc);
+ scanner = perplexFileScanner(info->logfile);
+
+ info->fdata.brep1_surface_count = info->fdata.brep2_surface_count = 0;
+ info->fdata.ssx_count = 0;
+ BU_LIST_INIT(&info->fdata.ssx_list);
+ BU_LIST_INIT(&info->fdata.isocsx_list);
+ perplexSetExtra(scanner, (void *)&info->fdata);
+
+ /* parse */
+ while ((token_id = yylex(scanner)) != YYEOF) {
+ Parse(parser, token_id, info->fdata.token_data, &info->fdata);
+ }
+ Parse(parser, 0, info->fdata.token_data, &info->fdata);
+
+ /* clean up */
+ ParseFree(parser, dplot_free);
+ perplexFree(scanner);
+
+ /* move ssx to dynamic array for easy access */
+ info->fdata.ssx = NULL;
+ if (info->fdata.ssx_count > 0) {
+
+ info->fdata.ssx = (struct ssx *)bu_malloc(
+ sizeof(struct ssx) * info->fdata.ssx_count, "ssx array");
+
+ i = info->fdata.ssx_count - 1;
+ while (BU_LIST_WHILE(curr_ssx, ssx, &info->fdata.ssx_list)) {
+ BU_LIST_DEQUEUE(&curr_ssx->l);
+
+ curr_ssx->isocsx_events = NULL;
+ if (curr_ssx->intersecting_isocurves > 0) {
+ curr_ssx->isocsx_events = (int *)bu_malloc(sizeof(int) *
+ curr_ssx->intersecting_isocurves, "isocsx array");
+
+ j = curr_ssx->intersecting_isocurves - 1;
+ while (BU_LIST_WHILE(curr_isocsx, isocsx,
&curr_ssx->isocsx_list)) {
+ BU_LIST_DEQUEUE(&curr_isocsx->l);
+ curr_ssx->isocsx_events[j--] = curr_isocsx->events;
+ BU_PUT(curr_isocsx, struct isocsx);
+ }
+ }
+ info->fdata.ssx[i--] = *curr_ssx;
+ BU_PUT(curr_ssx, struct ssx);
+ }
+ }
+}
+
+int
+ged_dplot_core(struct ged *gedp, int argc, const char *argv[])
+{
+ static struct dplot_info info;
+ int ret;
+ const char *filename, *cmd;
+ char *dot;
+
+ info.gedp = gedp;
+ bu_vls_trunc(gedp->ged_result_str, 0);
+
+ if (argc < 3) {
+ bu_vls_printf(gedp->ged_result_str, "usage: %s logfile cmd\n",
+ argv[0]);
+ bu_vls_printf(gedp->ged_result_str, " where cmd is one of:\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " ssx (show intersecting surface pairs)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " ssx N (show intersections of ssx pair N)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " isocsx N (show intersecting isocurve-surface pairs of ssx
pair N)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " isocsx N M (show intersections of ssx pair N, isocsx pair
M)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " fcurves N (show clipped face curves of ssx pair N)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " lcurves (show linked ssx curves used to split faces)\n");
+ bu_vls_printf(gedp->ged_result_str,
+ " faces (show split faces used to construct result)\n");
+ return GED_HELP;
+ }
+ filename = argv[1];
+ cmd = argv[2];
+
+ if (info.mode == DPLOT_INITIAL) {
+ if (BU_STR_EQUAL(cmd, "ssx") && argc == 3) {
+ info.mode = DPLOT_SSX_FIRST;
+ info.ssx_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "ssx") && argc == 4) {
+ /* parse surface pair index */
+ const char *idx_str = argv[3];
+ ret = bu_sscanf(idx_str, "%d", &info.ssx_idx);
+ if (ret != 1) {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a valid "
+ "surface pair (must be a non-negative integer)\n",
idx_str);
+ return GED_ERROR;
+ }
+ info.mode = DPLOT_SSX_EVENTS;
+ info.event_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "isocsx") && argc == 4) {
+ const char *idx_str = argv[3];
+ ret = bu_sscanf(idx_str, "%d", &info.ssx_idx);
+ if (ret != 1) {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a valid "
+ "surface pair (must be a non-negative integer)\n",
idx_str);
+ return GED_ERROR;
+ }
+ info.mode = DPLOT_ISOCSX_FIRST;
+ info.isocsx_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "isocsx") && argc == 5) {
+ /* parse surface pair index */
+ const char *idx_str = argv[3];
+ ret = bu_sscanf(idx_str, "%d", &info.ssx_idx);
+ if (ret != 1) {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a valid "
+ "surface pair (must be a non-negative integer)\n",
idx_str);
+ return GED_ERROR;
+ }
+ idx_str = argv[4];
+ ret = bu_sscanf(idx_str, "%d", &info.isocsx_idx);
+ if (ret != 1) {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a valid "
+ "isocurve-surface pair (must be a non-negative
integer)\n", idx_str);
+ return GED_ERROR;
+ }
+ info.mode = DPLOT_ISOCSX_EVENTS;
+ info.event_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "fcurves") && argc == 4) {
+ const char *idx_str = argv[3];
+ ret = bu_sscanf(idx_str, "%d", &info.ssx_idx);
+ if (ret != 1) {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a valid "
+ "surface pair (must be a non-negative integer)\n",
idx_str);
+ return GED_ERROR;
+ }
+ info.mode = DPLOT_FACE_CURVES;
+ info.event_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "lcurves") && argc == 3) {
+ info.mode = DPLOT_LINKED_CURVES;
+ info.event_idx = 0;
+ } else if (BU_STR_EQUAL(cmd, "faces") && argc == 3) {
+ info.mode = DPLOT_SPLIT_FACES;
+ info.event_idx = 0;
+ } else {
+ bu_vls_printf(gedp->ged_result_str, "%s is not a recognized "
+ "command or was given the wrong number of arguments\n",
+ cmd);
+ return GED_ERROR;
+ }
+ }
+
+ /* open dplot log file */
+ info.logfile = fopen(filename, "r");
+ if (!info.logfile) {
+ bu_vls_printf(gedp->ged_result_str, "couldn't open log file \"%s\"\n",
filename);
+ return GED_ERROR;
+ }
+
+ /* filename before '.' is assumed to be the prefix for all
+ * plot-file names
+ */
+ info.prefix = bu_strdup(filename);
+ dot = strchr(info.prefix, '.');
+ if (dot) {
+ *dot = '\0';
+ }
+
+ dplot_load_file_data(&info);
+
+ if (info.mode == DPLOT_SSX_FIRST ||
+ info.mode == DPLOT_SSX ||
+ info.mode == DPLOT_SSX_EVENTS ||
+ info.mode == DPLOT_ISOCSX_FIRST ||
+ info.mode == DPLOT_ISOCSX ||
+ info.mode == DPLOT_ISOCSX_EVENTS)
+ {
+ if (info.fdata.ssx_count == 0) {
+ bu_vls_printf(info.gedp->ged_result_str, "no surface surface"
+ "intersections");
+ RETURN_ERROR;
+ } else if (info.ssx_idx < 0 ||
+ info.ssx_idx > (info.fdata.ssx_count - 1))
+ {
+ bu_vls_printf(info.gedp->ged_result_str, "no surface pair %d (valid"
+ " range is [0, %d])\n", info.ssx_idx, info.fdata.ssx_count
- 1);
+ RETURN_ERROR;
+ }
+ }
+ if (info.fdata.ssx_count > 0) {
+ info.brep1_surf_idx = info.fdata.ssx[info.ssx_idx].brep1_surface;
+ info.brep2_surf_idx = info.fdata.ssx[info.ssx_idx].brep2_surface;
+ info.event_count = info.fdata.ssx[info.ssx_idx].final_curve_events;
+ info.brep1_isocsx_count =
+ info.fdata.ssx[info.ssx_idx].intersecting_brep1_isocurves;
+ info.isocsx_count =
+ info.fdata.ssx[info.ssx_idx].intersecting_isocurves;
+ }
+ info.brep1_surf_count = info.fdata.brep1_surface_count;
+ info.brep2_surf_count = info.fdata.brep2_surface_count;
+
+ if (info.mode == DPLOT_ISOCSX_EVENTS) {
+ int *isocsx_events = info.fdata.ssx[info.ssx_idx].isocsx_events;
+
+ info.event_count = 0;
+ if (isocsx_events) {
+ info.event_count = isocsx_events[info.event_idx];
+ }
+ }
+
+ ret = dplot_ssx(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_ssx_events(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_isocsx(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_isocsx_events(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_face_curves(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_split_faces(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ ret = dplot_linked_curves(&info);
+ if (ret == GED_ERROR) {
+ RETURN_ERROR;
+ } else if (ret == GED_MORE) {
+ RETURN_MORE;
+ }
+
+ info.mode = DPLOT_INITIAL;
+ CLEANUP;
+
+ return GED_OK;
+}
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/branches/brep-debug/src/libged/brep/dplot.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/brep-debug/src/libged/brep/dplot_parser.lemon (from rev
77226, brlcad/branches/brep-debug/src/libged/dplot_parser.lemon)
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/dplot_parser.lemon
(rev 0)
+++ brlcad/branches/brep-debug/src/libged/brep/dplot_parser.lemon
2020-09-25 15:57:21 UTC (rev 77227)
@@ -0,0 +1,103 @@
+%include {
+#include "bu.h"
+#include <assert.h>
+#include "dplot_reader.h"
+}
+
+%destructor statement_list {
+ $$.n = data->ssx_count;
+}
+
+%stack_overflow {
+ fprintf(stderr, "Parser stack overflow. Last token was %d\n",
yypMinor->yy0.n);
+}
+
+%syntax_error {
+ fprintf(stderr, "Syntax error. Last token (type %d) was %d. Ignoring "
+ "input tokens until valid input is found.\n", yymajor,
yyminor.yy0.n);
+}
+
+%parse_failure {
+ fprintf(stderr, "Parsing failed. Parser has reset.\n");
+}
+
+%token_type {token_t}
+%extra_argument {struct dplot_data *data}
+
+%token_prefix {TOKEN_}
+
+%type count {int}
+%type index {int}
+
+start_symbol ::= statement_list.
+
+statement_list ::= /* empty */.
+statement_list ::= statement_list statement.
+
+statement ::= surface_counts EOL.
+statement ::= ssx_info EOL.
+statement ::= linked_curve_count EOL.
+statement ::= split_face_count EOL.
+statement ::= split_face_info EOL.
+
+surface_counts ::= SURFACES count(C1) count(C2). {
+ data->brep1_surface_count = C1;
+ data->brep2_surface_count = C2;
+}
+
+ssx_info ::= SSX index(SURF_IDX1) index(SURF_IDX2) count(EVENTS)
count(CRV_COUNT1) count(CRV_COUNT2) count(B1_ISO) count(ISO)
isocsx_event_counts. {
+ struct ssx *ssx;
+ BU_GET(ssx, struct ssx);
+
+ ssx->brep1_surface = SURF_IDX1;
+ ssx->brep2_surface = SURF_IDX2;
+ ssx->final_curve_events = EVENTS;
+ ssx->face1_clipped_curves = CRV_COUNT1;
+ ssx->face2_clipped_curves = CRV_COUNT2;
+ ssx->intersecting_brep1_isocurves = B1_ISO;
+ ssx->intersecting_isocurves = ISO;
+ BU_LIST_INIT(&ssx->isocsx_list);
+
+ /* move the list of event counts from the tmp location to this ssx
+ * instance
+ */
+ BU_LIST_APPEND_LIST(&ssx->isocsx_list, &data->isocsx_list);
+
+ BU_LIST_PUSH(&data->ssx_list, &ssx->l);
+ ++data->ssx_count;
+}
+
+isocsx_event_counts ::= /* empty */.
+
+isocsx_event_counts ::= isocsx_event_counts count(C). {
+ struct isocsx *isocsx;
+ BU_GET(isocsx, struct isocsx);
+
+ isocsx->events = C;
+ BU_LIST_INIT(&isocsx->l);
+
+ BU_LIST_PUSH(&data->isocsx_list, &isocsx->l);
+}
+
+linked_curve_count ::= LINKED_CURVES count(COUNT). {
+ data->linked_curve_count = COUNT;
+}
+
+split_face_count ::= SPLIT_FACES count(SPLIT_FACES). {
+ data->split_face_count = SPLIT_FACES;
+ data->face = (struct split_face *)bu_malloc(SPLIT_FACES *
+ sizeof(struct split_face), "split face array");
+}
+
+split_face_info ::= SPLIT_FACE index(I) count(OUTER_COUNT) count(INNER_COUNT).
{
+ data->face[I].outerloop_curves = OUTER_COUNT;
+ data->face[I].innerloop_curves = INNER_COUNT;
+}
+
+count(C) ::= NONNEGATIVE_INT(N). {
+ C = N.n;
+}
+
+index(I) ::= NONNEGATIVE_INT(N). {
+ I = N.n;
+}
Copied: brlcad/branches/brep-debug/src/libged/brep/dplot_reader.c (from rev
77226, brlcad/branches/brep-debug/src/libged/dplot_reader.c)
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/dplot_reader.c
(rev 0)
+++ brlcad/branches/brep-debug/src/libged/brep/dplot_reader.c 2020-09-25
15:57:21 UTC (rev 77227)
@@ -0,0 +1,87 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "dplot_reader.h"
+#include "bu.h"
+
+HIDDEN void *
+dplot_malloc(size_t s) {
+ return bu_malloc(s, "dplot_malloc");
+}
+
+HIDDEN void
+dplot_free(void *p) {
+ bu_free(p, "dplot_free");
+}
+
+int
+main(int argc, char *argv[])
+{
+ int i, token_id;
+ FILE *input_file;
+ perplex_t scanner;
+ void *parser;
+ struct ssx *curr;
+ struct dplot_data data;
+
+ if (argc != 2) {
+ bu_exit(1, "usage: %s input\n", argv[0]);
+ }
+
+ /* initialize scanner */
+ input_file = fopen(argv[1], "r");
+ if (!input_file) {
+ bu_exit(2, "error: couldn't open \"%s\" for reading.\n", argv[1]);
+ }
+ scanner = perplexFileScanner(input_file);
+
+ data.ssx_count = 0;
+ BU_LIST_INIT(&data.ssx_list);
+ perplexSetExtra(scanner, (void *)&data);
+
+ /* initialize parser */
+ parser = ParseAlloc(dplot_malloc);
+
+ /* parse */
+ while ((token_id = yylex(scanner)) != YYEOF) {
+ Parse(parser, token_id, data.token_data, &data);
+ }
+ Parse(parser, 0, data.token_data, &data);
+
+ /* move list data to array */
+ if (data.ssx_count > 0) {
+ data.ssx = (struct ssx *)bu_malloc(
+ sizeof(struct ssx) * data.ssx_count, "ssx array");
+
+ i = data.ssx_count - 1;
+ while (BU_LIST_WHILE(curr, ssx, &data.ssx_list)) {
+ data.ssx[i--] = *curr;
+ BU_LIST_DEQUEUE(&curr->l);
+ BU_PUT(curr, struct ssx);
+ }
+ }
+
+ /* print data */
+ bu_log("brep1: %d surfaces\n", data.brep1_surface_count);
+ bu_log("brep2: %d surfaces\n", data.brep2_surface_count);
+
+ for (i = 0; i < data.ssx_count; ++i) {
+ bu_log("%d curve events between surface 1-%d and 2-%d\n",
+ data.ssx[i].final_curve_events, data.ssx[i].brep1_surface,
+ data.ssx[i].brep2_surface);
+ bu_log("\t%d brep1 isocurves intersected brep2\n",
+ data.ssx[i].intersecting_brep1_isocurves);
+ bu_log("\t%d brep2 isocurves intersected brep1\n",
+ data.ssx[i].intersecting_isocurves -
+ data.ssx[i].intersecting_brep1_isocurves);
+ }
+
+ /* clean up */
+ if (data.ssx) {
+ bu_free(data.ssx, "ssx array");
+ }
+ ParseFree(parser, dplot_free);
+ perplexFree(scanner);
+ fclose(input_file);
+
+ return 0;
+}
Copied: brlcad/branches/brep-debug/src/libged/brep/dplot_reader.h (from rev
77226, brlcad/branches/brep-debug/src/libged/dplot_reader.h)
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/dplot_reader.h
(rev 0)
+++ brlcad/branches/brep-debug/src/libged/brep/dplot_reader.h 2020-09-25
15:57:21 UTC (rev 77227)
@@ -0,0 +1,56 @@
+#ifndef DPLOT_PARSER
+#define DPLOT_PARSER
+
+#define PERPLEX_ON_ENTER struct dplot_data *data = (struct dplot_data
*)yyextra;
+
+#include "bu.h"
+#include "dplot_parser.h"
+#include "dplot_scanner.h"
+
+typedef struct {
+ int n;
+} token_t;
+
+struct isocsx {
+ struct bu_list l;
+ int events;
+};
+
+struct ssx {
+ struct bu_list l;
+ int brep1_surface;
+ int brep2_surface;
+ int final_curve_events;
+ int face1_clipped_curves;
+ int face2_clipped_curves;
+ int intersecting_brep1_isocurves;
+ int intersecting_isocurves;
+ struct bu_list isocsx_list; /* struct isocsx list */
+ int *isocsx_events;
+};
+
+struct split_face {
+ int outerloop_curves;
+ int innerloop_curves;
+};
+
+struct dplot_data {
+ token_t token_data;
+ int brep1_surface_count;
+ int brep2_surface_count;
+ int linked_curve_count;
+ int ssx_count;
+ int split_face_count;
+ struct bu_list ssx_list; /* struct ssx list */
+ struct ssx *ssx;
+ struct bu_list isocsx_list; /* struct ssx list */
+ struct split_face *face;
+};
+
+/* lemon prototypes */
+void *ParseAlloc(void *(*mallocProc)(size_t));
+void ParseFree(void *parser, void (*freeProc)(void *));
+void Parse(void *yyp, int yymajor, token_t tokenData, struct dplot_data *data);
+void ParseTrace(FILE *fp, char *s);
+
+#endif
Copied: brlcad/branches/brep-debug/src/libged/brep/dplot_scanner.perplex (from
rev 77226, brlcad/branches/brep-debug/src/libged/dplot_scanner.perplex)
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/dplot_scanner.perplex
(rev 0)
+++ brlcad/branches/brep-debug/src/libged/brep/dplot_scanner.perplex
2020-09-25 15:57:21 UTC (rev 77227)
@@ -0,0 +1,42 @@
+#include "bu.h"
+#include "dplot_reader.h"
+enum {INITIAL, normal};
+%%
+<> => normal { continue; }
+
+<normal> {
+"surfaces" {
+ return TOKEN_SURFACES;
+}
+
+"ssx" {
+ return TOKEN_SSX;
+}
+
+"linkedcurves" {
+ return TOKEN_LINKED_CURVES;
+}
+
+"splitfaces" {
+ return TOKEN_SPLIT_FACES;
+}
+
+"splitface" {
+ return TOKEN_SPLIT_FACE;
+}
+
+[0-9]|[1-9][0-9]+ {
+ data->token_data.n = 0;
+ bu_sscanf(yytext, "%d", &data->token_data.n);
+ return TOKEN_NONNEGATIVE_INT;
+}
+
+[\n]+ {
+ return TOKEN_EOL;
+}
+
+[^] {
+ /* ignore */
+ continue;
+}
+}
Modified: brlcad/branches/brep-debug/src/libged/brep/ged_brep.h
===================================================================
--- brlcad/branches/brep-debug/src/libged/brep/ged_brep.h 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/brep/ged_brep.h 2020-09-25
15:57:21 UTC (rev 77227)
@@ -111,6 +111,8 @@
GED_EXPORT extern int brep_intersect_curve_surface(struct rt_db_internal
*intern1, struct rt_db_internal *intern2, int i, int j);
GED_EXPORT extern int brep_intersect_surface_surface(struct rt_db_internal
*intern1, struct rt_db_internal *intern2, int i, int j, struct bn_vlblock *vbp);
+GED_EXPORT extern int ged_dplot_core(struct ged *gedp, int argc, const char
*argv[]);
+
using namespace brlcad;
void
plotface(const ON_BrepFace &face, struct bn_vlblock *vbp, int plotres, bool
dim3d, const int red, const int green, const int blue);
Deleted: brlcad/branches/brep-debug/src/libged/dplot_parser.lemon
===================================================================
--- brlcad/branches/brep-debug/src/libged/dplot_parser.lemon 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/dplot_parser.lemon 2020-09-25
15:57:21 UTC (rev 77227)
@@ -1,103 +0,0 @@
-%include {
-#include "bu.h"
-#include <assert.h>
-#include "dplot_reader.h"
-}
-
-%destructor statement_list {
- $$.n = data->ssx_count;
-}
-
-%stack_overflow {
- fprintf(stderr, "Parser stack overflow. Last token was %d\n",
yypMinor->yy0.n);
-}
-
-%syntax_error {
- fprintf(stderr, "Syntax error. Last token (type %d) was %d. Ignoring "
- "input tokens until valid input is found.\n", yymajor,
yyminor.yy0.n);
-}
-
-%parse_failure {
- fprintf(stderr, "Parsing failed. Parser has reset.\n");
-}
-
-%token_type {token_t}
-%extra_argument {struct dplot_data *data}
-
-%token_prefix {TOKEN_}
-
-%type count {int}
-%type index {int}
-
-start_symbol ::= statement_list.
-
-statement_list ::= /* empty */.
-statement_list ::= statement_list statement.
-
-statement ::= surface_counts EOL.
-statement ::= ssx_info EOL.
-statement ::= linked_curve_count EOL.
-statement ::= split_face_count EOL.
-statement ::= split_face_info EOL.
-
-surface_counts ::= SURFACES count(C1) count(C2). {
- data->brep1_surface_count = C1;
- data->brep2_surface_count = C2;
-}
-
-ssx_info ::= SSX index(SURF_IDX1) index(SURF_IDX2) count(EVENTS)
count(CRV_COUNT1) count(CRV_COUNT2) count(B1_ISO) count(ISO)
isocsx_event_counts. {
- struct ssx *ssx;
- BU_GET(ssx, struct ssx);
-
- ssx->brep1_surface = SURF_IDX1;
- ssx->brep2_surface = SURF_IDX2;
- ssx->final_curve_events = EVENTS;
- ssx->face1_clipped_curves = CRV_COUNT1;
- ssx->face2_clipped_curves = CRV_COUNT2;
- ssx->intersecting_brep1_isocurves = B1_ISO;
- ssx->intersecting_isocurves = ISO;
- BU_LIST_INIT(&ssx->isocsx_list);
-
- /* move the list of event counts from the tmp location to this ssx
- * instance
- */
- BU_LIST_APPEND_LIST(&ssx->isocsx_list, &data->isocsx_list);
-
- BU_LIST_PUSH(&data->ssx_list, &ssx->l);
- ++data->ssx_count;
-}
-
-isocsx_event_counts ::= /* empty */.
-
-isocsx_event_counts ::= isocsx_event_counts count(C). {
- struct isocsx *isocsx;
- BU_GET(isocsx, struct isocsx);
-
- isocsx->events = C;
- BU_LIST_INIT(&isocsx->l);
-
- BU_LIST_PUSH(&data->isocsx_list, &isocsx->l);
-}
-
-linked_curve_count ::= LINKED_CURVES count(COUNT). {
- data->linked_curve_count = COUNT;
-}
-
-split_face_count ::= SPLIT_FACES count(SPLIT_FACES). {
- data->split_face_count = SPLIT_FACES;
- data->face = (struct split_face *)bu_malloc(SPLIT_FACES *
- sizeof(struct split_face), "split face array");
-}
-
-split_face_info ::= SPLIT_FACE index(I) count(OUTER_COUNT) count(INNER_COUNT).
{
- data->face[I].outerloop_curves = OUTER_COUNT;
- data->face[I].innerloop_curves = INNER_COUNT;
-}
-
-count(C) ::= NONNEGATIVE_INT(N). {
- C = N.n;
-}
-
-index(I) ::= NONNEGATIVE_INT(N). {
- I = N.n;
-}
Deleted: brlcad/branches/brep-debug/src/libged/dplot_reader.c
===================================================================
--- brlcad/branches/brep-debug/src/libged/dplot_reader.c 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/dplot_reader.c 2020-09-25
15:57:21 UTC (rev 77227)
@@ -1,87 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "dplot_reader.h"
-#include "bu.h"
-
-HIDDEN void *
-dplot_malloc(size_t s) {
- return bu_malloc(s, "dplot_malloc");
-}
-
-HIDDEN void
-dplot_free(void *p) {
- bu_free(p, "dplot_free");
-}
-
-int
-main(int argc, char *argv[])
-{
- int i, token_id;
- FILE *input_file;
- perplex_t scanner;
- void *parser;
- struct ssx *curr;
- struct dplot_data data;
-
- if (argc != 2) {
- bu_exit(1, "usage: %s input\n", argv[0]);
- }
-
- /* initialize scanner */
- input_file = fopen(argv[1], "r");
- if (!input_file) {
- bu_exit(2, "error: couldn't open \"%s\" for reading.\n", argv[1]);
- }
- scanner = perplexFileScanner(input_file);
-
- data.ssx_count = 0;
- BU_LIST_INIT(&data.ssx_list);
- perplexSetExtra(scanner, (void *)&data);
-
- /* initialize parser */
- parser = ParseAlloc(dplot_malloc);
-
- /* parse */
- while ((token_id = yylex(scanner)) != YYEOF) {
- Parse(parser, token_id, data.token_data, &data);
- }
- Parse(parser, 0, data.token_data, &data);
-
- /* move list data to array */
- if (data.ssx_count > 0) {
- data.ssx = (struct ssx *)bu_malloc(
- sizeof(struct ssx) * data.ssx_count, "ssx array");
-
- i = data.ssx_count - 1;
- while (BU_LIST_WHILE(curr, ssx, &data.ssx_list)) {
- data.ssx[i--] = *curr;
- BU_LIST_DEQUEUE(&curr->l);
- BU_PUT(curr, struct ssx);
- }
- }
-
- /* print data */
- bu_log("brep1: %d surfaces\n", data.brep1_surface_count);
- bu_log("brep2: %d surfaces\n", data.brep2_surface_count);
-
- for (i = 0; i < data.ssx_count; ++i) {
- bu_log("%d curve events between surface 1-%d and 2-%d\n",
- data.ssx[i].final_curve_events, data.ssx[i].brep1_surface,
- data.ssx[i].brep2_surface);
- bu_log("\t%d brep1 isocurves intersected brep2\n",
- data.ssx[i].intersecting_brep1_isocurves);
- bu_log("\t%d brep2 isocurves intersected brep1\n",
- data.ssx[i].intersecting_isocurves -
- data.ssx[i].intersecting_brep1_isocurves);
- }
-
- /* clean up */
- if (data.ssx) {
- bu_free(data.ssx, "ssx array");
- }
- ParseFree(parser, dplot_free);
- perplexFree(scanner);
- fclose(input_file);
-
- return 0;
-}
Deleted: brlcad/branches/brep-debug/src/libged/dplot_reader.h
===================================================================
--- brlcad/branches/brep-debug/src/libged/dplot_reader.h 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/dplot_reader.h 2020-09-25
15:57:21 UTC (rev 77227)
@@ -1,56 +0,0 @@
-#ifndef DPLOT_PARSER
-#define DPLOT_PARSER
-
-#define PERPLEX_ON_ENTER struct dplot_data *data = (struct dplot_data
*)yyextra;
-
-#include "bu.h"
-#include "dplot_parser.h"
-#include "dplot_scanner.h"
-
-typedef struct {
- int n;
-} token_t;
-
-struct isocsx {
- struct bu_list l;
- int events;
-};
-
-struct ssx {
- struct bu_list l;
- int brep1_surface;
- int brep2_surface;
- int final_curve_events;
- int face1_clipped_curves;
- int face2_clipped_curves;
- int intersecting_brep1_isocurves;
- int intersecting_isocurves;
- struct bu_list isocsx_list; /* struct isocsx list */
- int *isocsx_events;
-};
-
-struct split_face {
- int outerloop_curves;
- int innerloop_curves;
-};
-
-struct dplot_data {
- token_t token_data;
- int brep1_surface_count;
- int brep2_surface_count;
- int linked_curve_count;
- int ssx_count;
- int split_face_count;
- struct bu_list ssx_list; /* struct ssx list */
- struct ssx *ssx;
- struct bu_list isocsx_list; /* struct ssx list */
- struct split_face *face;
-};
-
-/* lemon prototypes */
-void *ParseAlloc(void *(*mallocProc)(size_t));
-void ParseFree(void *parser, void (*freeProc)(void *));
-void Parse(void *yyp, int yymajor, token_t tokenData, struct dplot_data *data);
-void ParseTrace(FILE *fp, char *s);
-
-#endif
Deleted: brlcad/branches/brep-debug/src/libged/dplot_scanner.perplex
===================================================================
--- brlcad/branches/brep-debug/src/libged/dplot_scanner.perplex 2020-09-25
15:35:15 UTC (rev 77226)
+++ brlcad/branches/brep-debug/src/libged/dplot_scanner.perplex 2020-09-25
15:57:21 UTC (rev 77227)
@@ -1,42 +0,0 @@
-#include "bu.h"
-#include "dplot_reader.h"
-enum {INITIAL, normal};
-%%
-<> => normal { continue; }
-
-<normal> {
-"surfaces" {
- return TOKEN_SURFACES;
-}
-
-"ssx" {
- return TOKEN_SSX;
-}
-
-"linkedcurves" {
- return TOKEN_LINKED_CURVES;
-}
-
-"splitfaces" {
- return TOKEN_SPLIT_FACES;
-}
-
-"splitface" {
- return TOKEN_SPLIT_FACE;
-}
-
-[0-9]|[1-9][0-9]+ {
- data->token_data.n = 0;
- bu_sscanf(yytext, "%d", &data->token_data.n);
- return TOKEN_NONNEGATIVE_INT;
-}
-
-[\n]+ {
- return TOKEN_EOL;
-}
-
-[^] {
- /* ignore */
- continue;
-}
-}
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
