Replace void* with shared_ptr<void> in GeomAPI_Interface

[modules/shaper.git] / src / GeomAPI / GeomAPI_Dir.cpp

diff --git a/src/GeomAPI/GeomAPI_Dir.cpp b/src/GeomAPI/GeomAPI_Dir.cpp
index 6e8ea2429f790687cc5047a80efe94f2742e310a..3174cea0ee8f6fe056534d21ccac6885a0116e69 100644 (file)
--- a/src/GeomAPI/GeomAPI_Dir.cpp
+++ b/src/GeomAPI/GeomAPI_Dir.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Dir.cpp
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -7,11 +9,17 @@
 
 #include <gp_Dir.hxx>
 
-#define MY_DIR static_cast<gp_Pnt*>(myImpl)
+#define MY_DIR implPtr<gp_Dir>()
 
 GeomAPI_Dir::GeomAPI_Dir(const double theX, const double theY, const double theZ)
-  : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
-{}
+    : GeomAPI_Interface(new gp_Dir(theX, theY, theZ))
+{
+}
+
+GeomAPI_Dir::GeomAPI_Dir(const std::shared_ptr<GeomAPI_XYZ>& theCoords)
+    : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z()))
+{
+}
 
 double GeomAPI_Dir::x() const
 {
@@ -28,7 +36,25 @@ double GeomAPI_Dir::z() const
   return MY_DIR->Z();
 }
 
-const boost::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz() 
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::xyz()
+{
+  return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
+}
+
+double GeomAPI_Dir::dot(const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+  return MY_DIR->Dot(theArg->impl<gp_Dir>());
+}
+
+const std::shared_ptr<GeomAPI_XYZ> GeomAPI_Dir::cross(
+    const std::shared_ptr<GeomAPI_Dir>& theArg) const
 {
-  return boost::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z()));
+  gp_XYZ aResult = MY_DIR->XYZ().Crossed(theArg->impl<gp_Dir>().XYZ());
+  return std::shared_ptr<GeomAPI_XYZ>(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z()));
 }
+
+double GeomAPI_Dir::angle(const std::shared_ptr<GeomAPI_Dir>& theArg) const
+{
+  return MY_DIR->Angle(theArg->impl<gp_Dir>());
+}
+