diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx index 9375fa9236..b9efcd4f4e 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx @@ -43,7 +43,7 @@ XCAFAnimObjects_Orient::XCAFAnimObjects_Orient(const NCollection_Array1& theGeneralPresentation, const NCollection_Array1& theTimeStamps) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), myOrientPresentation(1, theGeneralPresentation.RowLength()) { if (theGeneralPresentation.ColLength() != 4) @@ -86,4 +86,5 @@ NCollection_Array2 XCAFAnimObjects_Orient::GeneralPresentation() const aRes.SetValue(aRowInd, 3, aQuat.Z()); aRes.SetValue(aRowInd, 4, aQuat.W()); } + return aRes; } \ No newline at end of file diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx index f6c2d89737..b9a78f2545 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx @@ -22,7 +22,7 @@ XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array1& theRotate, const NCollection_Array1& 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& XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array2& theGeneralPresentation, const NCollection_Array1& theTimeStamps, const XCAFAnimObjects_Rotate_Type theRotateType) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), myRotateType(theRotateType), myRotatePresentation(theGeneralPresentation) { diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx index 56903d97ac..5204fe7ae6 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx @@ -42,7 +42,7 @@ XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array1& t //======================================================================= XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array2& theGeneralPresentation, const NCollection_Array1& theTimeStamps) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), myScalePresentation(1, theGeneralPresentation.RowLength()) { if (theGeneralPresentation.ColLength() != 3) @@ -83,4 +83,5 @@ NCollection_Array2 XCAFAnimObjects_Scale::GeneralPresentation() const aRes.SetValue(aRowInd, 2, aXYZ.Y()); aRes.SetValue(aRowInd, 3, aXYZ.Z()); } + return aRes; } diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx index 694927f92c..19e562c610 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx @@ -42,7 +42,7 @@ XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array1& theSk //======================================================================= XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array2& theGeneralPresentation, const NCollection_Array1& theTimeStamps) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), mySkewPresentation(1, theGeneralPresentation.RowLength()) { if (theGeneralPresentation.ColLength() != 7) @@ -91,4 +91,5 @@ NCollection_Array2 XCAFAnimObjects_Skew::GeneralPresentation() const aRes.SetValue(aRowInd, 6, aSkew.Axis2.Y()); aRes.SetValue(aRowInd, 7, aSkew.Axis2.Z()); } + return aRes; } \ No newline at end of file diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx index e14ae4f02d..00ebfee6e8 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx @@ -42,7 +42,7 @@ XCAFAnimObjects_Transform::XCAFAnimObjects_Transform(const NCollection_Array1& theGeneralPresentation, const NCollection_Array1& theTimeStamps) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), myTransformPresentation(1, theGeneralPresentation.RowLength()) { if (theGeneralPresentation.ColLength() != 16) @@ -111,4 +111,5 @@ NCollection_Array2 XCAFAnimObjects_Transform::GeneralPresentation() cons aRes.SetValue(aRowInd, 15, aTransform.GetValue(4, 3)); aRes.SetValue(aRowInd, 16, aTransform.GetValue(4, 4)); } + return aRes; } \ No newline at end of file diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx index 8a001f38de..6eaefac25e 100644 --- a/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx +++ b/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx @@ -43,7 +43,7 @@ XCAFAnimObjects_Translate::XCAFAnimObjects_Translate(const NCollection_Array1& theGeneralPresentation, const NCollection_Array1& theTimeStamps) : - XCAFAnimObjects_Operation(false), + XCAFAnimObjects_Operation(theTimeStamps), myTranslatePresentation(1, theGeneralPresentation.RowLength()) { if (theGeneralPresentation.ColLength() != 3) @@ -84,4 +84,5 @@ NCollection_Array2 XCAFAnimObjects_Translate::GeneralPresentation() cons aRes.SetValue(aRowInd, 2, aXYZ.Y()); aRes.SetValue(aRowInd, 3, aXYZ.Z()); } + return aRes; } \ No newline at end of file diff --git a/src/XCAFDoc/XCAFDoc_Animation.cxx b/src/XCAFDoc/XCAFDoc_Animation.cxx index 42bc08e709..92510103f1 100644 --- a/src/XCAFDoc/XCAFDoc_Animation.cxx +++ b/src/XCAFDoc/XCAFDoc_Animation.cxx @@ -423,6 +423,7 @@ Handle(XCAFAnimObjects_AnimObject) XCAFDoc_Animation::GetObject() const { continue; } + aNewOperObj->SetInverse(anIsInvert); anOrderedOperations.Append(aNewOperObj); } return anObj; diff --git a/src/XCAFDoc/XCAFDoc_AnimationTool.cxx b/src/XCAFDoc/XCAFDoc_AnimationTool.cxx index bb8036086f..10eeea7350 100644 --- a/src/XCAFDoc/XCAFDoc_AnimationTool.cxx +++ b/src/XCAFDoc/XCAFDoc_AnimationTool.cxx @@ -20,7 +20,7 @@ #include #include #include -#include > +#include #include 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; } //=======================================================================