OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0029597: Data Exchange - unable to read VRML2 file

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

Added test bugs xde bug29597
This commit is contained in:
akz 2016-08-05 11:24:58 +03:00 committed by bugmaster
parent 060811b1b5
commit f84d6446a7
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/VrmlData/VrmlData_Geometry.cxx
View File

@ -631,7 +631,16 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
// Read the body of the data node (list of triplets) // Read the body of the data node (list of triplets)
if (OK(aStatus) && OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) { if (OK(aStatus) && OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] != '[') // opening bracket 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 { else {
theBuffer.LinePtr++; theBuffer.LinePtr++;
for(;;) { for(;;) {

4
src/VrmlData/VrmlData_Group.cxx
View File

@ -203,6 +203,10 @@ VrmlData_ErrorStatus VrmlData_Group::Read (VrmlData_InBuffer& theBuffer)
break; break;
} }
} }
else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "collide")) {
TCollection_AsciiString aDummy;
aStatus = Scene().ReadWord (theBuffer, aDummy);
}
else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Separator") || else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Separator") ||
VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Switch")) { VRMLDATA_LCOMPARE (theBuffer.LinePtr, "Switch")) {
Standard_Boolean isBracketed (Standard_False); Standard_Boolean isBracketed (Standard_False);

3
src/VrmlData/VrmlData_Scene.cxx
View File

@ -497,6 +497,9 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Separator")) else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Separator"))
aNode = new VrmlData_Group (* this, strName, aNode = new VrmlData_Group (* this, strName,
Standard_False); Standard_False);
else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Collision"))
aNode = new VrmlData_Group (* this, strName,
Standard_False);
else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Switch")) else if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "Switch"))
aNode = new VrmlData_Group (* this, strName, aNode = new VrmlData_Group (* this, strName,
Standard_False); Standard_False);

17
tests/bugs/xde/bug29597 Normal file
View File

@ -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