Brayns 300 replace free image

CMakeLists.txt

@@ -42,8 +42,6 @@ set(Boost_USE_STATIC_RUNTIME OFF)
 set(Boost_USE_STATIC_LIBS OFF)
 find_package(Boost REQUIRED COMPONENTS program_options)
 find_package(OpenMP REQUIRED)
-find_package(FreeImage REQUIRED)
-find_package(LibJpegTurbo REQUIRED)
 find_package(ospray 1.8 REQUIRED)
 find_package(assimp REQUIRED)
 find_package(Poco QUIET COMPONENTS Foundation JSON Net NetSSL)

Dockerfile

@@ -18,10 +18,8 @@ RUN apt-get update \
    ninja-build \
    libarchive-dev \
    libassimp-dev \
-   libfreeimage-dev \
    libhdf5-serial-dev \
    libtbb-dev \
-   libturbojpeg0-dev \
    pkg-config \
    wget \
    ca-certificates \
@@ -140,10 +138,8 @@ RUN apt-get update \
    && apt-get -y --no-install-recommends install \
    libarchive13 \
    libassimp4 \
-   libfreeimage3 \
    libgomp1 \
    libhdf5-103 \
-   libturbojpeg0 \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

README.md

@@ -73,8 +73,8 @@ To install all dependencies needed by Brayns on Ubuntu 18.04 run:
 
 ```
 sudo apt install git cmake g++ libtbb-dev libgl1-mesa-dev libxrandr-dev \
-libxinerama-dev libxcursor-dev libboost-all-dev libfreeimage-dev libglew-dev \
-libwebsockets-dev libturbojpeg libturbojpeg0-dev libassimp-dev libhdf5-dev
+libxinerama-dev libxcursor-dev libboost-all-dev libglew-dev \
+libwebsockets-dev libassimp-dev libhdf5-dev
 ```
 
 ### Prerequisites

apps/BraynsViewer/ui/Application.cpp

@@ -620,9 +620,6 @@ void Application::render()
         GLenum format = GL_RGBA;
         switch (frameBuffer->getFrameBufferFormat())
         {
-        case brayns::FrameBufferFormat::bgra_i8:
-            format = GL_BGRA;
-            break;
         case brayns::FrameBufferFormat::rgb_i8:
             format = GL_RGB;
             break;

apps/CMakeLists.txt

@@ -12,9 +12,9 @@ if(BRAYNS_VIEWER_ENABLED)
   add_subdirectory(BraynsViewer)
 endif()
 
-if(BRAYNS_IBL_ENABLED)
-  add_subdirectory(BraynsIBL)
-endif()
+#if(BRAYNS_IBL_ENABLED)
+#  add_subdirectory(BraynsIBL)
+#endif()
 
 if(BRAYNS_SERVICE_ENABLED)
   add_subdirectory(BraynsService)

brayns/Brayns.cpp

@@ -396,8 +396,6 @@ struct Brayns::Impl : public PluginAPI
                 scene.loadModels(path, params, {progress});
             }
         }
-        scene.setEnvironmentMap(
-            _parametersManager.getApplicationParameters().getEnvMap());
         scene.markModified();
     }
 

brayns/common/CMakeLists.txt

@@ -5,22 +5,19 @@
 # This file is part of Brayns <https://github.com/BlueBrain/Brayns>
 
 set(BRAYNSCOMMON_SOURCES
-  ImageManager.cpp
   propertymap/ConversionRegistry.cpp
   light/Light.cpp
   loader/LoaderRegistry.cpp
   material/Texture2D.cpp
   scene/ClipPlane.cpp
   simulation/AbstractSimulationHandler.cpp
   transferFunction/TransferFunction.cpp
-  utils/ImageGenerator.cpp
   Timer.cpp
 )
 
 set(BRAYNSCOMMON_PUBLIC_HEADERS
   adapters/PropertyMapAdapter.h
   BaseObject.h
-  ImageManager.h
   Progress.h
   propertymap/Any.h
   propertymap/Converter.h
@@ -52,21 +49,19 @@ set(BRAYNSCOMMON_PUBLIC_HEADERS
   tasks/TaskRuntimeError.h
   transferFunction/TransferFunction.h
   types.h
-  utils/ImageGenerator.h
 )
 
 add_library(braynsCommon SHARED ${BRAYNSCOMMON_PUBLIC_HEADERS} ${BRAYNSCOMMON_SOURCES})
 
-target_include_directories(braynsCommon SYSTEM PRIVATE ${FREEIMAGE_INCLUDE_DIRS})
 target_include_directories(braynsCommon PUBLIC
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
     "$<INSTALL_INTERFACE:include>")
 
 target_link_libraries(braynsCommon PUBLIC
-  glm Async++ ${LibJpegTurbo_LIBRARIES} braynsUtils braynsJson spdlog::spdlog
+  glm Async++ braynsUtils braynsJson spdlog::spdlog
 )
 target_link_libraries(braynsCommon PRIVATE
-    braynsParameters ${Boost_PROGRAM_OPTIONS_LIBRARY} ${FREEIMAGE_LIBRARIES}
+    braynsParameters ${Boost_PROGRAM_OPTIONS_LIBRARY}
 )
 
 target_compile_options(braynsCommon PRIVATE ${BRAYNS_COMPILE_OPTIONS})