FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Sylvan Marie, "I attached my revised dxfEntity.cpp file from the DXF plugin with the 2

Browse Source 
following improvements:

- When all unsupported entities (SOLIDS, TEXT, ...) have been filtered out
from a block, dxfInsert::drawScene() was crashing because it assumed that
the block was not empty. It now returns silently so the other blocks can
still be imported.

- The DXF reader assumed all vertices were read first, then the face
indices. But, from the DXF "documentation" (www.autodesk.com/dxf) :
"Polyface meshes created with the PFACE command are always generated with
all the vertex coordinate entities first, followed by the face definition
entities. The code within AutoCAD that processes polyface meshes requires
this ordering. Programs that generate polyface meshes in DXF should generate
all the vertices then all the faces. However, programs that read polyface
meshes from DXF should be tolerant of odd vertex and face ordering."
So now the importer ignores the posted number of vertices and face indices,
and uses the size of the lists instead."
This commit is contained in:
Robert Osfield
2006-11-22 20:47:53 +00:00
parent 1f3a851cfc
commit 9c66cb4127
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/osgPlugins/dxf/dxfEntity.cpp
View File

@@ -333,19 +333,15 @@ dxfPolyline::assign(dxfFile* dxf, codeValue& cv)
if (cv._groupCode == 0) {
if (s == "VERTEX") {
_currentVertex = new dxfVertex;
if (_mcount && (_flag & 64) && _vertices.size() == _mcount) {
_indices.push_back(_currentVertex);
} else {
// don't know if and what to do if no _mcount
_vertices.push_back(_currentVertex);
}
} else {
// hum not sure if
// 1) that is possible
// 2) what to do...
_vertices.push_back(_currentVertex);
}
} else if (_currentVertex) {
_currentVertex->assign(dxf, cv);
if ((_flag & 64 /*i.e. polymesh*/) &&
(cv._groupCode == 70 /*i.e. vertex flag*/) &&
(cv._int && 128 /*i.e. vertex is actually a face*/))
_indices.push_back(_currentVertex); // Add the index only if _currentvertex is actually an index
} else {
double d = cv._double;
switch (cv._groupCode) {
@@ -362,9 +358,23 @@ dxfPolyline::assign(dxfFile* dxf, codeValue& cv)
_flag = cv._int; // 2005.12.13 pdr: group codes [70,78] now signed int.
break;
case 71:
// Meaningful only when _surfacetype == 6, don' trust it for polymeshes.
// From the docs :
// "The 71 group specifies the number of vertices in the mesh, and the 72 group
// specifies the number of faces. Although these counts are correct for all meshes
// created with the PFACE command, applications are not required to place correct
// values in these fields.)"
// Amusing isn't it ?
_mcount = cv._int; // 2005.12.13 pdr: group codes [70,78] now signed int.
break;
case 72:
// Meaningful only when _surfacetype == 6, don' trust it for polymeshes.
// From the docs :
// "The 71 group specifies the number of vertices in the mesh, and the 72 group
// specifies the number of faces. Although these counts are correct for all meshes
// created with the PFACE command, applications are not required to place correct
// values in these fields.)"
// Amusing isn't it ?
_ncount = cv._int; // 2005.12.13 pdr: group codes [70,78] now signed int.
break;
case 73:
@@ -396,8 +406,6 @@ dxfPolyline::assign(dxfFile* dxf, codeValue& cv)
void
dxfPolyline::drawScene(scene* sc)
{
// if (getLayer() != "UDF2" && getLayer() != "ENGINES") return;
// if (!(_flag & 16)) return;
Matrixd m;
getOCSMatrix(_ocs, m);
sc->ocs(m);
@@ -412,7 +420,7 @@ dxfPolyline::drawScene(scene* sc)
//dxfVertex* v = NULL;
unsigned short ncount;
unsigned short mcount;
if (_surfacetype ==6) {
if (_surfacetype == 6) {
// I dont have examples of type 5 and 8, but they may be the same as 6
mcount = _mdensity;
ncount = _ndensity;
@@ -543,14 +551,11 @@ dxfPolyline::drawScene(scene* sc)
sc->addTriangles(getLayer(), _color, vlist, invert_order);
} else if (_flag & 64) {
if (_ncount > _indices.size())
_ncount = _indices.size();
unsigned short _facetype = 3;
unsigned short count = 0;
for (unsigned short i = 0; i < _ncount; i++) {
for (unsigned short i = 0; i < _indices.size(); i++) {
dxfVertex* vindice = _indices[i].get();
if (!vindice) continue;
//dxfVertex* v = NULL;
if (vindice->getIndice4()) {
_facetype = 4;
d = _vertices[vindice->getIndice4()-1].get()->getVertex();
@@ -560,17 +565,17 @@ dxfPolyline::drawScene(scene* sc)
if (vindice->getIndice3()) {
c = _vertices[vindice->getIndice3()-1].get()->getVertex();
} else {
c = _vertices[count++].get()->getVertex();
c = vindice->getVertex(); // Vertex not indexed. Use as is
}
if (vindice->getIndice2()) {
b = _vertices[vindice->getIndice2()-1].get()->getVertex();
} else {
b = _vertices[count++].get()->getVertex();
b = vindice->getVertex(); // Vertex not indexed. Use as is
}
if (vindice->getIndice1()) {
a = _vertices[vindice->getIndice1()-1].get()->getVertex();
} else {
a = _vertices[count++].get()->getVertex();
a = vindice->getVertex(); // Vertex not indexed. Use as is
}
if (_facetype == 4) {
qlist.push_back(d);
@@ -726,6 +731,11 @@ dxfInsert::drawScene(scene* sc)
// but for now, it seems working fine
// (with the files I have, the results are equal to Voloview,
// and better than Deep Exploration and Lightwave).
// sanity check (useful when no block remains after all SOLIDS, TEXT, ... have been filtered out)
if (!_block)
return;
Matrixd back = sc->backMatrix();
Matrixd m;
m.makeIdentity();