// Created on: 2006-05-25
// Created by: Alexander GRIGORIEV
-// Copyright (c) 2006-2012 OPEN CASCADE SAS
+// Copyright (c) 2006-2014 OPEN CASCADE SAS
//
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
//
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
//
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
-
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
#include <VrmlData_Scene.hxx>
#include <VrmlData_InBuffer.hxx>
#include <TopExp_Explorer.hxx>
#include <BRep_Builder.hxx>
#include <Precision.hxx>
+#include <Standard_Version.hxx>
#ifdef WNT
#define _CRT_SECURE_NO_DEPRECATE
myAutoNameCounter (0)
{
myWorldInfo = new VrmlData_WorldInfo (* this);
- myWorldInfo->AddInfo ("Created by OPEN CASCADE (tm) VrmlData API");
+ Standard_CString anInfo = "Generated by Open CASCADE Technology " OCC_VERSION_STRING;
+ myWorldInfo->AddInfo (anInfo);
myLstNodes.Append (myWorldInfo);
myAllNodes.Append (myWorldInfo);
}
//purpose :
//=======================================================================
-const Handle_VrmlData_WorldInfo& VrmlData_Scene::WorldInfo() const
+const Handle(VrmlData_WorldInfo)& VrmlData_Scene::WorldInfo() const
{
return myWorldInfo;
}
theBuffer.Input.getline (theBuffer.Line, sizeof(theBuffer.Line));
theBuffer.LineCount++;
const int stat = theBuffer.Input.rdstate();
- if (stat & ios::badbit)
+ if (stat & ios::badbit) {
aStatus = VrmlData_UnrecoverableError;
- else if (stat & ios::failbit)
- if (stat & ios::eofbit)
+ }
+ else if (stat & ios::failbit) {
+ if (stat & ios::eofbit) {
aStatus = VrmlData_EndOfFile;
- else
+ }
+ else {
aStatus = VrmlData_GeneralError;
+ }
+ }
theBuffer.LinePtr = &theBuffer.Line[0];
theBuffer.IsProcessed = Standard_False;
}
// if (myStatus == StatusOK)
// myStatus = ReadLine (aBuffer);
// Read VRML data by nodes
- while (~0) {
+ for(;;) {
if (!VrmlData_Node::OK(myStatus, ReadLine(aBuffer))) {
if (myStatus == VrmlData_EndOfFile)
myStatus = VrmlData_StatusOK;
Handle(VrmlData_Node) VrmlData_Scene::FindNode
(const char * theName,
- const Handle(Standard_Type)& theType) const
+ const Handle(Standard_Type)& /*theType*/) const
{
Handle(VrmlData_Node) aResult;
#ifdef USE_LIST_API
TCollection_AsciiString aName;
// Read the DEF token to assign the node name
- if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer)))
+ if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer))) {
if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "DEF")) {
if (VrmlData_Node::OK(aStatus, ReadWord (theBuffer, aName)))
aStatus = ReadLine(theBuffer);
theNode.Nullify();
return aStatus;
}
+ }
const char * strName = aName.ToCString();
if (aStatus == VrmlData_StatusOK) {
aStatus = ReadWord (theBuffer, aTitle);
if (isProto) {
aStatus = ReadLine(theBuffer);
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (theBuffer.LinePtr[0] != '[')
aStatus = VrmlData_VrmlFormatError;
else {
}
}
}
+ }
}
if (aStatus == VrmlData_StatusOK)
aNode = new VrmlData_UnknownNode(* this,
}
aStatus = ReadLine(theBuffer);
if (aNode.IsNull() == Standard_False) {
- if (aNode->Name()[0] != '\0')
+ if (aNode->Name()[0] != '\0')
myNamedNodes.Add (aNode);
if (theType.IsNull() == Standard_False)
if (aNode->IsKind(theType) == Standard_False)
aStatus = VrmlData_VrmlFormatError;
}
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (theBuffer.LinePtr[0] == '{') {
theBuffer.LinePtr++;
theNode = aNode;
myAllNodes.Append(aNode);
- } else
+ } else {
aStatus = VrmlData_VrmlFormatError;
+ }
+ }
return aStatus;
}
VrmlData_ErrorStatus aStatus;
if (VrmlData_Node::OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
char * endptr;
- aResult = strtod (theBuffer.LinePtr, &endptr);
+ aResult = Strtod (theBuffer.LinePtr, &endptr);
if (endptr == theBuffer.LinePtr)
aStatus = VrmlData_NumericInputError;
else if (isOnlyPositive && aResult < 0.001*Precision::Confusion())
Standard_Boolean isOnlyPos) const
{
Standard_Real aVal[3] = {0., 0., 0.};
- VrmlData_ErrorStatus aStatus;
+ VrmlData_ErrorStatus aStatus = VrmlData_StatusOK;
for (Standard_Integer i = 0; i < 3; i++) {
if (!VrmlData_Node::OK(aStatus, VrmlData_Scene::ReadLine(theBuffer)))
break;
char * endptr;
- aVal[i] = strtod (theBuffer.LinePtr, &endptr);
+ aVal[i] = Strtod (theBuffer.LinePtr, &endptr);
if (endptr == theBuffer.LinePtr) {
aStatus = VrmlData_NumericInputError;
break;
theBuffer.LinePtr = endptr;
}
}
- if (aStatus == VrmlData_StatusOK)
- if (isScale)
+ if (aStatus == VrmlData_StatusOK) {
+ if (isScale) {
theXYZ.SetCoord (aVal[0] * myLinearScale,
aVal[1] * myLinearScale,
aVal[2] * myLinearScale);
- else
+ }
+ else {
theXYZ.SetCoord (aVal[0], aVal[1], aVal[2]);
+ }
+ }
return aStatus;
}
Standard_Boolean isOnlyPos) const
{
Standard_Real aVal[2] = {0., 0.};
- VrmlData_ErrorStatus aStatus;
+ VrmlData_ErrorStatus aStatus = VrmlData_StatusOK;
for (Standard_Integer i = 0; i < 2; i++) {
if (!VrmlData_Node::OK(aStatus, VrmlData_Scene::ReadLine(theBuffer)))
break;
char * endptr;
- aVal[i] = strtod (theBuffer.LinePtr, &endptr);
+ aVal[i] = Strtod (theBuffer.LinePtr, &endptr);
if (endptr == theBuffer.LinePtr) {
aStatus = VrmlData_NumericInputError;
break;
theBuffer.LinePtr = endptr;
}
}
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (isScale)
theXY.SetCoord (aVal[0] * myLinearScale, aVal[1] * myLinearScale);
else
theXY.SetCoord (aVal[0], aVal[1]);
+ }
return aStatus;
}
{
VrmlData_ErrorStatus aStatus;
theNBlocks = 0;
- if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer)))
+ if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] != '[') // opening bracket
aStatus = VrmlData_VrmlFormatError;
else {
}
}
}
+ }
return aStatus;
}
const Standard_Integer * arrVal = theArrIndex[iBlock]+1;
switch (nVal) {
case 1:
- sprintf (buf, "%d,", arrVal[0]);
+ Sprintf (buf, "%d,", arrVal[0]);
break;
case 2:
- sprintf (buf, "%d,%d,", arrVal[0], arrVal[1]);
+ Sprintf (buf, "%d,%d,", arrVal[0], arrVal[1]);
break;
case 3:
- sprintf (buf, "%d,%d,%d,", arrVal[0], arrVal[1], arrVal[2]);
+ Sprintf (buf, "%d,%d,%d,", arrVal[0], arrVal[1], arrVal[2]);
break;
case 4:
- sprintf (buf, "%d,%d,%d,%d,",
+ Sprintf (buf, "%d,%d,%d,%d,",
arrVal[0], arrVal[1], arrVal[2], arrVal[3]);
break;
default:
if (nVal > 0) {
char * ptr = &buf[0];
for (Standard_Integer i = 0; i < nVal; i++) {
- sprintf (ptr, "%d,", arrVal[i]);
+ Sprintf (ptr, "%d,", arrVal[i]);
+ if (i == nVal - 1)
+ break;
ptr = strchr (ptr, ',') + 1;
if ((ptr - &buf[0]) > (ptrdiff_t)aLineLimit) {
WriteLine(buf);
const char * thePostfix) const
{
char buf[240];
- if (IsDummyWrite() == Standard_False)
+ if (IsDummyWrite() == Standard_False) {
if (isApplyScale && myLinearScale > Precision::Confusion())
- sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X() / myLinearScale,
+ Sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X() / myLinearScale,
theXYZ.Y() / myLinearScale, theXYZ.Z() / myLinearScale,
thePostfix ? thePostfix : "");
else
- sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X(), theXYZ.Y(), theXYZ.Z(),
+ Sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X(), theXYZ.Y(), theXYZ.Z(),
thePostfix ? thePostfix : "");
+ }
return WriteLine (buf);
}
Handle(VrmlData_UnknownNode) bidNode = new VrmlData_UnknownNode;
char buf[32];
do {
- sprintf (buf, "_%d",
+ Sprintf (buf, "_%d",
++const_cast<Standard_Integer&>(myAutoNameCounter));
bidNode->myName = &buf[0];
} while (myNamedNodes.Contains (bidNode));
const Handle(VrmlData_Group) aGroup =
Handle(VrmlData_Group)::DownCast (theNode);
char buf[64];
- sprintf (buf, "Group (%s)",
+ Sprintf (buf, "Group (%s)",
aGroup->IsTransform() ? "Transform" : "Group");
dumpNodeHeader (theStream, theIndent, buf, theNode->Name());
if (theIndent.IsEmpty() == Standard_False) {
const Standard_Integer ** ppDummy;
const Standard_Size nCoord = aNode->Coordinates()->Length();
const Standard_Size nPoly = aNode->Polygons (ppDummy);
- char buf[64];
- sprintf (buf, "IndexedFaceSet (%d vertices, %d polygons)", nCoord, nPoly);
+ char buf[80];
+ Sprintf (buf, "IndexedFaceSet (%" PRIuPTR " vertices, %" PRIuPTR " polygons)",
+ nCoord, nPoly);
+
dumpNodeHeader (theStream, theIndent, buf, theNode->Name());
} else if (theNode->IsKind(STANDARD_TYPE(VrmlData_IndexedLineSet))) {
const Handle(VrmlData_IndexedLineSet) aNode =
const Standard_Integer ** ppDummy;
const Standard_Size nCoord = aNode->Coordinates()->Length();
const Standard_Size nPoly = aNode->Polygons (ppDummy);
- char buf[64];
- sprintf (buf, "IndexedLineSet (%d vertices, %d polygons)", nCoord, nPoly);
+
+ char buf[80];
+ Sprintf(buf, "IndexedLineSet (%" PRIuPTR " vertices, %" PRIuPTR " polygons)",
+ nCoord, nPoly);
+
dumpNodeHeader (theStream, theIndent, buf, theNode->Name());
} else if (theNode->IsKind(STANDARD_TYPE(VrmlData_Material))) {
// const Handle(VrmlData_Material) aMaterial =
const Handle(VrmlData_UnknownNode) anUnknown =
Handle(VrmlData_UnknownNode)::DownCast (theNode);
char buf[64];
- sprintf (buf, "Unknown (%s)", anUnknown->GetTitle().ToCString());
+ Sprintf (buf, "Unknown (%s)", anUnknown->GetTitle().ToCString());
dumpNodeHeader (theStream, theIndent, buf, theNode->Name());
}
}
projects / occt.git / blobdiff