Browse Source

doc: adapt image generators to new plugin workflow.

pull/233/head
Vladimír Vondruš 8 years ago
parent
commit
067fc43b6b
  1. 5
      doc/generated/CMakeLists.txt
  2. 32
      doc/generated/configure.h.cmake
  3. 4
      doc/generated/primitives.cpp
  4. 6
      doc/generated/shaders.cpp

5
doc/generated/CMakeLists.txt

@ -46,11 +46,7 @@ else()
message(FATAL_ERROR "No windowless application available on this platform")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
add_executable(shaders shaders.cpp)
target_include_directories(shaders PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(shaders
Magnum::Magnum
Magnum::MeshTools
@ -59,7 +55,6 @@ target_link_libraries(shaders
Magnum::WindowlessApplication)
add_executable(primitives primitives.cpp)
target_include_directories(primitives PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(primitives
Magnum::Magnum
Magnum::MeshTools

32
doc/generated/configure.h.cmake

@ -1,32 +0,0 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#ifdef CORRADE_IS_DEBUG_BUILD
#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_DEBUG_DIR}"
#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DEBUG_DIR}"
#else
#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_DIR}"
#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DIR}"
#endif

4
doc/generated/primitives.cpp

@ -72,8 +72,6 @@
#include <Magnum/Trade/MeshData3D.h>
#include <Magnum/Trade/AbstractImporter.h>
#include "configure.h"
using namespace Magnum;
using namespace Magnum::Math::Literals;
@ -130,7 +128,7 @@ namespace {
}
int PrimitiveVisualizer::exec() {
PluginManager::Manager<Trade::AbstractImageConverter> converterManager{MAGNUM_PLUGINS_IMAGECONVERTER_DIR};
PluginManager::Manager<Trade::AbstractImageConverter> converterManager;
std::unique_ptr<Trade::AbstractImageConverter> converter = converterManager.loadAndInstantiate("PngImageConverter");
if(!converter) {
Error() << "Cannot load image converter plugin";

6
doc/generated/shaders.cpp

@ -64,8 +64,6 @@
#include <Magnum/Trade/MeshData3D.h>
#include <Magnum/Trade/AbstractImporter.h>
#include "configure.h"
using namespace Magnum;
using namespace Magnum::Math::Literals;
@ -90,14 +88,14 @@ namespace {
}
int ShaderVisualizer::exec() {
PluginManager::Manager<Trade::AbstractImageConverter> converterManager{MAGNUM_PLUGINS_IMAGECONVERTER_DIR};
PluginManager::Manager<Trade::AbstractImageConverter> converterManager;
std::unique_ptr<Trade::AbstractImageConverter> converter = converterManager.loadAndInstantiate("PngImageConverter");
if(!converter) {
Error() << "Cannot load image converter plugin";
std::exit(1);
}
PluginManager::Manager<Trade::AbstractImporter> importerManager{MAGNUM_PLUGINS_IMPORTER_DIR};
PluginManager::Manager<Trade::AbstractImporter> importerManager;
_importer = importerManager.loadAndInstantiate("PngImporter");
if(!_importer) {
Error() << "Cannot load image importer plugin";

Loading…
Cancel
Save