updated readme and refactored RGLServerPlugin/Mesh.cc

RobotecAI · Nov 9, 2022 · c2f6ab1 · c2f6ab1
1 parent 200fc2c
commit c2f6ab1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 519 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ Gazebo: [Fortress v6.12](https://gazebosim.org/docs/fortress/install)
 
 RGL: [v0.11.0](https://github.com/RobotecAI/RobotecGPULidar/tree/v11)
 
+GNU Wget: [v1.20.3](https://www.gnu.org/software/wget/)
+
 ### Installation:
 From RGLGazeboPlugin/test_world directory:
 

diff --git a/RGLGuiPlugin/CMakeLists.txt b/RGLGuiPlugin/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
+# This is required for Qt
 if(POLICY CMP0100)
     cmake_policy(SET CMP0100 NEW)
 endif()

diff --git a/RGLServerPlugin/CMakeLists.txt b/RGLServerPlugin/CMakeLists.txt
@@ -7,16 +7,32 @@ find_package(ignition-plugin1 REQUIRED)
 
 include_directories(include)
 
-set(RobotecGPULidar "${CMAKE_CURRENT_SOURCE_DIR}/include/rgl/libRobotecGPULidar.so")
+set(RGL_VERSION "0.11.0")
+set(RGL_ALPHA_VERSION "1")
+set(RGL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include/rgl")
+set(RGL_API_PATH "${RGL_PATH}/api")
+set(RGL_SO_URL "https://github.com/RobotecAI/RobotecGPULidar/releases/download/v${RGL_VERSION}-alpha-${RGL_ALPHA_VERSION}/libRobotecGPULidar.so")
+set(RGL_API_URL "https://raw.githubusercontent.com/RobotecAI/RobotecGPULidar/v11/include/rgl/api/core.h")
 
-add_library(RGLServerPluginManager SHARED src/RGLServerPluginManager.cc src/Mesh.cc src/Utils.cc src/Scene.cc include/macros/visibility.h)
+# you have to delete old files to download new ones if a new version is available
+if(NOT EXISTS "${RGL_PATH}/libRobotecGPULidar.so")
+    execute_process(COMMAND wget ${RGL_SO_URL} -P ${RGL_PATH} -q)
+endif()
+
+if(NOT EXISTS "${RGL_API_PATH}/core.h")
+    execute_process(COMMAND wget ${RGL_API_URL} -P ${RGL_API_PATH} -q)
+endif()
+
+set(RobotecGPULidar "${RGL_PATH}/libRobotecGPULidar.so")
+
+add_library(RGLServerPluginManager SHARED src/RGLServerPluginManager.cc src/Mesh.cc src/Utils.cc src/Scene.cc)
 target_link_libraries(RGLServerPluginManager
     ignition-gazebo6::ignition-gazebo6
     ignition-plugin1::ignition-plugin1
     ${RobotecGPULidar}
 )
 
-add_library(RGLServerPluginInstance SHARED src/RGLServerPluginInstance.cc src/Lidar.cc src/Utils.cc include/macros/visibility.h)
+add_library(RGLServerPluginInstance SHARED src/RGLServerPluginInstance.cc src/Lidar.cc src/Utils.cc)
 target_link_libraries(RGLServerPluginInstance
     ignition-gazebo6::ignition-gazebo6
     ignition-plugin1::ignition-plugin1

diff --git a/RGLServerPlugin/include/macros/visibility.h b/RGLServerPlugin/include/macros/visibility.h