use experimental Radium

src/CMakeLists.txt

@@ -4,8 +4,8 @@ if (WITH_H3D_SUPPORT)
 endif (WITH_H3D_SUPPORT)
 add_subdirectory(Plugin)
 set(MARA_IN_BUILD_TREE True)
-add_subdirectory(Mara EXCLUDE_FROM_ALL)
+#add_subdirectory(Mara EXCLUDE_FROM_ALL)
 set(VIEWER_IN_BUILD_TREE True)
 add_subdirectory(DemoApp EXCLUDE_FROM_ALL)
 
-#add_subdirectory(Mara)
+add_subdirectory(Mara)

src/Mara/CMakeLists.txt

@@ -29,6 +29,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(SHOWTREEVIEW "Compile with scene tree view widget" ON)
 option(WITH_H3D_SUPPORT "Compile with H3D loader support" OFF)
+option(RADIUM_EXPERIMENTAL "Compile with non merged Radium features." OFF)
 
 # ///////////////////////////////
 find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
@@ -113,6 +114,11 @@ if (WITH_H3D_SUPPORT)
         )
 endif (WITH_H3D_SUPPORT)
 
+if (RADIUM_EXPERIMENTAL)
+    message(STATUS " *** ${PROJECT_NAME} *** Compiling with Radium experimental features activated.")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE RADIUM_EXPERIMENTAL)
+endif()
+
 configure_radium_app(
     NAME ${PROJECT_NAME}
     USE_PLUGINS

src/Mara/Gui/MainWindow.cpp

@@ -28,7 +28,7 @@
 
 #include <RadiumPlayer.hpp>
 
-#ifdef RADIUM_HAS_SKELETON_ANIM
+#ifdef RADIUM_EXPERIMENTAL
 #include <Engine/Scene/SkeletonBasedAnimationSystem.hpp>
 #include <Gui/SkeletonBasedAnimation/SkeletonBasedAnimationUI.hpp>
 #endif
@@ -543,7 +543,7 @@ void MainWindow::timelineSetPingPong( bool status ) {
 }
 
 void MainWindow::addRadiumSystemsUI() {
-#ifdef RADIUM_HAS_SKELETON_ANIM
+#ifdef RADIUM_EXPERIMENTAL
     // Register the Skeleton-based animation UI
     auto animSystem = static_cast<Ra::Engine::Scene::SkeletonBasedAnimationSystem*>(
         Ra::Engine::RadiumEngine::getInstance()->getSystem( "SkeletonBasedAnimationSystem" ) );