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.

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

dartsim v6.11.0 #16

Merged
merged 7 commits into from
Nov 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions .ci_support/migrations/tinyxml2-9.yaml

This file was deleted.

55 changes: 55 additions & 0 deletions recipe/1613.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
From ca0fb4318d3a1de39266515d5f82b026bfee4bde Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Sun, 10 Oct 2021 18:34:40 +0200
Subject: [PATCH] Fix compilation of test_Icosphere with Eigen 3.4

---
dart/math/detail/Icosphere-impl.hpp | 32 ++++++++++++++---------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/dart/math/detail/Icosphere-impl.hpp b/dart/math/detail/Icosphere-impl.hpp
index f4e45efbfc8..ecf27144388 100644
--- a/dart/math/detail/Icosphere-impl.hpp
+++ b/dart/math/detail/Icosphere-impl.hpp
@@ -74,24 +74,24 @@ Icosphere<S>::computeIcosahedron(S radius)
const S x = radius * unitX;
const S z = radius * unitZ;

- std::vector<Vector3> vertices = {{{-x, 0, z},
- {x, 0, z},
- {-x, 0, -z},
- {x, 0, -z},
- {0, z, x},
- {0, z, -x},
- {0, -z, x},
- {0, -z, -x},
- {z, x, 0},
- {-z, x, 0},
- {z, -x, 0},
- {-z, -x, 0}}};
+ std::vector<Vector3> vertices = {{-x, 0, z},
+ {x, 0, z},
+ {-x, 0, -z},
+ {x, 0, -z},
+ {0, z, x},
+ {0, z, -x},
+ {0, -z, x},
+ {0, -z, -x},
+ {z, x, 0},
+ {-z, x, 0},
+ {z, -x, 0},
+ {-z, -x, 0}};

static std::vector<Triangle> triangles
- = {{{0, 4, 1}, {0, 9, 4}, {9, 5, 4}, {4, 5, 8}, {4, 8, 1},
- {8, 10, 1}, {8, 3, 10}, {5, 3, 8}, {5, 2, 3}, {2, 7, 3},
- {7, 10, 3}, {7, 6, 10}, {7, 11, 6}, {11, 0, 6}, {0, 1, 6},
- {6, 1, 10}, {9, 0, 11}, {9, 11, 2}, {9, 2, 5}, {7, 2, 11}}};
+ = {{0, 4, 1}, {0, 9, 4}, {9, 5, 4}, {4, 5, 8}, {4, 8, 1},
+ {8, 10, 1}, {8, 3, 10}, {5, 3, 8}, {5, 2, 3}, {2, 7, 3},
+ {7, 10, 3}, {7, 6, 10}, {7, 11, 6}, {11, 0, 6}, {0, 1, 6},
+ {6, 1, 10}, {9, 0, 11}, {9, 11, 2}, {9, 2, 5}, {7, 2, 11}};

return std::make_pair(vertices, triangles);
}

11 changes: 6 additions & 5 deletions recipe/disable_imgui.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
From 124fdefbbc97ac9bdff9ff888522a8a0c69c7e51 Mon Sep 17 00:00:00 2001
From 4d9052429b3133f08d6ebee6d8af5932bc670a24 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Sat, 10 Apr 2021 15:05:22 +0200
Date: Sun, 10 Oct 2021 11:57:32 +0200
Subject: [PATCH] Update CMakeLists.txt

---
dart/external/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dart/external/CMakeLists.txt b/dart/external/CMakeLists.txt
index 08377bd4a98e..a9e019da3501 100644
index aa2fa0a2121a..0d04e5b43df2 100644
--- a/dart/external/CMakeLists.txt
+++ b/dart/external/CMakeLists.txt
@@ -1,4 +1,4 @@
@@ -1,5 +1,5 @@
add_subdirectory(convhull_3d)
-add_subdirectory(imgui)
+# add_subdirectory(imgui)
+#add_subdirectory(imgui)
add_subdirectory(ikfast)
add_subdirectory(lodepng)
add_subdirectory(odelcpsolver)
Expand Down
8 changes: 5 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{% set name = "dartsim" %}
{% set version = "6.10.1" %}
{% set version = "6.11.0" %}

package:
name: {{ name }}
version: {{ version }}

source:
- url: https://github.com/dartsim/dart/archive/v{{ version }}.tar.gz
sha256: bf19cdef8e28dbc4059dcbb11997576d6e1d825791bd756e8272d2ddc5b147ce
sha256: 41d783d7f99d7b5ad1874336646f1bdfa33e146e0652a6c32d12eaa21505bd51
patches:
- disable_imgui.patch
- disable_gui.patch
- 1613.patch
- placeholders.patch

build:
number: 1
number: 0
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}

Expand Down
23 changes: 23 additions & 0 deletions recipe/placeholders.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From e7a7575b32ceb7fb9b283f15033349bd7a344c8d Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Sun, 10 Oct 2021 19:43:21 +0200
Subject: [PATCH] Update test_Signal.cpp

---
unittests/unit/test_Signal.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unittests/unit/test_Signal.cpp b/unittests/unit/test_Signal.cpp
index c2d6d1d426e..6070f39704c 100644
--- a/unittests/unit/test_Signal.cpp
+++ b/unittests/unit/test_Signal.cpp
@@ -140,8 +140,8 @@ TEST(Signal, NonStaticMemberFunction)
signal2.connect(&Viewer::onSignal2Static);

// Connect non-static member function
- using placeholders::_1;
- using placeholders::_2;
+ using std::placeholders::_1;
+ using std::placeholders::_2;
signal1.connect(bind(&Viewer::onSignal1, &viewer, _1));
signal2.connect(bind(&Viewer::onSignal2, &viewer, _1, _2));