1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-06-05 11:24:17 +03:00

// fixed compilation problem

This commit is contained in:
dpasukhi 2023-05-28 14:06:38 +01:00 committed by oan
parent ce13c99e9b
commit 514c451b3a
8 changed files with 15 additions and 9 deletions

View File

@ -43,7 +43,7 @@ XCAFAnimObjects_Orient::XCAFAnimObjects_Orient(const NCollection_Array1<gp_Quate
//=======================================================================
XCAFAnimObjects_Orient::XCAFAnimObjects_Orient(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myOrientPresentation(1, theGeneralPresentation.RowLength())
{
if (theGeneralPresentation.ColLength() != 4)
@ -86,4 +86,5 @@ NCollection_Array2<double> XCAFAnimObjects_Orient::GeneralPresentation() const
aRes.SetValue(aRowInd, 3, aQuat.Z());
aRes.SetValue(aRowInd, 4, aQuat.W());
}
return aRes;
}

View File

@ -22,7 +22,7 @@
XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array1<double>& theRotate,
const NCollection_Array1<double>& theTimeStamps,
const XCAFAnimObjects_Rotate_Type theRotateType) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myRotateType(theRotateType),
myRotatePresentation(1, 1, theRotate.Lower(), theRotate.Upper())
{
@ -54,7 +54,7 @@ XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array1<double>&
XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps,
const XCAFAnimObjects_Rotate_Type theRotateType) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myRotateType(theRotateType),
myRotatePresentation(theGeneralPresentation)
{

View File

@ -42,7 +42,7 @@ XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array1<gp_XYZ>& t
//=======================================================================
XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myScalePresentation(1, theGeneralPresentation.RowLength())
{
if (theGeneralPresentation.ColLength() != 3)
@ -83,4 +83,5 @@ NCollection_Array2<double> XCAFAnimObjects_Scale::GeneralPresentation() const
aRes.SetValue(aRowInd, 2, aXYZ.Y());
aRes.SetValue(aRowInd, 3, aXYZ.Z());
}
return aRes;
}

View File

@ -42,7 +42,7 @@ XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array1<Skew>& theSk
//=======================================================================
XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
mySkewPresentation(1, theGeneralPresentation.RowLength())
{
if (theGeneralPresentation.ColLength() != 7)
@ -91,4 +91,5 @@ NCollection_Array2<double> XCAFAnimObjects_Skew::GeneralPresentation() const
aRes.SetValue(aRowInd, 6, aSkew.Axis2.Y());
aRes.SetValue(aRowInd, 7, aSkew.Axis2.Z());
}
return aRes;
}

View File

@ -42,7 +42,7 @@ XCAFAnimObjects_Transform::XCAFAnimObjects_Transform(const NCollection_Array1<NC
//=======================================================================
XCAFAnimObjects_Transform::XCAFAnimObjects_Transform(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myTransformPresentation(1, theGeneralPresentation.RowLength())
{
if (theGeneralPresentation.ColLength() != 16)
@ -111,4 +111,5 @@ NCollection_Array2<double> XCAFAnimObjects_Transform::GeneralPresentation() cons
aRes.SetValue(aRowInd, 15, aTransform.GetValue(4, 3));
aRes.SetValue(aRowInd, 16, aTransform.GetValue(4, 4));
}
return aRes;
}

View File

@ -43,7 +43,7 @@ XCAFAnimObjects_Translate::XCAFAnimObjects_Translate(const NCollection_Array1<gp
//=======================================================================
XCAFAnimObjects_Translate::XCAFAnimObjects_Translate(const NCollection_Array2<double>& theGeneralPresentation,
const NCollection_Array1<double>& theTimeStamps) :
XCAFAnimObjects_Operation(false),
XCAFAnimObjects_Operation(theTimeStamps),
myTranslatePresentation(1, theGeneralPresentation.RowLength())
{
if (theGeneralPresentation.ColLength() != 3)
@ -84,4 +84,5 @@ NCollection_Array2<double> XCAFAnimObjects_Translate::GeneralPresentation() cons
aRes.SetValue(aRowInd, 2, aXYZ.Y());
aRes.SetValue(aRowInd, 3, aXYZ.Z());
}
return aRes;
}

View File

@ -423,6 +423,7 @@ Handle(XCAFAnimObjects_AnimObject) XCAFDoc_Animation::GetObject() const
{
continue;
}
aNewOperObj->SetInverse(anIsInvert);
anOrderedOperations.Append(aNewOperObj);
}
return anObj;

View File

@ -20,7 +20,7 @@
#include <TDataStd_UAttribute.hxx>
#include <TDF_ChildIterator.hxx>
#include <XCAFDoc.hxx>
#include <XCAFDoc_Animation.hxx>>
#include <XCAFDoc_Animation.hxx>
#include <XCAFDoc_GraphNode.hxx>
IMPLEMENT_DERIVED_ATTRIBUTE_WITH_TYPE(XCAFDoc_AnimationTool, TDataStd_GenericEmpty, "xcaf", "AnimationTool")
@ -249,8 +249,8 @@ void XCAFDoc_AnimationTool::Unlock(const TDF_Label& theAnimLabel) const
Standard_OStream& XCAFDoc_AnimationTool::Dump(Standard_OStream& theOStream,
const bool theDepth) const
{
(void)theOStream;
(void)theDepth;
return theOStream;
}
//=======================================================================