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
9e54fec3
Commit
9e54fec3
authored
4 years ago
by
Andrew Wilson
Browse files
Options
Downloads
Patches
Plain Diff
BUG: pbd stairs cmake merge fix, warning fix
parent
a9809184
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Examples/PBD/PBDCollisionStairs/CMakeLists.txt
+1
-8
1 addition, 8 deletions
Examples/PBD/PBDCollisionStairs/CMakeLists.txt
Source/Geometry/Mesh/imstkPointSet.cpp
+1
-1
1 addition, 1 deletion
Source/Geometry/Mesh/imstkPointSet.cpp
with
2 additions
and
9 deletions
Examples/PBD/PBDCollisionStairs/CMakeLists.txt
+
1
−
8
View file @
9e54fec3
...
...
@@ -31,11 +31,4 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples/PBD)
#-----------------------------------------------------------------------------
# Link libraries to executable
#-----------------------------------------------------------------------------
target_link_libraries
(
${
PROJECT_NAME
}
SimulationManager apiUtilities
)
#-----------------------------------------------------------------------------
# Set MSVC working directory to the install/bin directory
#-----------------------------------------------------------------------------
if
(
MSVC
)
# Configure running executable out of MSVC
set_property
(
TARGET
${
PROJECT_NAME
}
PROPERTY VS_DEBUGGER_WORKING_DIRECTORY
"
${
iMSTK_INSTALL_BIN_DIR
}
"
)
endif
()
target_link_libraries
(
${
PROJECT_NAME
}
SimulationManager apiUtilities
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Source/Geometry/Mesh/imstkPointSet.cpp
+
1
−
1
View file @
9e54fec3
...
...
@@ -160,7 +160,7 @@ PointSet::setVertexDisplacements(const StdVectorOfVec3d& diff)
void
PointSet
::
setVertexDisplacements
(
const
Vectord
&
u
)
{
assert
(
u
.
size
()
==
3
*
m_vertexPositions
.
size
());
assert
(
static_cast
<
size_t
>
(
u
.
size
()
)
==
3
*
m_vertexPositions
.
size
());
ParallelUtils
::
parallelFor
(
m_vertexPositions
.
size
(),
[
&
](
const
size_t
i
)
{
...
...
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