Revision: 73872
http://sourceforge.net/p/brlcad/code/73872
Author: starseeker
Date: 2019-09-10 14:31:06 +0000 (Tue, 10 Sep 2019)
Log Message:
-----------
remove old cdt_surf_info definition
Modified Paths:
--------------
brlcad/trunk/src/libbrep/cdt.h
brlcad/trunk/src/libbrep/cdt_surf.cpp
Modified: brlcad/trunk/src/libbrep/cdt.h
===================================================================
--- brlcad/trunk/src/libbrep/cdt.h 2019-09-10 14:28:10 UTC (rev 73871)
+++ brlcad/trunk/src/libbrep/cdt.h 2019-09-10 14:31:06 UTC (rev 73872)
@@ -145,31 +145,6 @@
std::map<p2t::Triangle*, int> *tri_brep_face;
};
-struct cdt_surf_info {
- struct ON_Brep_CDT_State *s_cdt;
- const ON_Surface *s;
- const ON_BrepFace *f;
- ON_RTree *rt_trims;
- ON_RTree *rt_trims_3d;
- std::map<int,ON_3dPoint *> *strim_pnts;
- std::map<int,ON_3dPoint *> *strim_norms;
- double u1, u2, v1, v2;
- fastf_t ulen;
- fastf_t u_lower_3dlen;
- fastf_t u_mid_3dlen;
- fastf_t u_upper_3dlen;
- fastf_t vlen;
- fastf_t v_lower_3dlen;
- fastf_t v_mid_3dlen;
- fastf_t v_upper_3dlen;
- fastf_t min_edge;
- fastf_t max_edge;
- fastf_t min_dist;
- fastf_t within_dist;
- fastf_t cos_within_ang;
- std::set<ON_BoundingBox *> leaf_bboxes;
-};
-
#if 0
void
PerformClosedSurfaceChecks(
Modified: brlcad/trunk/src/libbrep/cdt_surf.cpp
===================================================================
--- brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-10 14:28:10 UTC (rev
73871)
+++ brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-10 14:31:06 UTC (rev
73872)
@@ -59,7 +59,7 @@
#include "bn/rand.h"
#include "./cdt.h"
-struct cdt_surf_info_2 {
+struct cdt_surf_info {
std::set<ON_2dPoint *> on_surf_points;
struct ON_Brep_CDT_State *s_cdt;
const ON_Surface *s;
@@ -104,7 +104,7 @@
};
static double
-uline_len_est(struct cdt_surf_info_2 *sinfo, double u1, double u2, double v)
+uline_len_est(struct cdt_surf_info *sinfo, double u1, double u2, double v)
{
double t, lenfact, lenest;
int active_half = (fabs(sinfo->v1 - v) < fabs(sinfo->v2 - v)) ? 0 : 1;
@@ -121,7 +121,7 @@
static double
-vline_len_est(struct cdt_surf_info_2 *sinfo, double u, double v1, double v2)
+vline_len_est(struct cdt_surf_info *sinfo, double u, double v1, double v2)
{
double t, lenfact, lenest;
int active_half = (fabs(sinfo->u1 - u) < fabs(sinfo->u2 - u)) ? 0 : 1;
@@ -137,7 +137,7 @@
}
static ON_3dPoint *
-singular_trim_norm(struct cdt_surf_info_2 *sinfo, fastf_t uc, fastf_t vc)
+singular_trim_norm(struct cdt_surf_info *sinfo, fastf_t uc, fastf_t vc)
{
if (sinfo->strim_pnts->find(sinfo->f->m_face_index) !=
sinfo->strim_pnts->end()) {
//bu_log("Face %d has singular trims\n", sinfo->f->m_face_index);
@@ -226,7 +226,7 @@
/* If we've got trimming curves involved, we need to be more careful about
respecting
* the min edge distance. */
-static bool involves_trims(double *min_edge, struct cdt_surf_info_2 *sinfo,
ON_3dPoint &p1, ON_3dPoint &p2)
+static bool involves_trims(double *min_edge, struct cdt_surf_info *sinfo,
ON_3dPoint &p1, ON_3dPoint &p2)
{
double min_edge_dist = sinfo->max_edge;
@@ -306,7 +306,7 @@
* (0,0)
*/
static double
-_cdt_get_uv_edge_3d_len(struct cdt_surf_info_2 *sinfo, int c1, int c2)
+_cdt_get_uv_edge_3d_len(struct cdt_surf_info *sinfo, int c1, int c2)
{
int line_set = 0;
double wu1, wv1, wu2, wv2, umid, vmid = 0.0;
@@ -398,7 +398,7 @@
}
void
-filter_surface_edge_pnts_2(struct cdt_surf_info_2 *sinfo)
+filter_surface_edge_pnts_2(struct cdt_surf_info *sinfo)
{
// Points on
@@ -478,7 +478,7 @@
static bool
getSurfacePoint(
- struct cdt_surf_info_2 *sinfo,
+ struct cdt_surf_info *sinfo,
SPatch &sp,
std::queue<SPatch> &nq
)
@@ -676,7 +676,7 @@
return;
}
- struct cdt_surf_info_2 sinfo;
+ struct cdt_surf_info sinfo;
sinfo.s_cdt = s_cdt;
sinfo.s = s;
sinfo.f = &face;
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
