From 5538763b9cdbc70d802403eb2f301c3d3e7c5f91 Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Tue, 30 Apr 2024 14:53:39 +0900 Subject: [PATCH 1/3] Revert "bump cmake_minimum_required to 2.8.8" This reverts commit 7aca61ec12cf1b2c585ade09005558118cbb6583. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8bc1bbe..5c16cf63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required (VERSION 2.8.8) +cmake_minimum_required (VERSION 2.8.0) project(mujincontrollerclient) set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) From bc15640df6f319063eab488576c69c25284c852c Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Tue, 30 Apr 2024 14:53:46 +0900 Subject: [PATCH 2/3] Revert "Convert libmujincontrollerclient to object library" This reverts commit 51b281ba56c67632b8e0f9f578ad638e19a7406e. --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e3c011c0..d975da3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,9 +35,7 @@ if (libzmq_FOUND) set(SOURCE_FILES ${SOURCE_FILES} binpickingtaskzmq.h binpickingtaskzmq.cpp mujinzmq.cpp) endif() -add_library(libmujincontrollerclientbase OBJECT ${SOURCE_FILES}) - -add_library(libmujincontrollerclient SHARED $) +add_library(libmujincontrollerclient SHARED ${SOURCE_FILES}) if( EXTRA_MSVC_DEPEND ) message(STATUS "adding msvc_boost dependency") add_dependencies(libmujincontrollerclient ${EXTRA_MSVC_DEPEND}) @@ -65,7 +63,7 @@ if( OPT_BUILD_STATIC ) set(LIBMUJINCONTROLLERCLIENT_NAME mujincontrollerclient${MUJINCLIENT_LIBRARY_SUFFIX}) endif() - add_library(libmujincontrollerclient_static STATIC $) + add_library(libmujincontrollerclient_static STATIC ${SOURCE_FILES}) set_target_properties(libmujincontrollerclient_static PROPERTIES OUTPUT_NAME ${LIBMUJINCONTROLLERCLIENT_NAME} SOVERSION 0 # always have it 0 since we're including the soversion as part of the library name VERSION ${MUJINCLIENT_VERSION} From d08350b6fb00e248ddd08b14e542485366c6a7ef Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Tue, 30 Apr 2024 14:09:43 +0900 Subject: [PATCH 3/3] Set visible=true in header --- include/mujincontrollerclient/mujincontrollerclient.h | 2 +- src/mujincontrollerclient.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mujincontrollerclient/mujincontrollerclient.h b/include/mujincontrollerclient/mujincontrollerclient.h index 964c6446..fbdf6eb4 100644 --- a/include/mujincontrollerclient/mujincontrollerclient.h +++ b/include/mujincontrollerclient/mujincontrollerclient.h @@ -793,7 +793,7 @@ class MUJINCLIENT_API ObjectResource : public WebResource std::string geomtype; Real quaternion[4]; // quaternion [w, x, y, z] = [cos(angle/2), sin(angle/2)*rotation_axis] Real translate[3]; - bool visible; + bool visible = true; Real diffusecolor[4]; Real transparency; Real half_extents[3]; diff --git a/src/mujincontrollerclient.cpp b/src/mujincontrollerclient.cpp index 888d27b2..09eb3356 100644 --- a/src/mujincontrollerclient.cpp +++ b/src/mujincontrollerclient.cpp @@ -332,7 +332,7 @@ void ObjectResource::LinkResource::GetGeometries(std::vectorobjectpk, GetJsonValueByKey(*it, "pk"))); geometry->linkpk = linkpk; LoadJsonValueByKey(*it,"name",geometry->name,geometry->pk); - LoadJsonValueByKey(*it,"visible",geometry->visible,true); + LoadJsonValueByKey(*it,"visible",geometry->visible); LoadJsonValueByKey(*it,"geomtype",geometry->geomtype); LoadJsonValueByKey(*it,"transparency",geometry->transparency); LoadJsonValueByKey(*it,"quaternion",geometry->quaternion);