From 2ea93fa73024c244443722f2ff63ffb37b5aae89 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 28 May 2022 21:00:24 -0700 Subject: [PATCH 1/3] Enable examples on Windows --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7a38fb4f9a79..7b9244f3e5979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) From e54b54f79ce28d9a896e583fd011bf5e4519d681 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 28 May 2022 21:59:39 -0700 Subject: [PATCH 2/3] Fix build errors on Windows + VS2022 --- examples/atlas_simbicon/TerminalCondition.cpp | 4 ++-- .../glut_atlas_simbicon/TerminalCondition.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/atlas_simbicon/TerminalCondition.cpp b/examples/atlas_simbicon/TerminalCondition.cpp index b321e17a1cf66..e0a5ac5c017b7 100644 --- a/examples/atlas_simbicon/TerminalCondition.cpp +++ b/examples/atlas_simbicon/TerminalCondition.cpp @@ -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." diff --git a/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp b/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp index b321e17a1cf66..e0a5ac5c017b7 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp @@ -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." From baac7fae0529758940b7705e784a1dc15e514adc Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 29 May 2022 12:24:28 -0700 Subject: [PATCH 3/3] Enable tutorials on Windows --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b9244f3e5979..88f0238051504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)