diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,15 @@ ## Unreleased +## 0.1.2.1 - 2024-01-09 + +### Added + +- Added OpenCascade.BRepPrimAPI.MakeCone + ## 0.1.1.1 - 2023-12-12 + +### Fixed - Include header files in package, fixing build diff --git a/cpp/hs_BRepPrimAPI_MakeCone.cpp b/cpp/hs_BRepPrimAPI_MakeCone.cpp new file mode 100644 --- /dev/null +++ b/cpp/hs_BRepPrimAPI_MakeCone.cpp @@ -0,0 +1,7 @@ +#include +#include "hs_BRepPrimAPI_MakeCone.h" + +TopoDS_Solid * hs_BRepPrimAPI_MakeCone_fromTwoRadiiAndHeight(double r1, double r2, double h){ + auto builder = BRepPrimAPI_MakeCone(r1, r2, h); + return new TopoDS_Solid(builder.Solid()); +} diff --git a/cpp/hs_BRepPrimAPI_MakeCone.h b/cpp/hs_BRepPrimAPI_MakeCone.h new file mode 100644 --- /dev/null +++ b/cpp/hs_BRepPrimAPI_MakeCone.h @@ -0,0 +1,16 @@ +#ifndef HS_BREPPRIMAPI_MAKECONE_H +#define HS_BREPPRIMAPI_MAKECONE_H + +#include "hs_types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +TopoDS_Solid * hs_BRepPrimAPI_MakeCone_fromTwoRadiiAndHeight(double r1, double r2, double h); + +#ifdef __cplusplus +} +#endif + +#endif // HS_BREPPRIMAPI_MAKECONE_H diff --git a/opencascade-hs.cabal b/opencascade-hs.cabal --- a/opencascade-hs.cabal +++ b/opencascade-hs.cabal @@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: opencascade-hs -version: 0.1.1.1 +version: 0.1.2.1 synopsis: Thin Wrapper for the OpenCASCADE CAD Kernel description: Please see the README on GitHub at category: Graphics,FFI @@ -37,6 +37,7 @@ cpp/hs_BRepOffsetAPI_MakeOffsetShape.h cpp/hs_BRepOffsetAPI_MakePipe.h cpp/hs_BRepPrimAPI_MakeBox.h + cpp/hs_BRepPrimAPI_MakeCone.h cpp/hs_BRepPrimAPI_MakeCylinder.h cpp/hs_BRepPrimAPI_MakePrism.h cpp/hs_BRepPrimAPI_MakeRevol.h @@ -118,6 +119,7 @@ OpenCascade.BRepPrimAPI OpenCascade.BRepPrimAPI.Internal.Destructors OpenCascade.BRepPrimAPI.MakeBox + OpenCascade.BRepPrimAPI.MakeCone OpenCascade.BRepPrimAPI.MakeCylinder OpenCascade.BRepPrimAPI.MakePrism OpenCascade.BRepPrimAPI.MakeRevol @@ -206,9 +208,8 @@ Paths_opencascade_hs hs-source-dirs: src - ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints - cc-options: -Werror-implicit-function-declaration - cxx-options: --std=c++17 + ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -optc -Werror-implicit-function-declaration + cxx-options: --std=c++17 -Wall -Werror -Wno-deprecated include-dirs: cpp /usr/include/opencascade @@ -229,6 +230,7 @@ cpp/hs_BRepOffsetAPI_MakeOffsetShape.cpp cpp/hs_BRepOffsetAPI_MakePipe.cpp cpp/hs_BRepPrimAPI_MakeBox.cpp + cpp/hs_BRepPrimAPI_MakeCone.cpp cpp/hs_BRepPrimAPI_MakeCylinder.cpp cpp/hs_BRepPrimAPI_MakePrism.cpp cpp/hs_BRepPrimAPI_MakeRevol.cpp diff --git a/src/OpenCascade/BRepBuilderAPI/MakeFace.hs b/src/OpenCascade/BRepBuilderAPI/MakeFace.hs --- a/src/OpenCascade/BRepBuilderAPI/MakeFace.hs +++ b/src/OpenCascade/BRepBuilderAPI/MakeFace.hs @@ -39,7 +39,7 @@ foreign import capi unsafe "hs_BRepBuilderAPI_MakeFace.h hs_new_BRepBuilderAPI_MakeFace_fromFace" rawFromFace :: Ptr TopoDS.Face -> IO (Ptr MakeFace) fromFace :: Ptr TopoDS.Face -> Acquire (Ptr MakeFace) -fromFace face = mkAcquire (rawFromFace face) deleteMakeFace +fromFace theFace = mkAcquire (rawFromFace theFace) deleteMakeFace -- fromSurface diff --git a/src/OpenCascade/BRepBuilderAPI/MakeShape.hs b/src/OpenCascade/BRepBuilderAPI/MakeShape.hs --- a/src/OpenCascade/BRepBuilderAPI/MakeShape.hs +++ b/src/OpenCascade/BRepBuilderAPI/MakeShape.hs @@ -4,11 +4,8 @@ , shape ) where import OpenCascade.BRepBuilderAPI.Types -import OpenCascade.BRepBuilderAPI.Internal.Destructors import qualified OpenCascade.TopoDS as TopoDS -import OpenCascade.Inheritance (upcast) import OpenCascade.TopoDS.Internal.Destructors (deleteShape) -import Foreign.C import Foreign.Ptr import Data.Acquire diff --git a/src/OpenCascade/BRepBuilderAPI/MakeSolid.hs b/src/OpenCascade/BRepBuilderAPI/MakeSolid.hs --- a/src/OpenCascade/BRepBuilderAPI/MakeSolid.hs +++ b/src/OpenCascade/BRepBuilderAPI/MakeSolid.hs @@ -10,7 +10,6 @@ import qualified OpenCascade.TopoDS as TopoDS import OpenCascade.Inheritance (upcast) import OpenCascade.TopoDS.Internal.Destructors (deleteShape) -import Foreign.C import Foreign.Ptr import Data.Acquire diff --git a/src/OpenCascade/BRepPrimAPI/MakeCone.hs b/src/OpenCascade/BRepPrimAPI/MakeCone.hs new file mode 100644 --- /dev/null +++ b/src/OpenCascade/BRepPrimAPI/MakeCone.hs @@ -0,0 +1,16 @@ +{-# LANGUAGE CApiFFI #-} +module OpenCascade.BRepPrimAPI.MakeCone +( fromTwoRadiiAndHeight +) where + +import qualified OpenCascade.TopoDS as TopoDS +import qualified OpenCascade.TopoDS.Internal.Destructors as TopoDS.Destructors +import Foreign.C +import Foreign.Ptr +import Data.Acquire +import Data.Coerce (coerce) + +foreign import capi unsafe "hs_BRepPrimAPI_MakeCone.h hs_BRepPrimAPI_MakeCone_fromTwoRadiiAndHeight" rawFromTwoRadiiAndHeight :: CDouble -> CDouble -> CDouble -> IO (Ptr TopoDS.Solid) + +fromTwoRadiiAndHeight :: Double -> Double -> Double -> Acquire (Ptr TopoDS.Solid) +fromTwoRadiiAndHeight r1 r2 h = mkAcquire ((coerce rawFromTwoRadiiAndHeight) r1 r2 h) (TopoDS.Destructors.deleteShape . castPtr) diff --git a/src/OpenCascade/BRepPrimAPI/MakeCylinder.hs b/src/OpenCascade/BRepPrimAPI/MakeCylinder.hs --- a/src/OpenCascade/BRepPrimAPI/MakeCylinder.hs +++ b/src/OpenCascade/BRepPrimAPI/MakeCylinder.hs @@ -3,7 +3,6 @@ ( fromRadiusAndHeight ) where -import qualified OpenCascade.GP as GP import qualified OpenCascade.TopoDS as TopoDS import qualified OpenCascade.TopoDS.Internal.Destructors as TopoDS.Destructors import Foreign.C diff --git a/src/OpenCascade/Font/BRepTextBuilder.hs b/src/OpenCascade/Font/BRepTextBuilder.hs --- a/src/OpenCascade/Font/BRepTextBuilder.hs +++ b/src/OpenCascade/Font/BRepTextBuilder.hs @@ -15,7 +15,6 @@ import qualified OpenCascade.TopoDS as TopoDS import qualified OpenCascade.GP as GP import OpenCascade.TopoDS.Internal.Destructors (deleteShape) -import Foreign.C (withCString) foreign import capi unsafe "hs_Font_BRepTextBuilder.h hs_new_Font_BRepTextBuilder" rawNew :: IO (Ptr BRepTextBuilder) diff --git a/src/OpenCascade/GP/Ax1.hs b/src/OpenCascade/GP/Ax1.hs --- a/src/OpenCascade/GP/Ax1.hs +++ b/src/OpenCascade/GP/Ax1.hs @@ -117,7 +117,7 @@ foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_Mirrored" rawMirrored :: Ptr Ax1 -> Ptr Ax1 -> IO (Ptr Ax1) mirrored :: Ptr Ax1 -> Ptr Ax1 -> Acquire (Ptr Ax1) -mirrored axis mirror = mkAcquire (rawMirrored axis mirror) deleteAx1 +mirrored axis mirrorAxis = mkAcquire (rawMirrored axis mirrorAxis) deleteAx1 foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_MirrorAboutPnt" mirrorAboutPnt :: Ptr Ax1 -> Ptr Pnt -> IO () @@ -125,7 +125,7 @@ foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_MirroredAboutPnt" rawMirroredAboutPnt :: Ptr Ax1 -> Ptr Pnt -> IO (Ptr Ax1) mirroredAboutPnt :: Ptr Ax1 -> Ptr Pnt -> Acquire (Ptr Ax1) -mirroredAboutPnt axis mirror = mkAcquire (rawMirroredAboutPnt axis mirror) deleteAx1 +mirroredAboutPnt axis mirrorPnt = mkAcquire (rawMirroredAboutPnt axis mirrorPnt) deleteAx1 foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_MirrorAboutAx2" mirrorAboutAx2 :: Ptr Ax1 -> Ptr Ax2 -> IO () @@ -133,7 +133,7 @@ foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_MirroredAboutAx2" rawMirroredAboutAx2 :: Ptr Ax1 -> Ptr Ax2 -> IO (Ptr Ax1) mirroredAboutAx2 :: Ptr Ax1 -> Ptr Ax2 -> Acquire (Ptr Ax1) -mirroredAboutAx2 axis mirror = mkAcquire (rawMirroredAboutAx2 axis mirror) deleteAx1 +mirroredAboutAx2 axis mirrorAxis = mkAcquire (rawMirroredAboutAx2 axis mirrorAxis) deleteAx1 -- rotate/rotated @@ -145,7 +145,7 @@ foreign import capi unsafe "hs_gp_Ax1.h hs_gp_Ax1_Rotated" rawRotated :: Ptr Ax1 -> Ptr Ax1 -> CDouble -> IO (Ptr Ax1) rotated :: Ptr Ax1 -> Ptr Ax1 -> Double -> Acquire (Ptr Ax1) -rotated axis axisOfRotation angle = mkAcquire (rawRotated axis axisOfRotation (CDouble angle)) deleteAx1 +rotated axis axisOfRotation angleOfRotation = mkAcquire (rawRotated axis axisOfRotation (CDouble angleOfRotation)) deleteAx1 -- scale/scaled diff --git a/src/OpenCascade/GP/Ax2.hs b/src/OpenCascade/GP/Ax2.hs --- a/src/OpenCascade/GP/Ax2.hs +++ b/src/OpenCascade/GP/Ax2.hs @@ -46,12 +46,12 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_new_gp_Ax2" rawNew :: Ptr Pnt -> Ptr Dir -> Ptr Dir -> IO (Ptr Ax2) new :: Ptr Pnt -> Ptr Dir -> Ptr Dir -> Acquire (Ptr Ax2) -new origin axis vX = mkAcquire (rawNew origin axis vX) deleteAx2 +new origin vAxis vX = mkAcquire (rawNew origin vAxis vX) deleteAx2 foreign import capi unsafe "hs_gp_Ax2.h hs_new_gp_Ax2_autoX" rawNewAutoX :: Ptr Pnt -> Ptr Dir -> IO (Ptr Ax2) newAutoX :: Ptr Pnt -> Ptr Dir -> Acquire (Ptr Ax2) -newAutoX origin axis = mkAcquire (rawNewAutoX origin axis) deleteAx2 +newAutoX origin dir = mkAcquire (rawNewAutoX origin dir) deleteAx2 -- getters @@ -112,7 +112,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_Mirrored" rawMirrored :: Ptr Ax2 -> Ptr Ax2 -> IO (Ptr Ax2) mirrored :: Ptr Ax2 -> Ptr Ax2 -> Acquire (Ptr Ax2) -mirrored axis mirror = mkAcquire (rawMirrored axis mirror) deleteAx2 +mirrored ax mirrorAxis = mkAcquire (rawMirrored ax mirrorAxis) deleteAx2 foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_MirrorAboutPnt" mirrorAboutPnt :: Ptr Ax2 -> Ptr Pnt -> IO () @@ -120,7 +120,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_MirroredAboutPnt" rawMirroredAboutPnt :: Ptr Ax2 -> Ptr Pnt -> IO (Ptr Ax2) mirroredAboutPnt :: Ptr Ax2 -> Ptr Pnt -> Acquire (Ptr Ax2) -mirroredAboutPnt axis mirror = mkAcquire (rawMirroredAboutPnt axis mirror) deleteAx2 +mirroredAboutPnt ax mirrorAxis = mkAcquire (rawMirroredAboutPnt ax mirrorAxis) deleteAx2 foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_MirrorAboutAx1" mirrorAboutAx1 :: Ptr Ax2 -> Ptr Ax1 -> IO () @@ -128,7 +128,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_MirroredAboutAx1" rawMirroredAboutAx1 :: Ptr Ax2 -> Ptr Ax1 -> IO (Ptr Ax2) mirroredAboutAx1 :: Ptr Ax2 -> Ptr Ax1 -> Acquire (Ptr Ax2) -mirroredAboutAx1 axis mirror = mkAcquire (rawMirroredAboutAx1 axis mirror) deleteAx2 +mirroredAboutAx1 ax mirrorAxis = mkAcquire (rawMirroredAboutAx1 ax mirrorAxis) deleteAx2 -- rotate/rotated @@ -141,7 +141,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_Rotated" rawRotated :: Ptr Ax2 -> Ptr Ax1 -> CDouble -> IO (Ptr Ax2) rotated :: Ptr Ax2 -> Ptr Ax1 -> Double -> Acquire (Ptr Ax2) -rotated axis axisOfRotation angle = mkAcquire (rawRotated axis axisOfRotation (CDouble angle)) deleteAx2 +rotated ax axisOfRotation angle = mkAcquire (rawRotated ax axisOfRotation (CDouble angle)) deleteAx2 -- scale/scaled @@ -153,7 +153,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_Scaled" rawScaled :: Ptr Ax2 -> Ptr Pnt -> CDouble -> IO (Ptr Ax2) scaled :: Ptr Ax2 -> Ptr Pnt -> Double -> Acquire (Ptr Ax2) -scaled axis origin amount = mkAcquire (rawScaled axis origin (CDouble amount)) deleteAx2 +scaled ax origin amount = mkAcquire (rawScaled ax origin (CDouble amount)) deleteAx2 -- transform/transformed @@ -162,7 +162,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_Transformed" rawTransformed :: Ptr Ax2 -> Ptr Trsf -> IO (Ptr Ax2) transformed :: Ptr Ax2 -> Ptr Trsf -> Acquire (Ptr Ax2) -transformed axis trsf = mkAcquire (rawTransformed axis trsf) deleteAx2 +transformed ax trsf = mkAcquire (rawTransformed ax trsf) deleteAx2 -- translate/translated @@ -172,7 +172,7 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_Translated" rawTranslated :: Ptr Ax2 -> Ptr Vec -> IO (Ptr Ax2) translated :: Ptr Ax2 -> Ptr Vec -> Acquire (Ptr Ax2) -translated axis vec = mkAcquire (rawTranslated axis vec) deleteAx2 +translated ax vec = mkAcquire (rawTranslated ax vec) deleteAx2 foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_TranslateRelative" translateRelative :: Ptr Ax2 -> Ptr Pnt -> Ptr Pnt -> IO () @@ -180,5 +180,5 @@ foreign import capi unsafe "hs_gp_Ax2.h hs_gp_Ax2_TranslatedRelative" rawTranslatedRelative :: Ptr Ax2 -> Ptr Pnt -> Ptr Pnt -> IO (Ptr Ax2) translatedRelative :: Ptr Ax2 -> Ptr Pnt -> Ptr Pnt -> Acquire (Ptr Ax2) -translatedRelative axis from to = mkAcquire (rawTranslatedRelative axis from to) deleteAx2 +translatedRelative ax from to = mkAcquire (rawTranslatedRelative ax from to) deleteAx2 diff --git a/src/OpenCascade/GP/Ax2d.hs b/src/OpenCascade/GP/Ax2d.hs --- a/src/OpenCascade/GP/Ax2d.hs +++ b/src/OpenCascade/GP/Ax2d.hs @@ -116,7 +116,7 @@ foreign import capi unsafe "hs_gp_Ax2d.h hs_gp_Ax2d_Mirrored" rawMirrored :: Ptr Ax2d -> Ptr Ax2d -> IO (Ptr Ax2d) mirrored :: Ptr Ax2d -> Ptr Ax2d -> Acquire (Ptr Ax2d) -mirrored axis mirror = mkAcquire (rawMirrored axis mirror) deleteAx2d +mirrored axis mirrorAxis = mkAcquire (rawMirrored axis mirrorAxis) deleteAx2d foreign import capi unsafe "hs_gp_Ax2d.h hs_gp_Ax2d_MirrorAboutPnt2d" mirrorAboutPnt2d :: Ptr Ax2d -> Ptr Pnt2d -> IO () @@ -124,7 +124,7 @@ foreign import capi unsafe "hs_gp_Ax2d.h hs_gp_Ax2d_MirroredAboutPnt2d" rawMirroredAboutPnt2d :: Ptr Ax2d -> Ptr Pnt2d -> IO (Ptr Ax2d) mirroredAboutPnt2d :: Ptr Ax2d -> Ptr Pnt2d -> Acquire (Ptr Ax2d) -mirroredAboutPnt2d axis mirror = mkAcquire (rawMirroredAboutPnt2d axis mirror) deleteAx2d +mirroredAboutPnt2d axis mirrorPnt = mkAcquire (rawMirroredAboutPnt2d axis mirrorPnt) deleteAx2d -- rotate/rotated @@ -136,7 +136,7 @@ foreign import capi unsafe "hs_gp_Ax2d.h hs_gp_Ax2d_Rotated" rawRotated :: Ptr Ax2d -> Ptr Pnt2d -> CDouble -> IO (Ptr Ax2d) rotated :: Ptr Ax2d -> Ptr Pnt2d -> Double -> Acquire (Ptr Ax2d) -rotated axis axisOfRotation angle = mkAcquire (rawRotated axis axisOfRotation (CDouble angle)) deleteAx2d +rotated axis axisOfRotation angleOfRotation = mkAcquire (rawRotated axis axisOfRotation (CDouble angleOfRotation)) deleteAx2d -- scale/scaled diff --git a/src/OpenCascade/GP/Ax3.hs b/src/OpenCascade/GP/Ax3.hs --- a/src/OpenCascade/GP/Ax3.hs +++ b/src/OpenCascade/GP/Ax3.hs @@ -56,7 +56,7 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_new_gp_Ax3_fromAx2" rawFromAx2 :: Ptr Ax2 -> IO (Ptr Ax3) fromAx2 :: Ptr Ax2 -> Acquire (Ptr Ax3) -fromAx2 ax2 = mkAcquire (rawFromAx2 ax2) deleteAx3 +fromAx2 ax = mkAcquire (rawFromAx2 ax) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_new_gp_Ax3_fromPntDirAndDir" rawFromPntDirAndDir :: Ptr Pnt -> Ptr Dir -> Ptr Dir -> IO (Ptr Ax3) @@ -139,14 +139,14 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_mirrored" rawMirrored:: Ptr Ax3 -> Ptr Ax1 -> IO (Ptr Ax3) mirrored :: Ptr Ax3 -> Ptr Ax1 -> Acquire (Ptr Ax3) -mirrored axis mirrorAxis = mkAcquire (rawMirrored axis mirrorAxis) deleteAx3 +mirrored ax mirrorAxis = mkAcquire (rawMirrored ax mirrorAxis) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_mirror_Ax2" mirrorAx2:: Ptr Ax3 -> Ptr Ax2 -> IO () foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_mirrored_Ax2" rawMirroredAx2 :: Ptr Ax3 -> Ptr Ax2 -> IO (Ptr Ax3) mirroredAx2 :: Ptr Ax3 -> Ptr Ax2 -> Acquire (Ptr Ax3) -mirroredAx2 axis mirrorAxis = mkAcquire (rawMirroredAx2 axis mirrorAxis) deleteAx3 +mirroredAx2 ax mirrorAxis = mkAcquire (rawMirroredAx2 ax mirrorAxis) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_rotate" rawRotate :: Ptr Ax3 -> Ptr Ax1 -> CDouble -> IO () @@ -156,7 +156,7 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_rotated" rawRotated :: Ptr Ax3 -> Ptr Ax1 -> CDouble -> IO (Ptr Ax3) rotated :: Ptr Ax3 -> Ptr Ax1 -> Double -> Acquire (Ptr Ax3) -rotated axis rotAxis angle = mkAcquire (rawRotated axis rotAxis (coerce angle)) deleteAx3 +rotated ax axisOfRotation angleOfRotation = mkAcquire (rawRotated ax axisOfRotation (coerce angleOfRotation)) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_scale" rawScale :: Ptr Ax3 -> Ptr Pnt -> CDouble -> IO () @@ -166,7 +166,7 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_scaled" rawScaled :: Ptr Ax3 -> Ptr Pnt -> CDouble -> IO (Ptr Ax3) scaled :: Ptr Ax3 -> Ptr Pnt -> Double -> Acquire (Ptr Ax3) -scaled axis origin factor = mkAcquire (rawScaled axis origin (coerce factor)) deleteAx3 +scaled ax origin factor = mkAcquire (rawScaled ax origin (coerce factor)) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_transform" transform:: Ptr Ax3 -> Ptr Trsf -> IO () @@ -174,7 +174,7 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_transformed" rawTransformed :: Ptr Ax3 -> Ptr Trsf -> IO (Ptr Ax3) transformed :: Ptr Ax3 -> Ptr Trsf -> Acquire (Ptr Ax3) -transformed axis trsf = mkAcquire (rawTransformed axis trsf) deleteAx3 +transformed ax trsf = mkAcquire (rawTransformed ax trsf) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_translate" translate :: Ptr Ax3 -> Ptr Vec -> IO () @@ -182,11 +182,11 @@ foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_translated" rawTranslated :: Ptr Ax3 -> Ptr Vec -> IO (Ptr Ax3) translated :: Ptr Ax3 -> Ptr Vec -> Acquire (Ptr Ax3) -translated axis vec = mkAcquire (rawTranslated axis vec) deleteAx3 +translated ax vec = mkAcquire (rawTranslated ax vec) deleteAx3 foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_translateRelative" translateRelative :: Ptr Ax3 -> Ptr Pnt -> Ptr Pnt -> IO () foreign import capi unsafe "hs_gp_Ax3.h hs_gp_Ax3_translatedRelative" rawTranslatedRelative :: Ptr Ax3 -> Ptr Pnt -> Ptr Pnt -> IO (Ptr Ax3) translatedRelative :: Ptr Ax3 -> Ptr Pnt -> Ptr Pnt -> Acquire (Ptr Ax3) -translatedRelative axis from to = mkAcquire (rawTranslatedRelative axis from to) deleteAx3 +translatedRelative ax from to = mkAcquire (rawTranslatedRelative ax from to) deleteAx3 diff --git a/src/OpenCascade/GP/Vec2d.hs b/src/OpenCascade/GP/Vec2d.hs --- a/src/OpenCascade/GP/Vec2d.hs +++ b/src/OpenCascade/GP/Vec2d.hs @@ -237,7 +237,7 @@ foreign import capi unsafe "hs_gp_Vec2d.h hs_gp_Vec2d_Rotated" rawRotated :: Ptr Vec2d -> CDouble -> IO (Ptr Vec2d) rotated :: Ptr Vec2d -> Double -> Acquire (Ptr Vec2d) -rotated point angle = mkAcquire (rawRotated point (CDouble angle)) deleteVec2d +rotated point angleOfRotation = mkAcquire (rawRotated point (CDouble angleOfRotation)) deleteVec2d -- scale/scaled diff --git a/src/OpenCascade/Geom/BezierCurve.hs b/src/OpenCascade/Geom/BezierCurve.hs --- a/src/OpenCascade/Geom/BezierCurve.hs +++ b/src/OpenCascade/Geom/BezierCurve.hs @@ -7,7 +7,7 @@ import Data.Acquire import OpenCascade.Geom.Types (BezierCurve) import OpenCascade.Geom.Internal.Destructors (deleteBezierCurve, deleteHandleBezierCurve) -import OpenCascade.GP (Pnt(..)) +import OpenCascade.GP (Pnt) import OpenCascade.NCollection (Array1) import OpenCascade.Handle (Handle) foreign import capi unsafe "hs_Geom_BezierCurve.h hs_new_Geom_BezierCurve_fromPnts" rawFromPnts :: Ptr (Array1 Pnt) -> IO(Ptr BezierCurve)