Merge branch 'setDefaultGeometryValue' into githubaction_setDefaultGe…

…ometryValue
mujin · Apr 30, 2024 · 202d39e · 202d39e
2 parents 9e986d7 + 6d70e87
commit 202d39e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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.0)
+cmake_minimum_required (VERSION 2.8.8)
 project(mujincontrollerclient)
 set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,7 +35,9 @@ if (libzmq_FOUND)
   set(SOURCE_FILES ${SOURCE_FILES} binpickingtaskzmq.h binpickingtaskzmq.cpp mujinzmq.cpp)
 endif()
 
-add_library(libmujincontrollerclient SHARED ${SOURCE_FILES})
+add_library(libmujincontrollerclientbase OBJECT ${SOURCE_FILES})
+
+add_library(libmujincontrollerclient SHARED $<TARGET_OBJECTS:libmujincontrollerclientbase>)
 if( EXTRA_MSVC_DEPEND )
   message(STATUS "adding msvc_boost dependency")
   add_dependencies(libmujincontrollerclient ${EXTRA_MSVC_DEPEND})
@@ -63,7 +65,7 @@ if( OPT_BUILD_STATIC )
     set(LIBMUJINCONTROLLERCLIENT_NAME mujincontrollerclient${MUJINCLIENT_LIBRARY_SUFFIX})
   endif()
 
-  add_library(libmujincontrollerclient_static STATIC ${SOURCE_FILES})
+  add_library(libmujincontrollerclient_static STATIC $<TARGET_OBJECTS:libmujincontrollerclientbase>)
   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}

diff --git a/src/mujincontrollerclient.cpp b/src/mujincontrollerclient.cpp
@@ -332,7 +332,7 @@ void ObjectResource::LinkResource::GetGeometries(std::vector<ObjectResource::Geo
                 ObjectResource::GeometryResourcePtr geometry(new GeometryResource(controller, this->objectpk, GetJsonValueByKey<std::string>(*it, "pk")));
                 geometry->linkpk = linkpk;
                 LoadJsonValueByKey(*it,"name",geometry->name,geometry->pk);
-                LoadJsonValueByKey(*it,"visible",geometry->visible);
+                LoadJsonValueByKey(*it,"visible",geometry->visible,true);
                 LoadJsonValueByKey(*it,"geomtype",geometry->geomtype);
                 LoadJsonValueByKey(*it,"transparency",geometry->transparency);
                 LoadJsonValueByKey(*it,"quaternion",geometry->quaternion);