From 72b160f859208bfddf4ae26263e2e4f56da2abc8 Mon Sep 17 00:00:00 2001 From: Nicolas Mellado Date: Fri, 29 Jan 2021 17:38:57 +0100 Subject: [PATCH 1/7] Add Ci scripts --- .github/workflows/pull-request-ci.yml | 96 +++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/pull-request-ci.yml diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml new file mode 100644 index 0000000..895075d --- /dev/null +++ b/.github/workflows/pull-request-ci.yml @@ -0,0 +1,96 @@ +name: Compile Radium Plugins + +defaults: + run: + shell: bash + +on: + pull_request: + branches: + - master +env: + ext-dir: ${GITHUB_WORKSPACE//\\//}/external/install/ + +jobs: + build: + runs-on: ${{ matrix.config.os }} + strategy: + fail-fast: false + matrix: + config: + - { name: "Windows MSVC", suffix: "Windows", os: windows-latest, cc: "cl.exe", cxx: "cl.exe", assimp: "OFF" } + - { name: "Ubuntu gcc", suffix: "Linux-gcc8", os: ubuntu-18.04, cc: "gcc-8", cxx: "g++-8", assimp: "ON" } + - { name: "Ubuntu gcc", suffix: "Linux-gcc10", os: ubuntu-20.04, cc: "gcc-10", cxx: "g++-10", assimp: "ON" } + - { name: "MacOS clang", suffix: "macOS", os: macos-latest, cc: "clang", cxx: "clang++", assimp: "ON" } + + steps: + - uses: seanmiddleditch/gha-setup-ninja@master + + - name: Add msbuild to PATH + uses: seanmiddleditch/gha-setup-vsdevenv@master + if: runner.os == 'Windows' + + - name: Cache Qt + id: cache-qt + uses: actions/cache@v2 + with: + path: ../Qt + key: ${{ runner.os }}-${{ matrix.config.cc }}-QtCache + + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + cached: ${{ steps.cache-qt.outputs.cache-hit }} + + - name: Prepare directories + run: | + mkdir -p install/ + mkdir -p src/ + mkdir -p src/Radium-Plugins + mkdir -p build/Radium-Engine + mkdir -p build/Radium-Plugins + mkdir -p external/install/ + mkdir -p external/build/ + + - name: Clone Radium + run: | + cd src && git clone https://github.com/STORM-IRIT/Radium-Engine.git --single-branch && cd .. + + - name: Cache externals + id: cache-external + uses: actions/cache@v2 + with: + path: external + key: ${{ runner.os }}-${{ matrix.config.cc }}-external-${{ hashFiles('src/Radium-Engine/external/**/CMakeLists.txt') }} + + - name: Configure and build external + if: steps.cache-external.outputs.cache-hit != 'true' + run: | + cd external/build/ + cmake ../../src/Radium-Engine/external -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DRADIUM_IO_ASSIMP=${{ matrix.config.assimp }} -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DCMAKE_INSTALL_PREFIX=../install/ + cmake --build . --parallel --config Release + + - name: Configure Radium + run: | + cd build/Radium-Engine + cmake ../../src/Radium-Engine -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../../install/ -DRADIUM_IO_ASSIMP=${{ matrix.config.assimp }} -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DRADIUM_INSTALL_DOC=OFF -DRADIUM_ENABLE_TESTING=ON -DEigen3_DIR=${{env.ext-dir}}/share/eigen3/cmake/ -DOpenMesh_DIR=${{env.ext-dir}}/share/OpenMesh/cmake/ -Dcpplocate_DIR=${{env.ext-dir}}/share/cpplocate/ -Dglm_DIR=${{env.ext-dir}}/lib/cmake/glm/ -Dglbinding_DIR=${{env.ext-dir}}/share/glbinding/ -Dglobjects_DIR=${{env.ext-dir}}/share/globjects/ -Dstb_DIR=${{env.ext-dir}}/include/stb/ -Dassimp_DIR=${{env.ext-dir}}/lib/cmake/assimp-5.0/ -Dtinyply_DIR=${{env.ext-dir}}/lib/cmake/tinyply/ + + - name: Build Radium + run: | + cd build/Radium-Engine + cmake --build . --parallel --config Release --target install + + - name: Clone Radium Plugins + uses: actions/checkout@master + with: + path: src/Radium-Plugins + + - name: Configure Radium Plugins + run: | + cd build/Radium-Plugins + cmake ../../src/Radium-Plugins -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../../install/ -DRadium_DIR=../../install/lib/cmake/Radium + + - name: Build Radium Plugins + run: | + cd build/Radium-Plugins + cmake --build . --parallel --config Release --target install From 0248bdbf1209c8c2bbd58c3ae781e26191ecaf51 Mon Sep 17 00:00:00 2001 From: Nicolas Mellado Date: Fri, 29 Jan 2021 17:47:41 +0100 Subject: [PATCH 2/7] Fix compilation Disable Faketoon pluging (deprecated) Run not tested --- CMakeLists.txt | 2 +- Dummy/src/DummyPlugin.cpp | 20 +++++++++---------- Dummy/src/DummyPlugin.hpp | 6 +++--- .../src/MeshFeatureTrackingComponent.cpp | 6 +++--- MeshPaint/src/MeshPaintComponent.cpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d56fe7f..1808f67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ endif () option(INSTALL_IN_RADIUM_BUNDLE "Install plugins in Radium-Bundle dir" OFF) -add_subdirectory(fake-toon) +#add_subdirectory(fake-toon) add_subdirectory(laplacian-smoothing) add_subdirectory(CameraManip) add_subdirectory(Dummy) diff --git a/Dummy/src/DummyPlugin.cpp b/Dummy/src/DummyPlugin.cpp index 0ed0410..1bbacc6 100644 --- a/Dummy/src/DummyPlugin.cpp +++ b/Dummy/src/DummyPlugin.cpp @@ -14,19 +14,19 @@ namespace DummyPlugin { -DummyPlugin::~DummyPlugin() {} +DummyPluginC::~DummyPluginC() {} -void DummyPlugin::registerPlugin( const Ra::Plugins::Context& context ) { +void DummyPluginC::registerPlugin( const Ra::Plugins::Context& context ) { DummySystem* system = new DummySystem; context.m_engine->registerSystem( "DummySystem", system ); } -bool DummyPlugin::doAddWidget( QString& name ) { +bool DummyPluginC::doAddWidget( QString& name ) { name = "Dummy Mesh"; return true; } -QWidget* DummyPlugin::getWidget() { +QWidget* DummyPluginC::getWidget() { QWidget* widget = new QWidget; m_label = new QLabel( "I am a dummy label", widget ); @@ -37,16 +37,16 @@ QWidget* DummyPlugin::getWidget() { layout->addWidget( m_label ); layout->addWidget( button ); - connect( button, &QPushButton::pressed, this, &DummyPlugin::sayHello ); + connect( button, &QPushButton::pressed, this, &DummyPluginC::sayHello ); return widget; } -bool DummyPlugin::doAddMenu() { +bool DummyPluginC::doAddMenu() { return true; } -QMenu* DummyPlugin::getMenu() { +QMenu* DummyPluginC::getMenu() { QMenu* menu = new QMenu( "Dummy" ); QAction* a1 = menu->addAction( "Hello there" ); @@ -58,15 +58,15 @@ QMenu* DummyPlugin::getMenu() { return menu; } -bool DummyPlugin::doAddAction( int& /*nb*/ ) { +bool DummyPluginC::doAddAction( int& /*nb*/ ) { return false; } -QAction* DummyPlugin::getAction( int /*id*/ ) { +QAction* DummyPluginC::getAction( int /*id*/ ) { return nullptr; } -void DummyPlugin::sayHello() { +void DummyPluginC::sayHello() { m_label->setText( "I have been clicked at least once !" ); QMessageBox::warning( nullptr, "Dummy Plugin", "Hello, Radium World !" ); } diff --git a/Dummy/src/DummyPlugin.hpp b/Dummy/src/DummyPlugin.hpp index 3bea6da..c18fecd 100644 --- a/Dummy/src/DummyPlugin.hpp +++ b/Dummy/src/DummyPlugin.hpp @@ -19,15 +19,15 @@ class RadiumEngine; namespace DummyPlugin { class DummySystem; -class DummyPlugin : public QObject, Ra::Plugins::RadiumPluginInterface +class DummyPluginC : public QObject, Ra::Plugins::RadiumPluginInterface { Q_OBJECT Q_RADIUM_PLUGIN_METADATA Q_INTERFACES( Ra::Plugins::RadiumPluginInterface ) public: - DummyPlugin() = default; - ~DummyPlugin(); + DummyPluginC() = default; + ~DummyPluginC(); void registerPlugin( const Ra::Plugins::Context& context ) override; diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp index 974822a..6fa319b 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp @@ -242,7 +242,7 @@ void MeshFeatureTrackingComponent::setData( const Ra::Engine::Renderer::PickingR return; } // if lines, retrieve triangle-based indices - const auto& t = m_pickedMesh->getCoreGeometry().m_indices; + const auto& t = m_pickedMesh->getCoreGeometry().getIndices(); if ( rm == MeshRenderMode::RM_LINES ) { uint v0, v1, t0, t1; @@ -393,7 +393,7 @@ void MeshFeatureTrackingComponent::setVertexIdx( uint idx ) { // also need to change second for feature Scale const auto rm = m_pickedMesh->getRenderMode(); if ( rm == MeshRenderMode::RM_POINTS ) { return; } - const auto& triangles = m_pickedMesh->getCoreGeometry().m_indices; + const auto& triangles = m_pickedMesh->getCoreGeometry().getIndices(); if ( rm == MeshRenderMode::RM_LINES ) { for ( uint i = 0; i < triangles.size(); ++i ) @@ -512,7 +512,7 @@ void MeshFeatureTrackingComponent::setTriangleIdx( uint idx ) { // also need to change all for feature Scale, Position and Vector const auto rm = m_pickedMesh->getRenderMode(); - const auto& triangles = m_pickedMesh->getCoreGeometry().m_indices; + const auto& triangles = m_pickedMesh->getCoreGeometry().getIndices(); if ( rm == MeshRenderMode::RM_TRIANGLES ) { const auto& t = triangles[idx]; diff --git a/MeshPaint/src/MeshPaintComponent.cpp b/MeshPaint/src/MeshPaintComponent.cpp index 0229650..a20fe56 100644 --- a/MeshPaint/src/MeshPaintComponent.cpp +++ b/MeshPaint/src/MeshPaintComponent.cpp @@ -156,7 +156,7 @@ void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& p // auto triangleMesh = compMess->get( getEntity(), // m_dataId ); however here we skip the search in the component map - const auto& t = m_mesh->getCoreGeometry().m_indices; + const auto& t = m_mesh->getCoreGeometry().getIndices(); ON_DEBUG( auto colAttrib = m_mesh->getCoreGeometry().getAttribHandle( colAttribName ) ); CORE_ASSERT( colAttrib == m_currentColorAttribHdl, "Inconsistent AttribHandle used" ); From b87252e040002055722f2fb5d8f9a9d68612ae72 Mon Sep 17 00:00:00 2001 From: dlyr Date: Sat, 6 Feb 2021 08:06:41 +0100 Subject: [PATCH 3/7] update to radium PR#642 --- CameraManip/CMakeLists.txt | 4 +- CameraManip/src/CameraManipPlugin.cpp | 28 +++---- CameraManip/src/CameraManipPlugin.hpp | 2 +- CameraManip/src/UI/CameraManipUI.h | 2 +- Dummy/src/DummyComponent.cpp | 14 ++-- Dummy/src/DummyComponent.hpp | 6 +- Dummy/src/DummySystem.cpp | 8 +- Dummy/src/DummySystem.hpp | 6 +- MeshFeatureTracking/CMakeLists.txt | 4 +- .../src/MeshFeatureTrackingComponent.cpp | 44 +++++------ .../src/MeshFeatureTrackingComponent.hpp | 14 ++-- .../src/MeshFeatureTrackingPlugin.cpp | 12 +-- .../src/MeshFeatureTrackingPlugin.hpp | 2 +- .../src/UI/MeshFeatureTrackingUI.cpp | 6 +- .../src/UI/MeshFeatureTrackingUI.h | 4 +- MeshPaint/CMakeLists.txt | 4 +- MeshPaint/src/MeshPaintComponent.cpp | 75 +++++++++---------- MeshPaint/src/MeshPaintComponent.hpp | 24 +++--- MeshPaint/src/MeshPaintPlugin.cpp | 18 ++--- MeshPaint/src/MeshPaintPlugin.hpp | 2 +- MeshPaint/src/MeshPaintSystem.cpp | 12 +-- MeshPaint/src/MeshPaintSystem.hpp | 10 +-- MeshPaint/src/UI/MeshPaintUI.h | 2 +- fake-toon/src/FakeToonMaterial.cpp | 50 +++++++------ fake-toon/src/FakeToonMaterial.hpp | 4 +- fake-toon/src/system.cpp | 20 ++--- fake-toon/src/system.hpp | 6 +- laplacian-smoothing/src/system.cpp | 16 ++-- laplacian-smoothing/src/system.hpp | 6 +- 29 files changed, 207 insertions(+), 198 deletions(-) diff --git a/CameraManip/CMakeLists.txt b/CameraManip/CMakeLists.txt index f10f5d5..3ee8a6a 100644 --- a/CameraManip/CMakeLists.txt +++ b/CameraManip/CMakeLists.txt @@ -14,7 +14,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) project(CameraManip VERSION 1.0.0 LANGUAGES CXX) # Qt stuff -find_package(Radium REQUIRED Core Engine PluginBase GuiBase IO) +find_package(Radium REQUIRED Core Engine PluginBase Gui IO) find_package(Qt5 COMPONENTS Core Widgets REQUIRED) set(Qt5_LIBRARIES Qt5::Core Qt5::Widgets) set(CMAKE_AUTOMOC ON) @@ -61,7 +61,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Radium::Core Radium::Engine Radium::PluginBase - Radium::GuiBase + Radium::Gui ${Qt5_LIBRARIES} ) diff --git a/CameraManip/src/CameraManipPlugin.cpp b/CameraManip/src/CameraManipPlugin.cpp index 5d097f4..938ce8d 100644 --- a/CameraManip/src/CameraManipPlugin.cpp +++ b/CameraManip/src/CameraManipPlugin.cpp @@ -6,14 +6,14 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include "ui_CameraManipUI.h" #include @@ -36,7 +36,7 @@ void CameraManipPluginC::registerPlugin( const Ra::Plugins::Context& context ) { m_selectionManager = context.m_selectionManager; m_viewer = context.m_viewer; connect( m_selectionManager, - &Ra::GuiBase::SelectionManager::currentChanged, + &Ra::Gui::SelectionManager::currentChanged, this, &CameraManipPluginC::onCurrentChanged ); connect( this, @@ -85,11 +85,11 @@ QAction* CameraManipPluginC::getAction( int id ) { void CameraManipPluginC::useSelectedCamera() { if ( m_selectionManager->hasSelection() ) { - const Ra::Engine::ItemEntry& ent = m_selectionManager->currentItem(); + const Ra::Engine::Scene::ItemEntry& ent = m_selectionManager->currentItem(); if ( ent.m_component == nullptr ) { return; } if ( ent.m_component->getName().compare( 0, 7, "CAMERA_" ) == 0 ) { - Ra::Engine::Camera* camera = static_cast( ent.m_component ); + Ra::Engine::Scene::Camera* camera = static_cast( ent.m_component ); m_viewer->getCameraManipulator()->getCamera()->show(true ); m_viewer->getCameraManipulator()->setCamera(camera ); emit askForUpdate(); @@ -125,11 +125,11 @@ void CameraManipPluginC::saveCamera() { void CameraManipPluginC::createCamera() { // Create new entity with camera component only auto camMngr = - static_cast( m_engine->getSystem( "DefaultCameraManager" ) ); + static_cast( m_engine->getSystem( "DefaultCameraManager" ) ); std::string camName = "CAMERA_" + std::to_string( camMngr->count() ); auto entity = m_engine->getEntityManager()->createEntity( camName ); - Ra::Engine::Camera* cam = - new Ra::Engine::Camera( entity, camName, m_viewer->width(), m_viewer->height() ); + Ra::Engine::Scene::Camera* cam = + new Ra::Engine::Scene::Camera( entity, camName, m_viewer->width(), m_viewer->height() ); // Copy Camera data auto manip = static_cast( m_viewer->getCameraManipulator() ); auto camera = manip->getCamera(); @@ -150,7 +150,7 @@ void CameraManipPluginC::onCurrentChanged( const QModelIndex& current, const QMo m_widget->ui->m_useCamera->setEnabled( false ); if ( m_selectionManager->hasSelection() ) { - const Ra::Engine::ItemEntry& ent = m_selectionManager->currentItem(); + const Ra::Engine::Scene::ItemEntry& ent = m_selectionManager->currentItem(); if ( ent.m_component == nullptr ) { return; } if ( ent.m_component->getName().compare( 0, 7, "CAMERA_" ) == 0 ) { m_widget->ui->m_useCamera->setEnabled( true ); } diff --git a/CameraManip/src/CameraManipPlugin.hpp b/CameraManip/src/CameraManipPlugin.hpp index e52893d..d49c62f 100644 --- a/CameraManip/src/CameraManipPlugin.hpp +++ b/CameraManip/src/CameraManipPlugin.hpp @@ -56,7 +56,7 @@ class CameraManipPluginC : public QObject, Ra::Plugins::RadiumPluginInterface CameraManipUI* m_widget; Ra::Engine::RadiumEngine* m_engine; - Ra::GuiBase::SelectionManager* m_selectionManager; + Ra::Gui::SelectionManager* m_selectionManager; Ra::Gui::Viewer* m_viewer; }; diff --git a/CameraManip/src/UI/CameraManipUI.h b/CameraManip/src/UI/CameraManipUI.h index 4e1b6b4..4307938 100644 --- a/CameraManip/src/UI/CameraManipUI.h +++ b/CameraManip/src/UI/CameraManipUI.h @@ -3,7 +3,7 @@ #include -#include +#include namespace UI { class CameraManipUI; diff --git a/Dummy/src/DummyComponent.cpp b/Dummy/src/DummyComponent.cpp index 8cc094f..9d74688 100644 --- a/Dummy/src/DummyComponent.cpp +++ b/Dummy/src/DummyComponent.cpp @@ -1,14 +1,14 @@ #include "DummyComponent.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace DummyPlugin { -DummyComponent::DummyComponent( const std::string& name, Ra::Engine::Entity* entity ) : Ra::Engine::Component( name, entity ) {} +DummyComponent::DummyComponent( const std::string& name, Ra::Engine::Scene::Entity* entity ) : Ra::Engine::Scene::Component( name, entity ) {} DummyComponent::~DummyComponent() {} diff --git a/Dummy/src/DummyComponent.hpp b/Dummy/src/DummyComponent.hpp index 00cb0bb..c36a2a8 100644 --- a/Dummy/src/DummyComponent.hpp +++ b/Dummy/src/DummyComponent.hpp @@ -3,7 +3,7 @@ #include -#include +#include namespace Ra { namespace Engine { @@ -12,10 +12,10 @@ struct RenderTechnique; } // namespace Ra namespace DummyPlugin { -class DUMMY_PLUGIN_API DummyComponent : public Ra::Engine::Component +class DUMMY_PLUGIN_API DummyComponent : public Ra::Engine::Scene::Component { public: - DummyComponent( const std::string& name, Ra::Engine::Entity* entity ); + DummyComponent( const std::string& name, Ra::Engine::Scene::Entity* entity ); virtual ~DummyComponent(); virtual void initialize() override; diff --git a/Dummy/src/DummySystem.cpp b/Dummy/src/DummySystem.cpp index c3cd6df..f4f4a15 100644 --- a/Dummy/src/DummySystem.cpp +++ b/Dummy/src/DummySystem.cpp @@ -2,17 +2,17 @@ #include #include -#include +#include #include #include -#include +#include #include "DummyComponent.hpp" #include "DummyTask.hpp" namespace DummyPlugin { -DummySystem::DummySystem() : Ra::Engine::System() { +DummySystem::DummySystem() : Ra::Engine::Scene::System() { m_data = new DummyData; m_data->foo = 42; m_data->bar = 1337; @@ -22,7 +22,7 @@ DummySystem::~DummySystem() { delete m_data; } -void DummySystem::handleAssetLoading( Ra::Engine::Entity *entity, const Ra::Core::Asset::FileData *data ) { +void DummySystem::handleAssetLoading( Ra::Engine::Scene::Entity *entity, const Ra::Core::Asset::FileData *data ) { std::string componentName = "DummyComponent_" + entity->getName(); DummyComponent* component = new DummyComponent( componentName, entity ); registerComponent( entity, component ); diff --git a/Dummy/src/DummySystem.hpp b/Dummy/src/DummySystem.hpp index ea3782c..ae7cdaa 100644 --- a/Dummy/src/DummySystem.hpp +++ b/Dummy/src/DummySystem.hpp @@ -3,7 +3,7 @@ #include -#include +#include namespace Ra { namespace Core { @@ -27,13 +27,13 @@ struct DummyData { int bar; }; -class DummySystem : public Ra::Engine::System +class DummySystem : public Ra::Engine::Scene::System { public: DummySystem(); ~DummySystem(); - void handleAssetLoading( Ra::Engine::Entity* entity, + void handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* data ) override; void generateTasks( Ra::Core::TaskQueue* taskQueue, diff --git a/MeshFeatureTracking/CMakeLists.txt b/MeshFeatureTracking/CMakeLists.txt index c065735..6bef4f5 100644 --- a/MeshFeatureTracking/CMakeLists.txt +++ b/MeshFeatureTracking/CMakeLists.txt @@ -15,7 +15,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) project(MeshFeatureTracking VERSION 1.0.0 LANGUAGES CXX) # Qt stuff -find_package(Radium REQUIRED Core Engine PluginBase GuiBase IO) +find_package(Radium REQUIRED Core Engine PluginBase Gui IO) find_package(Qt5 COMPONENTS Core Widgets REQUIRED) set(Qt5_LIBRARIES Qt5::Core Qt5::Widgets) set(CMAKE_AUTOMOC ON) @@ -62,7 +62,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Radium::Core Radium::Engine Radium::PluginBase - Radium::GuiBase + Radium::Gui ${Qt5_LIBRARIES} ) diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp index 6fa319b..d7b315d 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.cpp @@ -4,45 +4,45 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include constexpr Scalar POINT_SCALE_FACTOR = 1_ra / 500; -using Ra::Engine::ComponentMessenger; -using MeshRenderMode = Ra::Engine::Mesh::MeshRenderMode; -using PickingMode = Ra::Engine::Renderer::PickingMode; +using Ra::Engine::Scene::ComponentMessenger; +using MeshRenderMode = Ra::Engine::Data::Mesh::MeshRenderMode; +using PickingMode = Ra::Engine::Rendering::Renderer::PickingMode; using Ra::Core::Utils::TLogLevel; namespace MeshFeatureTrackingPlugin { MeshFeatureTrackingComponent::MeshFeatureTrackingComponent( const std::string& name ) : - Component( name, Ra::Engine::SystemEntity::getInstance() ), + Component( name, Ra::Engine::Scene::SystemEntity::getInstance() ), m_pickedMesh( nullptr ) { - m_data.m_mode = Ra::Engine::Renderer::PickingMode::RO; + m_data.m_mode = Ra::Engine::Rendering::Renderer::PickingMode::RO; } MeshFeatureTrackingComponent::~MeshFeatureTrackingComponent() {} void MeshFeatureTrackingComponent::initialize() { - std::shared_ptr display( new Ra::Engine::Mesh( "PickingManagerSphere" ) ); + std::shared_ptr display( new Ra::Engine::Data::Mesh( "PickingManagerSphere" ) ); display->loadGeometry( Ra::Core::Geometry::makeParametricSphere( 1_ra ) ); - std::shared_ptr material; - auto bpMaterial = new Ra::Engine::BlinnPhongMaterial( "PickingManageSphereMaterial" ); + std::shared_ptr material; + auto bpMaterial = new Ra::Engine::Data::BlinnPhongMaterial( "PickingManageSphereMaterial" ); bpMaterial->m_kd = Ra::Core::Utils::Color::Green(); material.reset( bpMaterial ); - m_RO = Ra::Engine::RenderObject::createRenderObject( + m_RO = Ra::Engine::Rendering::RenderObject::createRenderObject( "FeaturePickingManagerSphereRO", this, - Ra::Engine::RenderObjectType::Geometry, + Ra::Engine::Rendering::RenderObjectType::Geometry, display, - Ra::Engine::RenderTechnique::createDefaultRenderTechnique() ); + Ra::Engine::Rendering::RenderTechnique::createDefaultRenderTechnique() ); m_RO->setMaterial( material ); m_RO->setPickable( false ); m_RO->setVisible( false ); @@ -193,8 +193,8 @@ void getPos_TF2T( uint tf, uint& v1, uint& v2, uint& t1, uint& t2 ) { } } // namespace -void MeshFeatureTrackingComponent::setData( const Ra::Engine::Renderer::PickingResult& data ) { - using Ra::Engine::Displayable; +void MeshFeatureTrackingComponent::setData( const Ra::Engine::Rendering::Renderer::PickingResult& data ) { + using Ra::Engine::Data::Displayable; if ( !getRoMgr()->exists( data.m_roIdx ) ) { @@ -204,7 +204,7 @@ void MeshFeatureTrackingComponent::setData( const Ra::Engine::Renderer::PickingR { auto ro = getRoMgr()->getRenderObject( data.m_roIdx ); - Ra::Engine::Mesh* mesh = dynamic_cast( ro->getMesh().get() ); + Ra::Engine::Data::Mesh* mesh = dynamic_cast( ro->getMesh().get() ); if ( mesh == nullptr ) { LOG( TLogLevel::logWARNING ) << "MeshFeatureTracking is available only for meshes"; diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp index 046b581..46e87db 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp @@ -3,19 +3,21 @@ #include -#include -#include +#include +#include #include namespace Ra { namespace Engine { +namespace Data{ class Mesh; } +} } // namespace Ra namespace MeshFeatureTrackingPlugin { -class MeshFeatureTrackingComponent : public Ra::Engine::Component +class MeshFeatureTrackingComponent : public Ra::Engine::Scene::Component { public: MeshFeatureTrackingComponent( const std::string& name ); @@ -24,7 +26,7 @@ class MeshFeatureTrackingComponent : public Ra::Engine::Component virtual void initialize() override; - void setData( const Ra::Engine::Renderer::PickingResult& data ); + void setData( const Ra::Engine::Rendering::Renderer::PickingResult& data ); void setVertexIdx( uint idx ); void setTriangleIdx( uint idx ); @@ -46,8 +48,8 @@ class MeshFeatureTrackingComponent : public Ra::Engine::Component FeatureData m_data; Ra::Core::Utils::Index m_pickedRoIdx; - Ra::Engine::Mesh* m_pickedMesh; - Ra::Engine::RenderObject* m_RO; + Ra::Engine::Data::Mesh* m_pickedMesh; + Ra::Engine::Rendering::RenderObject* m_RO; }; } // namespace MeshFeatureTrackingPlugin diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp index ba2455c..1e141f6 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp @@ -4,13 +4,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include @@ -34,7 +34,7 @@ void MeshFeatureTrackingPluginC::registerPlugin( const Ra::Plugins::Context& con m_selectionManager = context.m_selectionManager; m_PickingManager = context.m_pickingManager; connect( m_selectionManager, - &Ra::GuiBase::SelectionManager::currentChanged, + &Ra::Gui::SelectionManager::currentChanged, this, &MeshFeatureTrackingPluginC::onCurrentChanged ); connect( this, diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp index 88d31e7..52e3f37 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp @@ -55,7 +55,7 @@ class MeshFeatureTrackingPluginC : public QObject, Ra::Plugins::RadiumPluginInte private: MeshFeatureTrackingComponent* m_component{nullptr}; - Ra::GuiBase::SelectionManager* m_selectionManager{nullptr}; + Ra::Gui::SelectionManager* m_selectionManager{nullptr}; Ra::Gui::PickingManager* m_PickingManager{nullptr}; MeshFeatureTrackingUI* m_widget{nullptr}; }; diff --git a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp index 87ee285..4ee5d78 100644 --- a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp +++ b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp @@ -30,7 +30,7 @@ void MeshFeatureTrackingUI::updateTracking( const FeatureData& data, ui->m_triangleInfo->setEnabled( false ); switch ( data.m_mode ) { - case Ra::Engine::Renderer::VERTEX: + case Ra::Engine::Rendering::Renderer::VERTEX: { ui->m_vertexInfo->setEnabled( true ); ui->m_vertexIdx->blockSignals( true ); @@ -44,14 +44,14 @@ void MeshFeatureTrackingUI::updateTracking( const FeatureData& data, ui->m_vertexNZ->setText( QString::number( double( vec[2] ) ) ); break; } - case Ra::Engine::Renderer::EDGE: + case Ra::Engine::Rendering::Renderer::EDGE: { ui->m_edgeInfo->setEnabled( true ); ui->m_edgeV0->setText( QString::number( data.m_data[0] ) ); ui->m_edgeV1->setText( QString::number( data.m_data[1] ) ); break; } - case Ra::Engine::Renderer::TRIANGLE: + case Ra::Engine::Rendering::Renderer::TRIANGLE: { ui->m_triangleInfo->setEnabled( true ); ui->m_triangleIdx->blockSignals( true ); diff --git a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h index 44ace3a..02d918c 100644 --- a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h +++ b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h @@ -2,7 +2,7 @@ #define MESHFEATURETRACKINGUI_H #include -#include +#include namespace UI { class MeshFeatureTrackingUi; @@ -18,7 +18,7 @@ class MeshFeatureTrackingUI; struct FeatureData { /// feature type: only vertex, edge, triangles are supported. - Ra::Engine::Renderer::PickingMode m_mode; + Ra::Engine::Rendering::Renderer::PickingMode m_mode; /// vertices indices in 0-2 according to m_mode, plus triangle idx in 3 for triangles std::array< int, 4 > m_data; }; diff --git a/MeshPaint/CMakeLists.txt b/MeshPaint/CMakeLists.txt index 0d4bea3..0f45747 100644 --- a/MeshPaint/CMakeLists.txt +++ b/MeshPaint/CMakeLists.txt @@ -15,7 +15,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) project(MeshPaint VERSION 1.0.0 LANGUAGES CXX) # Qt stuff -find_package(Radium REQUIRED Core Engine PluginBase GuiBase IO) +find_package(Radium REQUIRED Core Engine PluginBase Gui IO) find_package(Qt5 COMPONENTS Core Widgets REQUIRED) set(Qt5_LIBRARIES Qt5::Core Qt5::Widgets) set(CMAKE_AUTOMOC ON) @@ -64,7 +64,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Radium::Core Radium::Engine Radium::PluginBase - Radium::GuiBase + Radium::Gui ${Qt5_LIBRARIES} ) diff --git a/MeshPaint/src/MeshPaintComponent.cpp b/MeshPaint/src/MeshPaintComponent.cpp index a20fe56..79372e3 100644 --- a/MeshPaint/src/MeshPaintComponent.cpp +++ b/MeshPaint/src/MeshPaintComponent.cpp @@ -7,24 +7,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace Ra::Core::Utils; // log namespace MeshPaintPlugin { static const std::string colAttribName = - Ra::Engine::Mesh::getAttribName( Ra::Engine::Mesh::VERTEX_COLOR ); + Ra::Engine::Data::Mesh::getAttribName( Ra::Engine::Data::Mesh::VERTEX_COLOR ); -MeshPaintComponent::MeshPaintComponent( const std::string& name, Ra::Engine::Entity* entity ) : - Ra::Engine::Component( name, entity ), - m_mesh( nullptr ) {} +MeshPaintComponent::MeshPaintComponent( const std::string& name, + Ra::Engine::Scene::Entity* entity ) : + Ra::Engine::Scene::Component( name, entity ), m_mesh( nullptr ) {} MeshPaintComponent::~MeshPaintComponent() {} @@ -36,8 +36,8 @@ void MeshPaintComponent::setDataId( const std::string& id ) { } void MeshPaintComponent::initialize() { - using Ra::Engine::Mesh; - auto compMess = Ra::Engine::ComponentMessenger::getInstance(); + using Ra::Engine::Data::Mesh; + auto compMess = Ra::Engine::Scene::ComponentMessenger::getInstance(); // Look for the data we need bool geometryData = compMess->canGet( getEntity(), m_dataId ); @@ -122,34 +122,35 @@ void MeshPaintComponent::bakePaintToDiffuse() { // auto triangleMesh = compMess->get( getEntity(), // m_dataId ); however here we skip the search in the component map Ra::Core::Geometry::TriangleMesh& triangleMesh = m_mesh->getCoreGeometry(); - m_baseColors = triangleMesh.getAttrib( m_currentColorAttribHdl ).data(); + m_baseColors = triangleMesh.getAttrib( m_currentColorAttribHdl ).data(); m_isBaseColorValid = true; } -void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& picking, +void MeshPaintComponent::paintMesh( const Ra::Engine::Rendering::Renderer::PickingResult& picking, const Ra::Core::Utils::Color& color ) { - using Ra::Engine::Mesh; + using Ra::Engine::Data::Mesh; if ( !getRoMgr()->exists( *m_renderObjectReader() ) ) { return; } CORE_ASSERT( m_mesh != nullptr, "We should be have a Mesh storing a TriangleMesh here" ); // check it's for us - if ( *m_renderObjectReader() != picking.m_roIdx || picking.m_mode == Ra::Engine::Renderer::RO ) + if ( *m_renderObjectReader() != picking.m_roIdx || + picking.m_mode == Ra::Engine::Rendering::Renderer::RO ) { return; } auto pickingRenderMode = m_mesh->pickingRenderMode(); - if ( pickingRenderMode == Ra::Engine::Displayable::NO_PICKING ) { return; } + if ( pickingRenderMode == Ra::Engine::Data::Displayable::NO_PICKING ) { return; } - if ( ( m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_LINES || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_LINE_LOOP || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_LINE_STRIP || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_LINES_ADJACENCY || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_LINE_STRIP_ADJACENCY || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_TRIANGLE_STRIP || - m_mesh->getRenderMode() == Ra::Engine::Mesh::RM_TRIANGLE_FAN ) ) + if ( ( m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_LINES || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_LINE_LOOP || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_LINE_STRIP || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_LINES_ADJACENCY || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_LINE_STRIP_ADJACENCY || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_TRIANGLE_STRIP || + m_mesh->getRenderMode() == Ra::Engine::Data::Mesh::RM_TRIANGLE_FAN ) ) { return; } - if ( pickingRenderMode == Ra::Engine::Displayable::PKM_POINTS && - ( picking.m_mode != Ra::Engine::Renderer::VERTEX && - picking.m_mode != Ra::Engine::Renderer::C_VERTEX ) ) + if ( pickingRenderMode == Ra::Engine::Data::Displayable::PKM_POINTS && + ( picking.m_mode != Ra::Engine::Rendering::Renderer::VERTEX && + picking.m_mode != Ra::Engine::Rendering::Renderer::C_VERTEX ) ) { return; } // Could also be accessed using @@ -166,11 +167,10 @@ void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& p switch ( picking.m_mode ) { - case Ra::Engine::Renderer::VERTEX: + case Ra::Engine::Rendering::Renderer::VERTEX: [[fallthrough]]; - case Ra::Engine::Renderer::C_VERTEX: - { - if ( pickingRenderMode == Ra::Engine::Displayable::PKM_POINTS ) + case Ra::Engine::Rendering::Renderer::C_VERTEX: { + if ( pickingRenderMode == Ra::Engine::Data::Displayable::PKM_POINTS ) { for ( auto e : picking.m_elementIdx ) { @@ -188,10 +188,9 @@ void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& p m_mesh->setDirty( Mesh::VERTEX_COLOR ); break; } - case Ra::Engine::Renderer::EDGE: + case Ra::Engine::Rendering::Renderer::EDGE: [[fallthrough]]; - case Ra::Engine::Renderer::C_EDGE: - { + case Ra::Engine::Rendering::Renderer::C_EDGE: { for ( size_t e = 0; e < picking.m_elementIdx.size(); ++e ) { const auto& elt = t[size_t( picking.m_elementIdx[e] )]; @@ -202,10 +201,9 @@ void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& p break; } - case Ra::Engine::Renderer::TRIANGLE: + case Ra::Engine::Rendering::Renderer::TRIANGLE: [[fallthrough]]; - case Ra::Engine::Renderer::C_TRIANGLE: - { + case Ra::Engine::Rendering::Renderer::C_TRIANGLE: { for ( size_t e = 0; e < picking.m_elementIdx.size(); ++e ) { const auto& elt = t[size_t( picking.m_elementIdx[e] )]; @@ -220,7 +218,6 @@ void MeshPaintComponent::paintMesh( const Ra::Engine::Renderer::PickingResult& p default: break; } - colorAttrib.unlock(); } diff --git a/MeshPaint/src/MeshPaintComponent.hpp b/MeshPaint/src/MeshPaintComponent.hpp index 3eb5b36..d30a1bf 100644 --- a/MeshPaint/src/MeshPaintComponent.hpp +++ b/MeshPaint/src/MeshPaintComponent.hpp @@ -7,10 +7,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Ra { namespace Core { @@ -19,7 +19,9 @@ struct TaskParams; } // namespace Core namespace Engine { struct FrameInfo; +namespace Data { class Mesh; +} } // namespace Engine } // namespace Ra @@ -28,10 +30,10 @@ namespace MeshPaintPlugin { /*! * \brief The MeshPaintComponent class allows to paint over TriangleMeshes */ -class MESH_PAINT_PLUGIN_API MeshPaintComponent : public Ra::Engine::Component +class MESH_PAINT_PLUGIN_API MeshPaintComponent : public Ra::Engine::Scene::Component { public: - MeshPaintComponent( const std::string& name, Ra::Engine::Entity* entity ); + MeshPaintComponent( const std::string& name, Ra::Engine::Scene::Entity* entity ); ~MeshPaintComponent() override; virtual void initialize() override; @@ -45,22 +47,22 @@ class MESH_PAINT_PLUGIN_API MeshPaintComponent : public Ra::Engine::Component /// Overwrite original colors with current paint /// \warning Called for all the components of the scene ! void bakePaintToDiffuse(); - void paintMesh( const Ra::Engine::Renderer::PickingResult& picking, + void paintMesh( const Ra::Engine::Rendering::Renderer::PickingResult& picking, const Ra::Core::Utils::Color& color ); protected: // Geometry data - Ra::Engine::ComponentMessenger::CallbackTypes::Getter + Ra::Engine::Scene::ComponentMessenger::CallbackTypes::Getter m_renderObjectReader; - Ra::Engine::Mesh* m_mesh; + Ra::Engine::Data::Mesh* m_mesh; // Data id for compoenent messenger std::string m_dataId; // Initial RO shader config when not painting - Ra::Engine::ShaderConfiguration m_baseConfig; + Ra::Engine::Data::ShaderConfiguration m_baseConfig; Ra::Core::Vector4Array m_baseColors; - bool m_isBaseColorValid{false}; + bool m_isBaseColorValid {false}; Ra::Core::Utils::AttribHandle m_currentColorAttribHdl; }; diff --git a/MeshPaint/src/MeshPaintPlugin.cpp b/MeshPaint/src/MeshPaintPlugin.cpp index 2c9c3c8..38fb4d5 100644 --- a/MeshPaint/src/MeshPaintPlugin.cpp +++ b/MeshPaint/src/MeshPaintPlugin.cpp @@ -4,16 +4,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include -#include -#include +#include +#include #include "ui_MeshPaintUI.h" #include @@ -44,7 +44,7 @@ void MeshPaintPluginC::registerPlugin( const Ra::Plugins::Context& context ) { m_system = new MeshPaintSystem; context.m_engine->registerSystem( "MeshPaintSystem", m_system ); connect( m_selectionManager, - &Ra::GuiBase::SelectionManager::currentChanged, + &Ra::Gui::SelectionManager::currentChanged, this, &MeshPaintPluginC::onCurrentChanged ); connect( m_widget, &MeshPaintUI::paintColor, this, &MeshPaintPluginC::activePaintColor ); diff --git a/MeshPaint/src/MeshPaintPlugin.hpp b/MeshPaint/src/MeshPaintPlugin.hpp index 4dc7404..2e86b5a 100644 --- a/MeshPaint/src/MeshPaintPlugin.hpp +++ b/MeshPaint/src/MeshPaintPlugin.hpp @@ -59,7 +59,7 @@ class MeshPaintPluginC : public QObject, Ra::Plugins::RadiumPluginInterface private: MeshPaintUI* m_widget; - Ra::GuiBase::SelectionManager* m_selectionManager; + Ra::Gui::SelectionManager* m_selectionManager; Ra::Gui::PickingManager* m_PickingManager; class MeshPaintSystem* m_system; diff --git a/MeshPaint/src/MeshPaintSystem.cpp b/MeshPaint/src/MeshPaintSystem.cpp index cd9f47b..1c77b5f 100644 --- a/MeshPaint/src/MeshPaintSystem.cpp +++ b/MeshPaint/src/MeshPaintSystem.cpp @@ -5,20 +5,20 @@ #include #include -#include +#include #include -#include +#include #include -#include +#include #include namespace MeshPaintPlugin { -MeshPaintSystem::MeshPaintSystem() : Ra::Engine::System() {} +MeshPaintSystem::MeshPaintSystem() : Ra::Engine::Scene::System() {} MeshPaintSystem::~MeshPaintSystem() {} -void MeshPaintSystem::handleAssetLoading( Ra::Engine::Entity* entity, +void MeshPaintSystem::handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) { auto geomData = fileData->getGeometryData(); @@ -47,7 +47,7 @@ void MeshPaintSystem::startPaintMesh( bool start ) { } } -void MeshPaintSystem::paintMesh( const Ra::Engine::Renderer::PickingResult& picking, +void MeshPaintSystem::paintMesh( const Ra::Engine::Rendering::Renderer::PickingResult& picking, const Ra::Core::Utils::Color& color ) { for ( auto& compEntry : this->m_components ) { diff --git a/MeshPaint/src/MeshPaintSystem.hpp b/MeshPaint/src/MeshPaintSystem.hpp index 97ec357..4cee741 100644 --- a/MeshPaint/src/MeshPaintSystem.hpp +++ b/MeshPaint/src/MeshPaintSystem.hpp @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include namespace Ra { namespace Engine { @@ -21,13 +21,13 @@ class MeshPaintComponent; } namespace MeshPaintPlugin { -class MESH_PAINT_PLUGIN_API MeshPaintSystem : public Ra::Engine::System +class MESH_PAINT_PLUGIN_API MeshPaintSystem : public Ra::Engine::Scene::System { public: MeshPaintSystem(); virtual ~MeshPaintSystem(); - virtual void handleAssetLoading( Ra::Engine::Entity* entity, + virtual void handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) override; virtual void generateTasks( Ra::Core::TaskQueue* taskQueue, @@ -35,7 +35,7 @@ class MESH_PAINT_PLUGIN_API MeshPaintSystem : public Ra::Engine::System void startPaintMesh( bool start ); - void paintMesh( const Ra::Engine::Renderer::PickingResult& picking, + void paintMesh( const Ra::Engine::Rendering::Renderer::PickingResult& picking, const Ra::Core::Utils::Color& color ); void bakeToDiffuse(); diff --git a/MeshPaint/src/UI/MeshPaintUI.h b/MeshPaint/src/UI/MeshPaintUI.h index 820a8e7..e25b8bc 100644 --- a/MeshPaint/src/UI/MeshPaintUI.h +++ b/MeshPaint/src/UI/MeshPaintUI.h @@ -4,7 +4,7 @@ #include #include -#include +#include namespace UI { diff --git a/fake-toon/src/FakeToonMaterial.cpp b/fake-toon/src/FakeToonMaterial.cpp index 16c850e..cb593e1 100644 --- a/fake-toon/src/FakeToonMaterial.cpp +++ b/fake-toon/src/FakeToonMaterial.cpp @@ -3,18 +3,18 @@ #include #include -#include -#include -#include +#include +#include +#include #include using namespace Ra::Core::Utils; namespace FakeToonPluginExample { -static const std::string materialName{"FakeToon"}; +static const std::string materialName {"FakeToon"}; FakeToonMaterial::FakeToonMaterial( const std::string& instanceName ) : - Ra::Engine::Material( instanceName, materialName ) {} + Ra::Engine::Data::Material( instanceName, materialName ) {} void FakeToonMaterial::updateGL() { if ( !m_isDirty ) { return; } @@ -35,9 +35,16 @@ void FakeToonMaterial::updateGL() { void FakeToonMaterial::registerMaterial() { // gets the resource path of the plugins - Ra::Core::Resources::ResourcesLocator locator( + auto pluginPathOpt = Ra::Core::Resources::getResourcesPath( reinterpret_cast( &FakeToonMaterial::registerMaterial ), "" ); - auto pluginPath = locator.getBasePath(); + + if ( !pluginPathOpt ) + { + LOG( logERROR ) << "Plugin Path not found, register material stopped."; + return; + } + auto pluginPath = *pluginPathOpt; + LOG( logINFO ) << "Plugin Path is " << pluginPath; auto shaderPath = pluginPath.substr( 0, pluginPath.find_last_of( '/' ) ) + "/Resources/ShaderFakeToon/Shaders"; @@ -47,29 +54,30 @@ void FakeToonMaterial::registerMaterial() { // "FakeToon", // FakeToonMaterialConverter() ); // 2- register the technique builder for rendering - Ra::Engine::ShaderConfiguration lpconfig( + Ra::Engine::Data::ShaderConfiguration lpconfig( "FakeToon", shaderPath + "/VERTEX_SHADER.vert", shaderPath + "/FRAGMENT_SHADER.frag" ); - Ra::Engine::ShaderConfigurationFactory::addConfiguration( lpconfig ); + Ra::Engine::Data::ShaderConfigurationFactory::addConfiguration( lpconfig ); - Ra::Engine::ShaderConfiguration dpconfig( "DepthAmbiantFakeToon", - shaderPath + "/VERTEX_SHADER.vert", - shaderPath + "/FRAGMENT_SHADER.frag" ); - Ra::Engine::ShaderConfigurationFactory::addConfiguration( dpconfig ); + Ra::Engine::Data::ShaderConfiguration dpconfig( "DepthAmbiantFakeToon", + shaderPath + "/VERTEX_SHADER.vert", + shaderPath + "/FRAGMENT_SHADER.frag" ); + Ra::Engine::Data::ShaderConfigurationFactory::addConfiguration( dpconfig ); - Ra::Engine::EngineRenderTechniques::registerDefaultTechnique( - "FakeToon", []( Ra::Engine::RenderTechnique& rt, bool /*isTransparent*/ ) { + Ra::Engine::Rendering::EngineRenderTechniques::registerDefaultTechnique( + "FakeToon", []( Ra::Engine::Rendering::RenderTechnique& rt, bool /*isTransparent*/ ) { // Configuration for RenderTechnique::LIGHTING_OPAQUE (Mandatory) - auto lpconfig = Ra::Engine::ShaderConfigurationFactory::getConfiguration( "FakeToon" ); - rt.setConfiguration( *lpconfig, Ra::Engine::DefaultRenderingPasses::LIGHTING_OPAQUE ); + auto lpconfig = + Ra::Engine::Data::ShaderConfigurationFactory::getConfiguration( "FakeToon" ); + rt.setConfiguration( *lpconfig, Ra::Engine::Rendering::DefaultRenderingPasses::LIGHTING_OPAQUE ); // Configuration for RenderTechnique::Z_PREPASS - auto dpconfig = - Ra::Engine::ShaderConfigurationFactory::getConfiguration( "DepthAmbiantFakeToon" ); - rt.setConfiguration( *dpconfig, Ra::Engine::DefaultRenderingPasses::Z_PREPASS ); + auto dpconfig = Ra::Engine::Data::ShaderConfigurationFactory::getConfiguration( + "DepthAmbiantFakeToon" ); + rt.setConfiguration( *dpconfig, Ra::Engine::Rendering::DefaultRenderingPasses::Z_PREPASS ); // Configuration for RenderTechnique::LIGHTING_TRANSPARENT } ); } void FakeToonMaterial::unregisterMaterial() { - Ra::Engine::EngineRenderTechniques::removeDefaultTechnique( "FakeToon" ); + Ra::Engine::Rendering::EngineRenderTechniques::removeDefaultTechnique( "FakeToon" ); } } // namespace FakeToonPluginExample diff --git a/fake-toon/src/FakeToonMaterial.hpp b/fake-toon/src/FakeToonMaterial.hpp index b451e45..f6396d3 100644 --- a/fake-toon/src/FakeToonMaterial.hpp +++ b/fake-toon/src/FakeToonMaterial.hpp @@ -1,12 +1,12 @@ #pragma once #include "plugin.hpp" -#include +#include namespace FakeToonPluginExample { /// Simple shader class implementing basic toon shader -class FAKE_TOON_PLUGIN_EXAMPLE_API FakeToonMaterial final : public Ra::Engine::Material +class FAKE_TOON_PLUGIN_EXAMPLE_API FakeToonMaterial final : public Ra::Engine::Data::Material { public: EIGEN_MAKE_ALIGNED_OPERATOR_NEW diff --git a/fake-toon/src/system.cpp b/fake-toon/src/system.cpp index c40372b..4a7d39e 100755 --- a/fake-toon/src/system.cpp +++ b/fake-toon/src/system.cpp @@ -4,16 +4,16 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include namespace FakeToonPluginExample { using namespace Ra::Core::Utils; -MySystem::MySystem() : Ra::Engine::System() { +MySystem::MySystem() : Ra::Engine::Scene::System() { LOG( logINFO ) << "FakeToon Plugin System created."; } @@ -22,13 +22,13 @@ MySystem::~MySystem() { LOG( logINFO ) << "FakeToon Plugin System destroyed."; } -void MySystem::handleAssetLoading( Ra::Engine::Entity* entity, +void MySystem::handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) { using Ra::Core::Utils::Index; auto roMgr = Ra::Engine::RadiumEngine::getInstance()->getRenderObjectManager(); - auto builder = Ra::Engine::EngineRenderTechniques::getDefaultTechnique( "FakeToon" ); + auto builder = Ra::Engine::Rendering::EngineRenderTechniques::getDefaultTechnique( "FakeToon" ); if ( builder.first ) { @@ -36,10 +36,10 @@ void MySystem::handleAssetLoading( Ra::Engine::Entity* entity, auto data = fileData->getGeometryData(); for ( auto geom : data ) { - if ( Ra::Engine::ComponentMessenger::getInstance()->canGet( entity, + if ( Ra::Engine::Scene::ComponentMessenger::getInstance()->canGet( entity, geom->getName() ) ) { - auto idx = *Ra::Engine::ComponentMessenger::getInstance()->getterCallback( + auto idx = *Ra::Engine::Scene::ComponentMessenger::getInstance()->getterCallback( entity, geom->getName() )(); if ( idx.isValid() && roMgr->exists( idx ) ) diff --git a/fake-toon/src/system.hpp b/fake-toon/src/system.hpp index 8c58d8f..5015956 100644 --- a/fake-toon/src/system.hpp +++ b/fake-toon/src/system.hpp @@ -3,7 +3,7 @@ #include "plugin.hpp" -#include +#include namespace FakeToonPluginExample { /*! @@ -13,14 +13,14 @@ namespace FakeToonPluginExample { * and use the #ComponentMessenger to access and modify the 3d model geometry. * */ -class FAKE_TOON_PLUGIN_EXAMPLE_API MySystem : public QObject, public Ra::Engine::System +class FAKE_TOON_PLUGIN_EXAMPLE_API MySystem : public QObject, public Ra::Engine::Scene::System { Q_OBJECT public: MySystem(); virtual ~MySystem(); - virtual void handleAssetLoading( Ra::Engine::Entity* entity, + virtual void handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) override; virtual void generateTasks( Ra::Core::TaskQueue* taskQueue, diff --git a/laplacian-smoothing/src/system.cpp b/laplacian-smoothing/src/system.cpp index bb37c3f..96b2bc3 100644 --- a/laplacian-smoothing/src/system.cpp +++ b/laplacian-smoothing/src/system.cpp @@ -8,17 +8,17 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include namespace MyPluginExample { using namespace Ra::Core::Utils; -MySystem::MySystem() : Ra::Engine::System() { +MySystem::MySystem() : Ra::Engine::Scene::System() { LOG( logINFO ) << "Example Plugin System created."; } @@ -26,7 +26,7 @@ MySystem::~MySystem() { LOG( logINFO ) << "Example Plugin System destroyed."; } -void MySystem::handleAssetLoading( Ra::Engine::Entity* entity, +void MySystem::handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) { const auto& components = entity->getComponents(); QString entityName = QString::fromStdString( entity->getName() ); @@ -52,8 +52,8 @@ void MySystem::compute( Param p ) { using Ra::Core::TriangleMesh; using Ra::Core::Vector3; using Ra::Core::Geometry::TopologicalMesh; - using Ra::Engine::ComponentMessenger; - using Ra::Engine::Mesh; + using Ra::Engine::Scene::ComponentMessenger; + using Ra::Engine::Data::Mesh; LOG( logINFO ) << "Example Plugin System: computation requested."; diff --git a/laplacian-smoothing/src/system.hpp b/laplacian-smoothing/src/system.hpp index 78066d7..abf9bcb 100644 --- a/laplacian-smoothing/src/system.hpp +++ b/laplacian-smoothing/src/system.hpp @@ -3,7 +3,7 @@ #include "plugin.hpp" -#include +#include namespace Ra { namespace Core { @@ -27,14 +27,14 @@ namespace MyPluginExample { * and use the #ComponentMessenger to access and modify the 3d model geometry. * */ -class LAPLACIAN_SMOOTHING_PLUGIN_EXAMPLE_API MySystem : public QObject, public Ra::Engine::System +class LAPLACIAN_SMOOTHING_PLUGIN_EXAMPLE_API MySystem : public QObject, public Ra::Engine::Scene::System { Q_OBJECT public: MySystem(); virtual ~MySystem(); - virtual void handleAssetLoading( Ra::Engine::Entity* entity, + virtual void handleAssetLoading( Ra::Engine::Scene::Entity* entity, const Ra::Core::Asset::FileData* fileData ) override; virtual void generateTasks( Ra::Core::TaskQueue* taskQueue, From 7e48d41f1815c875ecb7b89e3904d5d0bdb36a46 Mon Sep 17 00:00:00 2001 From: dlyr Date: Sat, 6 Feb 2021 08:20:30 +0100 Subject: [PATCH 4/7] assimp is on by default, remove option from ci --- .github/workflows/pull-request-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml index 895075d..3cec8ab 100644 --- a/.github/workflows/pull-request-ci.yml +++ b/.github/workflows/pull-request-ci.yml @@ -18,10 +18,10 @@ jobs: fail-fast: false matrix: config: - - { name: "Windows MSVC", suffix: "Windows", os: windows-latest, cc: "cl.exe", cxx: "cl.exe", assimp: "OFF" } - - { name: "Ubuntu gcc", suffix: "Linux-gcc8", os: ubuntu-18.04, cc: "gcc-8", cxx: "g++-8", assimp: "ON" } - - { name: "Ubuntu gcc", suffix: "Linux-gcc10", os: ubuntu-20.04, cc: "gcc-10", cxx: "g++-10", assimp: "ON" } - - { name: "MacOS clang", suffix: "macOS", os: macos-latest, cc: "clang", cxx: "clang++", assimp: "ON" } + - { name: "Windows MSVC", suffix: "Windows", os: windows-latest, cc: "cl.exe", cxx: "cl.exe" } + - { name: "Ubuntu gcc", suffix: "Linux-gcc8", os: ubuntu-18.04, cc: "gcc-8", cxx: "g++-8" } + - { name: "Ubuntu gcc", suffix: "Linux-gcc10", os: ubuntu-20.04, cc: "gcc-10", cxx: "g++-10" } + - { name: "MacOS clang", suffix: "macOS", os: macos-latest, cc: "clang", cxx: "clang++" } steps: - uses: seanmiddleditch/gha-setup-ninja@master @@ -67,13 +67,13 @@ jobs: if: steps.cache-external.outputs.cache-hit != 'true' run: | cd external/build/ - cmake ../../src/Radium-Engine/external -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DRADIUM_IO_ASSIMP=${{ matrix.config.assimp }} -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DCMAKE_INSTALL_PREFIX=../install/ + cmake ../../src/Radium-Engine/external -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DCMAKE_INSTALL_PREFIX=../install/ cmake --build . --parallel --config Release - name: Configure Radium run: | cd build/Radium-Engine - cmake ../../src/Radium-Engine -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../../install/ -DRADIUM_IO_ASSIMP=${{ matrix.config.assimp }} -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DRADIUM_INSTALL_DOC=OFF -DRADIUM_ENABLE_TESTING=ON -DEigen3_DIR=${{env.ext-dir}}/share/eigen3/cmake/ -DOpenMesh_DIR=${{env.ext-dir}}/share/OpenMesh/cmake/ -Dcpplocate_DIR=${{env.ext-dir}}/share/cpplocate/ -Dglm_DIR=${{env.ext-dir}}/lib/cmake/glm/ -Dglbinding_DIR=${{env.ext-dir}}/share/glbinding/ -Dglobjects_DIR=${{env.ext-dir}}/share/globjects/ -Dstb_DIR=${{env.ext-dir}}/include/stb/ -Dassimp_DIR=${{env.ext-dir}}/lib/cmake/assimp-5.0/ -Dtinyply_DIR=${{env.ext-dir}}/lib/cmake/tinyply/ + cmake ../../src/Radium-Engine -GNinja -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../../install/ -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DRADIUM_UPDATE_VERSION=OFF -DRADIUM_EXTERNAL_CMAKE_INSTALL_MESSAGE=LAZY -DRADIUM_INSTALL_DOC=OFF -DRADIUM_ENABLE_TESTING=ON -DEigen3_DIR=${{env.ext-dir}}/share/eigen3/cmake/ -DOpenMesh_DIR=${{env.ext-dir}}/share/OpenMesh/cmake/ -Dcpplocate_DIR=${{env.ext-dir}}/share/cpplocate/ -Dglm_DIR=${{env.ext-dir}}/lib/cmake/glm/ -Dglbinding_DIR=${{env.ext-dir}}/share/glbinding/ -Dglobjects_DIR=${{env.ext-dir}}/share/globjects/ -Dstb_DIR=${{env.ext-dir}}/include/stb/ -Dassimp_DIR=${{env.ext-dir}}/lib/cmake/assimp-5.0/ -Dtinyply_DIR=${{env.ext-dir}}/lib/cmake/tinyply/ - name: Build Radium run: | From 7973f11c9eef36139c5a9e8090dae2fdf3ccd8e5 Mon Sep 17 00:00:00 2001 From: dlyr Date: Sat, 6 Feb 2021 08:25:58 +0100 Subject: [PATCH 5/7] Move .h to .hpp --- CameraManip/CMakeLists.txt | 2 +- CameraManip/src/CameraManipPlugin.cpp | 2 +- CameraManip/src/CameraManipPlugin.hpp | 2 +- CameraManip/src/UI/CameraManipUI.cpp | 2 +- CameraManip/src/UI/{CameraManipUI.h => CameraManipUI.hpp} | 0 MeshFeatureTracking/CMakeLists.txt | 2 +- MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp | 2 +- MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp | 2 +- MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp | 2 +- MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp | 2 +- .../UI/{MeshFeatureTrackingUI.h => MeshFeatureTrackingUI.hpp} | 0 MeshPaint/CMakeLists.txt | 2 +- MeshPaint/src/MeshPaintPlugin.cpp | 2 +- MeshPaint/src/MeshPaintPlugin.hpp | 2 +- MeshPaint/src/UI/MeshPaintUI.cpp | 2 +- MeshPaint/src/UI/{MeshPaintUI.h => MeshPaintUI.hpp} | 0 16 files changed, 13 insertions(+), 13 deletions(-) rename CameraManip/src/UI/{CameraManipUI.h => CameraManipUI.hpp} (100%) rename MeshFeatureTracking/src/UI/{MeshFeatureTrackingUI.h => MeshFeatureTrackingUI.hpp} (100%) rename MeshPaint/src/UI/{MeshPaintUI.h => MeshPaintUI.hpp} (100%) diff --git a/CameraManip/CMakeLists.txt b/CameraManip/CMakeLists.txt index 3ee8a6a..a315a8b 100644 --- a/CameraManip/CMakeLists.txt +++ b/CameraManip/CMakeLists.txt @@ -28,7 +28,7 @@ set(cm_sources set(cm_headers src/CameraManipPlugin.hpp src/CameraManipPluginMacros.hpp - src/UI/CameraManipUI.h + src/UI/CameraManipUI.hpp ) set(cm_markdowns diff --git a/CameraManip/src/CameraManipPlugin.cpp b/CameraManip/src/CameraManipPlugin.cpp index 938ce8d..38f8324 100644 --- a/CameraManip/src/CameraManipPlugin.cpp +++ b/CameraManip/src/CameraManipPlugin.cpp @@ -16,7 +16,7 @@ #include #include "ui_CameraManipUI.h" -#include +#include namespace CameraManipPlugin { diff --git a/CameraManip/src/CameraManipPlugin.hpp b/CameraManip/src/CameraManipPlugin.hpp index d49c62f..e71cf01 100644 --- a/CameraManip/src/CameraManipPlugin.hpp +++ b/CameraManip/src/CameraManipPlugin.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/CameraManip/src/UI/CameraManipUI.cpp b/CameraManip/src/UI/CameraManipUI.cpp index 94e0eac..d5a4ad4 100644 --- a/CameraManip/src/UI/CameraManipUI.cpp +++ b/CameraManip/src/UI/CameraManipUI.cpp @@ -1,4 +1,4 @@ -#include "CameraManipUI.h" +#include "CameraManipUI.hpp" #include "ui_CameraManipUI.h" diff --git a/CameraManip/src/UI/CameraManipUI.h b/CameraManip/src/UI/CameraManipUI.hpp similarity index 100% rename from CameraManip/src/UI/CameraManipUI.h rename to CameraManip/src/UI/CameraManipUI.hpp diff --git a/MeshFeatureTracking/CMakeLists.txt b/MeshFeatureTracking/CMakeLists.txt index 6bef4f5..e6372da 100644 --- a/MeshFeatureTracking/CMakeLists.txt +++ b/MeshFeatureTracking/CMakeLists.txt @@ -31,7 +31,7 @@ set(mft_headers src/MeshFeatureTrackingComponent.hpp src/MeshFeatureTrackingPlugin.hpp src/MeshFeatureTrackingPluginMacros.hpp - src/UI/MeshFeatureTrackingUI.h + src/UI/MeshFeatureTrackingUI.hpp ) set(mft_uis diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp index 46e87db..79df8ee 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingComponent.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace Ra { namespace Engine { diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp index 1e141f6..26df107 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.cpp @@ -15,7 +15,7 @@ #include #include "ui_MeshFeatureTrackingUI.h" -#include +#include namespace MeshFeatureTrackingPlugin { diff --git a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp index 52e3f37..52e1f96 100644 --- a/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp +++ b/MeshFeatureTracking/src/MeshFeatureTrackingPlugin.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp index 4ee5d78..9d970e8 100644 --- a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp +++ b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.cpp @@ -1,4 +1,4 @@ -#include "MeshFeatureTrackingUI.h" +#include "MeshFeatureTrackingUI.hpp" #include diff --git a/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h b/MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.hpp similarity index 100% rename from MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.h rename to MeshFeatureTracking/src/UI/MeshFeatureTrackingUI.hpp diff --git a/MeshPaint/CMakeLists.txt b/MeshPaint/CMakeLists.txt index 0f45747..e8b11c1 100644 --- a/MeshPaint/CMakeLists.txt +++ b/MeshPaint/CMakeLists.txt @@ -33,7 +33,7 @@ set(mp_headers src/MeshPaintSystem.hpp src/MeshPaintPlugin.hpp src/MeshPaintPluginMacros.hpp - src/UI/MeshPaintUI.h + src/UI/MeshPaintUI.hpp ) set(mp_uis diff --git a/MeshPaint/src/MeshPaintPlugin.cpp b/MeshPaint/src/MeshPaintPlugin.cpp index 38fb4d5..ba69df0 100644 --- a/MeshPaint/src/MeshPaintPlugin.cpp +++ b/MeshPaint/src/MeshPaintPlugin.cpp @@ -17,7 +17,7 @@ #include "ui_MeshPaintUI.h" #include -#include +#include namespace MeshPaintPlugin { diff --git a/MeshPaint/src/MeshPaintPlugin.hpp b/MeshPaint/src/MeshPaintPlugin.hpp index 2e86b5a..5c8e5ed 100644 --- a/MeshPaint/src/MeshPaintPlugin.hpp +++ b/MeshPaint/src/MeshPaintPlugin.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/MeshPaint/src/UI/MeshPaintUI.cpp b/MeshPaint/src/UI/MeshPaintUI.cpp index dd36b24..bfa1eb8 100644 --- a/MeshPaint/src/UI/MeshPaintUI.cpp +++ b/MeshPaint/src/UI/MeshPaintUI.cpp @@ -1,4 +1,4 @@ -#include "MeshPaintUI.h" +#include "MeshPaintUI.hpp" #include diff --git a/MeshPaint/src/UI/MeshPaintUI.h b/MeshPaint/src/UI/MeshPaintUI.hpp similarity index 100% rename from MeshPaint/src/UI/MeshPaintUI.h rename to MeshPaint/src/UI/MeshPaintUI.hpp From 04c2eb991b010ccdfbbf0dbb14ea248f6d10d737 Mon Sep 17 00:00:00 2001 From: dlyr Date: Sat, 6 Feb 2021 13:41:14 +0100 Subject: [PATCH 6/7] remove buggy resources for dummy plugin --- Dummy/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Dummy/CMakeLists.txt b/Dummy/CMakeLists.txt index f6f7015..f424260 100644 --- a/Dummy/CMakeLists.txt +++ b/Dummy/CMakeLists.txt @@ -70,6 +70,5 @@ endif(INSTALL_IN_RADIUM_BUNDLE) configure_radium_plugin( NAME ${PROJECT_NAME} - RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders "${ARGS}" ) From 4f02a2fa89560411ecb7f52e8099ca728a3cb695 Mon Sep 17 00:00:00 2001 From: dlyr Date: Sat, 6 Feb 2021 18:44:24 +0100 Subject: [PATCH 7/7] remove all buggy resources dir --- CameraManip/CMakeLists.txt | 1 - MeshFeatureTracking/CMakeLists.txt | 1 - MeshPaint/CMakeLists.txt | 1 - 3 files changed, 3 deletions(-) diff --git a/CameraManip/CMakeLists.txt b/CameraManip/CMakeLists.txt index a315a8b..bea77f8 100644 --- a/CameraManip/CMakeLists.txt +++ b/CameraManip/CMakeLists.txt @@ -73,6 +73,5 @@ endif(INSTALL_IN_RADIUM_BUNDLE) configure_radium_plugin( NAME ${PROJECT_NAME} - RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders "${ARGS}" ) diff --git a/MeshFeatureTracking/CMakeLists.txt b/MeshFeatureTracking/CMakeLists.txt index e6372da..56633f8 100644 --- a/MeshFeatureTracking/CMakeLists.txt +++ b/MeshFeatureTracking/CMakeLists.txt @@ -73,6 +73,5 @@ endif(INSTALL_IN_RADIUM_BUNDLE) configure_radium_plugin( NAME ${PROJECT_NAME} - RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders "${ARGS}" ) diff --git a/MeshPaint/CMakeLists.txt b/MeshPaint/CMakeLists.txt index e8b11c1..ba8dfa3 100644 --- a/MeshPaint/CMakeLists.txt +++ b/MeshPaint/CMakeLists.txt @@ -75,6 +75,5 @@ endif(INSTALL_IN_RADIUM_BUNDLE) configure_radium_plugin( NAME ${PROJECT_NAME} - RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders "${ARGS}" )