0029597: Data Exchange - unable to read VRML2 file

VrmlData_Scene::createNode() now handles Collision item.
VrmlData_ArrayVec3d::ReadArray() now handles a case with omitted brackets.

Added test bugs xde bug29597

diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 8f20d3e6834dd705efada328ecb741f674932b1d..f0e231d0adef27bf6006a6580d84e271aa29a1c9 100644 (file)
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -631,7 +631,16 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
     // Read the body of the data node (list of triplets)
     if (OK(aStatus) && OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
       if (theBuffer.LinePtr[0] != '[')  // opening bracket
-        aStatus = VrmlData_VrmlFormatError;
+      {
+        // Handle case when brackets are ommited for single element of array
+        gp_XYZ anXYZ;
+        // Read three numbers (XYZ value)
+        if (!OK(aStatus, Scene().ReadXYZ(theBuffer, anXYZ,
+                                          isScale, Standard_False)))
+          aStatus = VrmlData_VrmlFormatError;
+        else
+          vecValues.Append(anXYZ);
+      }
       else {
         theBuffer.LinePtr++;
         for(;;) {

diff --git a/src/VrmlData/VrmlData_Group.cxx b/src/VrmlData/VrmlData_Group.cxx
index f1d989a661fa92ef0b77d0ee05f4e835fcfdda46..685b04523f967d6fb6b8b80607724c4fd035b193 100644 (file)
--- a/src/VrmlData/VrmlData_Group.cxx
+++ b/src/VrmlData/VrmlData_Group.cxx
@@ -203,6 +203,10 @@ VrmlData_ErrorStatus VrmlData_Group::Read (VrmlData_InBuffer& theBuffer)
           break;
       }
     }
+    else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "collide")) {
+      TCollection_AsciiString aDummy;
+      aStatus = Scene().ReadWord (theBuffer, aDummy);
+    }
     else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Separator") ||
              VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Switch")) {
       Standard_Boolean isBracketed (Standard_False);

diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx
index c1862caf4554147f9812c1c7991b662829b7420c..9128cd3fbd9e8536775fb4109d6897acaafd43ac 100644 (file)
--- a/src/VrmlData/VrmlData_Scene.cxx
+++ b/src/VrmlData/VrmlData_Scene.cxx
@@ -497,6 +497,9 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
     else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Separator"))
       aNode = new VrmlData_Group          (* this, strName,
                                            Standard_False);
+    else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Collision"))
+      aNode = new VrmlData_Group          (* this, strName,
+                                           Standard_False);
     else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Switch"))
       aNode = new VrmlData_Group          (* this, strName,
                                            Standard_False);

diff --git a/tests/bugs/xde/bug29597 b/tests/bugs/xde/bug29597
new file mode 100644 (file)
index 0000000..867f742
--- /dev/null
+++ b/tests/bugs/xde/bug29597
@@ -0,0 +1,17 @@
+puts "=========="
+puts "0029539: Data Exchange - unable to read VRML from data samples"
+puts "=========="
+puts ""
+
+pload VISUALIZATION XDE
+vclear
+vinit View1
+loadvrml v [locate_data_file bug29597_vrml2.wrl]
+vdisplay -dispMode 1 v
+vfit
+
+set anArea [triarea v]
+checkreal "Triangulation area" [lindex $anArea 0] 5341500. 1. 1e-6
+checktrinfo v -tri 12 -nod 24
+
+#vdump $::imagedir/${::casename}.png