[brlcad-commits] SF.net SVN: brlcad:[65064] brlcad/trunk/src/libgcv/conv/fastgen4/ fastgen4_write.cpp

[ejno]

Revision: 65064
          http://sourceforge.net/p/brlcad/code/65064
Author:   ejno
Date:     2015-05-27 16:50:44 +0000 (Wed, 27 May 2015)
Log Message:
-----------
record when a region representing a CCONE has been written

Modified Paths:
--------------
    brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp

Modified: brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp
===================================================================
--- brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp    2015-05-27 
16:37:14 UTC (rev 65063)
+++ brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp    2015-05-27 
16:50:44 UTC (rev 65064)
@@ -28,6 +28,7 @@
 
 #include <fstream>
 #include <iomanip>
+#include <set>
 #include <sstream>
 #include <stdexcept>
 
@@ -632,7 +633,10 @@
 struct ConversionData {
     FastgenWriter &m_writer;
     const bn_tol &m_tol;
-    db_i &db; // for find_ccone_cutout()
+
+    // for find_ccone_cutout()
+    db_i &db;
+    std::set<std::string> recorded_ccones;
 };
 
 
@@ -677,12 +681,18 @@
            if (internal.idb_type != ID_REC && !tgc_is_ccone(tgc))
                return false;
 
-           std::string new_name = name;
-           fastf_t ro1 = MAGNITUDE(tgc.a), ro2 = MAGNITUDE(tgc.b), ri1 = 0.0, 
ri2 = 0.0;
+           std::string new_name;
+           fastf_t ro1, ro2, ri1, ri2;
 
            if (find_ccone_cutout(data.db, new_name, ro1, ro2, ri1, ri2)) {
                // an imported CCONE with cutout
-               // TODO: record that we have written this CCONE
+               if (!data.recorded_ccones.insert(name).second)
+                   break; // already written
+           } else {
+               new_name = name;
+               ro1 = MAGNITUDE(tgc.a);
+               ro2 = MAGNITUDE(tgc.b);
+               ri1 = ri2 = 0.0;
            }
 
            Section section(data.m_writer, new_name, true);
@@ -819,7 +829,7 @@
 
     const rt_tess_tol ttol = {RT_TESS_TOL_MAGIC, 0.0, 0.01, 0.0};
     const bn_tol tol = {BN_TOL_MAGIC, BN_TOL_DIST, BN_TOL_DIST * BN_TOL_DIST, 
1e-6, 1 - 1e-6};
-    ConversionData conv_data = {writer, tol, *dbip};
+    ConversionData conv_data = {writer, tol, *dbip, std::set<std::string>()};
 
     {
        model *vmodel;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits