Feature/audio

.gitmodules

@@ -56,3 +56,9 @@
 [submodule "externals/openvr"]
 	path = externals/openvr
 	url = https://github.com/ValveSoftware/openvr.git
+[submodule "externals/openal-soft"]
+	path = externals/openal-soft
+	url = https://github.com/kcat/openal-soft.git
+[submodule "externals/libsndfile"]
+	path = externals/libsndfile
+	url = https://github.com/libsndfile/libsndfile.git

CMakeLists.txt

@@ -143,6 +143,18 @@ else()
   SET(VistaCoreLibs_DIR ${COSMOSCOUT_EXTERNALS_DIR}/share/VistaCoreLibs/cmake)
 endif()
 
+if (DEFINED ENV{OPENAL_ROOT_DIR})
+  SET(ENV{OPENALDIR} "$ENV{OPENAL_ROOT_DIR}")
+else()
+  SET(ENV{OPENALDIR} ${COSMOSCOUT_EXTERNALS_DIR})
+endif()
+
+if (DEFINED ENV{LIBSNDFILE_ROOT_DIR})
+  SET(ENV{LIBSNDFILE_DIR} "$ENV{LIBSNDFILE_ROOT_DIR}")
+else()
+  SET(ENV{LIBSNDFILE_DIR} ${COSMOSCOUT_EXTERNALS_DIR})
+endif()
+
 find_package(GLM REQUIRED)
 find_package(GLI REQUIRED)
 find_package(DOCTEST REQUIRED)
@@ -161,6 +173,8 @@ find_package(CIVETWEB REQUIRED)
 find_package(VistaCoreLibs REQUIRED 
   COMPONENTS "VistaBase" "VistaKernel" "VistaKernelOpenSGExt" "VistaOGLExt"
 )
+find_package(OpenAL REQUIRED)
+find_package(SndFile REQUIRED)
 
 # X11 is used on Linux to set the application window's name and icon.
 if (UNIX)
@@ -309,6 +323,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/src/cs-core
   ${CMAKE_BINARY_DIR}/src/cs-utils
   ${CMAKE_BINARY_DIR}/src/cs-graphics
+  ${CMAKE_BINARY_DIR}/src/cs-audio
   ${CMAKE_BINARY_DIR}/src/cs-gui
   ${CMAKE_BINARY_DIR}/src/cs-scene
 )

cmake/FindSndFile.cmake

@@ -0,0 +1,33 @@
+# ------------------------------------------------------------------------------------------------ #
+#                                This file is part of CosmoScout VR                                #
+# ------------------------------------------------------------------------------------------------ #
+
+# SPDX-FileCopyrightText: German Aerospace Center (DLR) <[email protected]>
+# SPDX-License-Identifier: MIT
+
+# Locate header.
+find_path(SNDFILE_INCLUDE_DIR sndfile.h
+    HINTS $ENV{LIBSNDFILE_DIR}/include)
+
+
+find_library(SNDFILE_LIBRARY
+    NAMES sndfile   
+    HINTS $ENV{LIBSNDFILE_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SndFile DEFAULT_MSG SNDFILE_INCLUDE_DIR SNDFILE_LIBRARY)
+
+# Add imported target.
+if(SndFile_FOUND)
+    set(SNDFILE_INCLUDE_DIRS "${SNDFILE_INCLUDE_DIR}")
+
+    if(NOT SndFile_FIND_QUIETLY)
+        message(STATUS "SNDFILE_INCLUDE_DIRS .............. ${SNDFILE_INCLUDE_DIR}")
+    endif()
+
+    if(NOT TARGET sndfile::sndfile)
+        add_library(sndfile::sndfile INTERFACE IMPORTED)
+        set_target_properties(sndfile::sndfile PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${SNDFILE_INCLUDE_DIRS}")
+    endif()
+endif()

make_externals.bat

@@ -423,7 +423,29 @@ if %USING_NINJA%==true (
   cmake -E copy "%BUILD_DIR%/cef/libcef_dll_wrapper/%BUILD_TYPE%/libcef_dll_wrapper.lib"  "%INSTALL_DIR%/lib"
 )
 
-rem ------------------------------------------------------------------------------------------------
+rem openal-soft --------------------------------------------------------------------------------------
+:openal-soft
+
+echo.
+echo Building and installing openal-soft ...
+echo.
+
+cmake -E make_directory "%BUILD_DIR%/openal-soft" && cd "%BUILD_DIR%/openal-soft"
+cmake %CMAKE_FLAGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%"^
+     -DALSOFT_INSTALL_EXAMPLES=Off -DALSOFT_EXAMPLES=Off "%EXTERNALS_DIR%/openal-soft" || goto :error
+cmake --build . --config %BUILD_TYPE% --target install --parallel %NUMBER_OF_PROCESSORS% || goto :error
+
+rem libsndfile ----------------------------------------------------------------------------------------
+:libsndfile
+
+echo.
+echo Building and installing libsndfile ...
+echo.
+
+cmake -E make_directory "%BUILD_DIR%/libsndfile" && cd "%BUILD_DIR%/libsndfile"
+cmake %CMAKE_FLAGS% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%"^
+     -DBUILD_SHARED_LIBS=On "%EXTERNALS_DIR%/libsndfile" || goto :error
+cmake --build . --config %BUILD_TYPE% --target install --parallel %NUMBER_OF_PROCESSORS% || goto :error
 
 :finish
 echo Finished successfully.

make_externals.sh

@@ -318,6 +318,29 @@ cmake -E copy_directory "$BUILD_DIR/cef/extracted/$CEF_DIR/Resources"  "$INSTALL
 cmake -E copy_directory "$BUILD_DIR/cef/extracted/$CEF_DIR/Release"    "$INSTALL_DIR/lib"
 cmake -E copy "$BUILD_DIR/cef/libcef_dll_wrapper/libcef_dll_wrapper.a" "$INSTALL_DIR/lib"
 
+# openal-soft --------------------------------------------------------------------------------------
+
+echo ""
+echo "Building and installing openal-soft ..."
+echo ""
+
+cmake -E make_directory "$BUILD_DIR/openal-soft" && cd "$BUILD_DIR/openal-soft"
+cmake "${CMAKE_FLAGS[@]}" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
+     -DALSOFT_INSTALL_EXAMPLES=Off -DALSOFT_EXAMPLES=Off "$EXTERNALS_DIR/openal-soft"
+cmake --build . --config $BUILD_TYPE --target install --parallel $NUMBER_OF_PROCESSORS
+
+# libsndfile ----------------------------------------------------------------------------------------
+
+echo ""
+echo "Building and installing libsndfile ..."
+echo ""
+
+cmake -E make_directory "$BUILD_DIR/libsndfile" && cd "$BUILD_DIR/libsndfile"
+cmake "${CMAKE_FLAGS[@]}" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
+     -DBUILD_SHARED_LIBS=On -DENABLE_EXTERNAL_LIBS=Off "$EXTERNALS_DIR/libsndfile"
+cmake --build . --config $BUILD_TYPE --target install --parallel $NUMBER_OF_PROCESSORS
+
+
 # --------------------------------------------------------------------------------------------------
 
 if [ -e "$INSTALL_DIR/lib64" ]; then

plugins/csp-lod-bodies/src/TileTextureArray.cpp

@@ -95,7 +95,7 @@ TileDataType TileTextureArray::getDataType() const {
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void TileTextureArray::allocateGPU(std::shared_ptr<BaseTileData> data) {
-  assert(rdata->getTexLayer() < 0);
+  assert(data->getTexLayer() < 0);
 
   mUploadQueue.push_back(std::move(data));
 }

plugins/csp-lod-bodies/src/TreeManager.cpp

@@ -296,7 +296,7 @@ void TreeManager::prune() {
 
   if (count > 0) {
 #if !defined(NDEBUG) && !defined(VISTAPLANET_NO_VERBOSE)
-    vstr::outi() << "[TreeManager::prune] nodes removed/kept " << count << " / " << mRdMap.size()
+    vstr::outi() << "[TreeManager::prune] nodes removed/kept " << count << " / " << mNodes.size()
                  << std::endl;
 #endif
   }
@@ -320,7 +320,7 @@ void TreeManager::merge() {
 
   for (auto& node : mergeNodes) {
     assert(node != nullptr);
-    assert(node->getTile() != nullptr);
+    // assert(node->getTile() != nullptr);
 
     if (insertNode(&mTree, node)) {
       onNodeInserted(node);

src/CMakeLists.txt

@@ -8,6 +8,7 @@
 add_subdirectory(cs-utils)
 add_subdirectory(cs-core)
 add_subdirectory(cs-graphics)
+add_subdirectory(cs-audio)
 add_subdirectory(cs-gui)
 add_subdirectory(cs-scene)
 add_subdirectory(cosmoscout)

src/cosmoscout/Application.cpp

@@ -115,6 +115,7 @@ bool Application::Init(VistaSystem* pVistaSystem) {
   mSolarSystem = std::make_shared<cs::core::SolarSystem>(mSettings, mGraphicsEngine, mTimeControl);
   mDragNavigation =
       std::make_unique<cs::core::DragNavigation>(mSolarSystem, mInputManager, mTimeControl);
+  mAudioEngine = std::make_shared<cs::core::AudioEngine>(mSettings, mGuiManager);
 
   // The ObserverNavigationNode is used by several DFN networks to move the celestial observer.
   VdfnNodeFactory* pNodeFactory = VdfnNodeFactory::GetSingleton();
@@ -212,6 +213,9 @@ void Application::Quit() {
   assertCleanUp("mTimeControl", mTimeControl.use_count());
   mTimeControl.reset();
 
+  assertCleanUp("mAudioEngine", mAudioEngine.use_count());
+  mAudioEngine.reset();
+
   assertCleanUp("mGuiManager", mGuiManager.use_count());
   mGuiManager.reset();
 
@@ -558,6 +562,12 @@ void Application::FrameUpdate() {
       cs::utils::FrameStats::ScopedTimer timer("Update Graphics Engine");
       mGraphicsEngine->update(glm::normalize(mSolarSystem->pSunPosition.get()));
     }
+
+    // Update the AudioEngine
+    {
+      cs::utils::FrameStats::ScopedTimer timer("Update Audio Engine");
+      mAudioEngine->update();
+    }
   }
 
   // Update the user interface.
@@ -755,7 +765,8 @@ void Application::initPlugin(std::string const& name) {
 
       // First provide the plugin with all required class instances.
       plugin->second.mPlugin->setAPI(mSettings, mSolarSystem, mGuiManager, mInputManager,
-          GetVistaSystem()->GetGraphicsManager()->GetSceneGraph(), mGraphicsEngine, mTimeControl);
+          GetVistaSystem()->GetGraphicsManager()->GetSceneGraph(), mGraphicsEngine, mAudioEngine,
+          mTimeControl);
 
       // Then do the actual initialization. This may actually take a while and the application will
       // become unresponsive in the meantime.

src/cosmoscout/Application.hpp

@@ -8,6 +8,8 @@
 #ifndef CS_APPLICATION_HPP
 #define CS_APPLICATION_HPP
 
+#include "../cs-core/AudioEngine.hpp"
+
 #include <VistaKernel/VistaFrameLoop.h>
 #include <limits>
 #include <map>
@@ -33,6 +35,7 @@ class GraphicsEngine;
 class TimeControl;
 class SolarSystem;
 class DragNavigation;
+// class AudioEngine;
 } // namespace cs::core
 
 namespace cs::graphics {
@@ -173,6 +176,7 @@ class Application : public VistaFrameLoop {
   std::shared_ptr<cs::core::TimeControl>    mTimeControl;
   std::shared_ptr<cs::core::SolarSystem>    mSolarSystem;
   std::unique_ptr<cs::core::DragNavigation> mDragNavigation;
+  std::shared_ptr<cs::core::AudioEngine>    mAudioEngine;
   std::map<std::string, Plugin>             mPlugins;
   std::unique_ptr<cs::utils::Downloader>    mDownloader;
   std::unique_ptr<IVistaClusterDataSync>    mSceneSync;