Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ben Boeckel
iMSTK
Commits
824e07c6
Commit
824e07c6
authored
3 years ago
by
Andrew Wilson
Browse files
Options
Downloads
Patches
Plain Diff
REFAC: Removed unused files, update name, makes all .i files visible in visual studios
parent
7a63e9e8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/Wrappers/csharp/CMakeLists.txt
+21
-1
21 additions, 1 deletion
Source/Wrappers/csharp/CMakeLists.txt
Source/Wrappers/csharp/SwigInterface/imstkCWrapper.i
+3
-3
3 additions, 3 deletions
Source/Wrappers/csharp/SwigInterface/imstkCWrapper.i
with
24 additions
and
4 deletions
Source/Wrappers/csharp/CMakeLists.txt
+
21
−
1
View file @
824e07c6
...
...
@@ -7,7 +7,27 @@ swig_add_library(iMSTKCWrapper
TYPE SHARED
OUTPUT_DIR
"
${
CMAKE_BINARY_DIR
}
/Source/Wrappers/csharp"
LANGUAGE csharp
SOURCES SwigInterface/imstkCWrapper.i
)
SOURCES
SwigInterface/imstkCWrapper.i
)
if
(
MSVC
)
# These files should not be provided via swig_add_library SOURCES
# But still displayed in visual studios
set
(
NOTGENERATED_FILES
SwigInterface/callback.i
SwigInterface/common.i
SwigInterface/debug.i
SwigInterface/ignored.i
SwigInterface/modifiers.i
SwigInterface/shared_ptr_instantiation.i
SwigInterface/std_function.i
SwigInterface/type_cast.i
SwigInterface/weak_ptr.i
)
target_sources
(
iMSTKCWrapper PRIVATE
${
NOTGENERATED_FILES
}
)
set_source_files_properties
(
${
NOTGENERATED_FILES
}
PROPERTIES HEADER_FILE_ONLY TRUE
)
endif
()
set_target_properties
(
iMSTKCWrapper PROPERTIES SWIG_COMPILE_OPTIONS
"-namespace;imstk"
)
if
(
iMSTK_SWIG_PINNED_ARRAY
)
...
...
This diff is collapsed.
Click to expand it.
Source/Wrappers/csharp/SwigInterface/imstkCWrapper.i
+
3
−
3
View file @
824e07c6
...
...
@@ -75,7 +75,6 @@
#include "imstkPbdFEMConstraint.h"
#include "imstkPbdCollisionConstraint.h"
#include "imstkSPHBoundaryConditions.h"
/* #include "imstkSPHHemorrhage.h" */
#include "imstkInternalForceModelTypes.h"
#include "imstkFEMDeformableBodyModel.h"
#include "imstkRigidBodyState2.h"
...
...
@@ -114,7 +113,6 @@
/*
* CollisionDetection
*/
/* #include "imstkCollisionDetection.h" */
#include "imstkCollisionData.h"
#include "imstkCollisionDetectionAlgorithm.h"
#include "imstkBidirectionalPlaneToSphereCD.h"
...
...
@@ -200,7 +198,7 @@
namespace
std
{
%template(VectorInt) vector<int>;
%template(VectorSizet) vector<std::size_t>;
%template(VectorCollision
Data
) vector<imstk::CollisionElement>;
%template(VectorCollision
Element
) vector<imstk::CollisionElement>;
}
%
include
"
shared_ptr_instantiation.i
"
...
...
@@ -211,6 +209,7 @@ namespace std {
%
include
"
std_function.i
"
%
include
"
callback.i
"
/* rename these operators to "compute" due to lack of operator overloading */
%
rename
(
compute
)
imstk
::
ImplicitFunctionGradient
::
operator
()
;
%
rename
(
compute
)
imstk
::
ImplicitFunctionCentralGradient
::
operator
()
;
...
...
@@ -271,6 +270,7 @@ namespace std {
*/
%
include
"
../../../MeshIO/imstkMeshIO.h
"
;
%
template
(
readImageData
)
imstk
::
MeshIO
::
read
<
imstk
::
ImageData
>
;
%
template
(
readPointSet
)
imstk
::
MeshIO
::
read
<
imstk
::
PointSet
>
;
%
template
(
readSurfaceMesh
)
imstk
::
MeshIO
::
read
<
imstk
::
SurfaceMesh
>
;
%
template
(
readTetrahedralMesh
)
imstk
::
MeshIO
::
read
<
imstk
::
TetrahedralMesh
>
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment