Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable building examples and tutorials on Windows #1667

Merged
merged 3 commits into from
May 30, 2022
Merged

Enable building examples and tutorials on Windows #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ea93fa
Enable examples on Windows
jslee02 May 29, 2022
e54b54f
Fix build errors on Windows + VS2022
jslee02 May 29, 2022
baac7fa
Enable tutorials on Windows
jslee02 May 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ if(TARGET dart)

# Add example subdirectories and an "examples" target.
if(MSVC)
# add_subdirectory(examples)
add_subdirectory(examples)
else()
add_subdirectory(examples EXCLUDE_FROM_ALL)
get_property(examples GLOBAL PROPERTY DART_EXAMPLES)
Expand All @@ -356,7 +356,7 @@ if(TARGET dart)

# Add a "tutorials" target to build tutorials.
if(MSVC)
# add_subdirectory(tutorials)
add_subdirectory(tutorials)
else()
add_subdirectory(tutorials EXCLUDE_FROM_ALL)
get_property(tutorials GLOBAL PROPERTY DART_TUTORIALS)
Expand Down
4 changes: 2 additions & 2 deletions examples/atlas_simbicon/TerminalCondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ bool BodyContactCondition::isSatisfied()
for (std::size_t i = 0; i < soft->getNumPointMasses(); ++i)
{
PointMass* pm = soft->getPointMass(i);
if (pm->isColliding() > 0)
if (pm->isColliding())
return true;
}
}

// TODO(JS): Need more elegant condition check method
DART_SUPPRESS_DEPRECATED_BEGIN
if (mBodyNode->isColliding() > 0)
if (mBodyNode->isColliding())
DART_SUPPRESS_DEPRECATED_END
{
// dtmsg << "BodyNode [" << mBodyNode->getName() << "] is in contact."
Expand Down
4 changes: 2 additions & 2 deletions examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ bool BodyContactCondition::isSatisfied()
for (std::size_t i = 0; i < soft->getNumPointMasses(); ++i)
{
PointMass* pm = soft->getPointMass(i);
if (pm->isColliding() > 0)
if (pm->isColliding())
return true;
}
}

// TODO(JS): Need more elegant condition check method
DART_SUPPRESS_DEPRECATED_BEGIN
if (mBodyNode->isColliding() > 0)
if (mBodyNode->isColliding())
DART_SUPPRESS_DEPRECATED_END
{
// dtmsg << "BodyNode [" << mBodyNode->getName() << "] is in contact."
Expand Down