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

[ejno]

Revision: 65152
          http://sourceforge.net/p/brlcad/code/65152
Author:   ejno
Date:     2015-06-02 14:27:58 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
set default material ID to 1 (must be greater than zero)

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-06-02 
14:22:48 UTC (rev 65151)
+++ brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp    2015-06-02 
14:27:58 UTC (rev 65152)
@@ -497,6 +497,7 @@
     virtual void write_to_section(FastgenWriter &writer, std::size_t id) const 
= 0;
 
     Section &m_section;
+    const std::size_t m_material_id;
 
 
 private:
@@ -507,6 +508,7 @@
 inline
 Section::Geometry::Geometry(Section &section, const std::string &name) :
     m_section(section),
+    m_material_id(1),
     m_name(name)
 {}
 
@@ -630,7 +632,7 @@
 Section::Line::write_to_section(FastgenWriter &writer, std::size_t id) const
 {
     FastgenWriter::Record record(writer);
-    record << "CLINE" << id << 0 << m_grid1 << m_grid2 << "" << "";
+    record << "CLINE" << id << m_material_id << m_grid1 << m_grid2 << "" << "";
 
     if (m_section.m_volume_mode)
        record << m_thickness * FastgenWriter::INCHES_PER_MM;
@@ -672,7 +674,7 @@
 Section::Sphere::write_to_section(FastgenWriter &writer, std::size_t id) const
 {
     FastgenWriter::Record record(writer);
-    record << "CSPHERE" << id << 0 << m_grid1 << "" << "" << "";
+    record << "CSPHERE" << id << m_material_id << m_grid1 << "" << "" << "";
     record.non_zero(m_thickness * FastgenWriter::INCHES_PER_MM).non_zero(
        m_radius * FastgenWriter::INCHES_PER_MM);
 }
@@ -724,7 +726,8 @@
 void
 Section::Cone::write_to_section(FastgenWriter &writer, std::size_t id) const
 {
-    FastgenWriter::Record(writer) << "CCONE2" << id << 0 << m_grid1 << m_grid2 
<< ""
+    FastgenWriter::Record(writer) << "CCONE2" << id << m_material_id << 
m_grid1 <<
+                                 m_grid2 << ""
                                  << "" << "" << m_ro1 * 
FastgenWriter::INCHES_PER_MM << id;
     FastgenWriter::Record(writer) << id << m_ro2 * 
FastgenWriter::INCHES_PER_MM <<
                                  m_ri1 * FastgenWriter::INCHES_PER_MM << m_ri2 
* FastgenWriter::INCHES_PER_MM;
@@ -778,7 +781,7 @@
                                    std::size_t id) const
 {
     FastgenWriter::Record record(writer);
-    record << "CTRI" << id << 0 << m_grid1 << m_grid2 << m_grid3;
+    record << "CTRI" << id << m_material_id << m_grid1 << m_grid2 << m_grid3;
     record.non_zero(m_thickness * FastgenWriter::INCHES_PER_MM);
     record << (m_grid_centered ? 1 : 2);
 }
@@ -832,7 +835,7 @@
     {
        FastgenWriter::Record record1(writer);
        record1 << (has_thickness ? "CHEX1" : "CHEX2");
-       record1 << id << 0;
+       record1 << id << m_material_id;
 
        for (std::size_t i = 0; i < 6; ++i)
            record1 << m_grids[i];

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