From 0b3f780a1b3e19ef6473cba4e0ecfe0dd7958926 Mon Sep 17 00:00:00 2001
From: Mathias Paulin <Mathias.Paulin@irit.fr>
Date: Tue, 20 Apr 2021 16:57:23 +0200
Subject: [PATCH] Make lib and appli compile on windows
---
src/Mara/Gui/MainWindow.cpp | 4 ++++
src/Mara/RadiumPlayer.hpp | 3 +++
src/libRender/RadiumNBR/EnvMap.cpp | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Mara/Gui/MainWindow.cpp b/src/Mara/Gui/MainWindow.cpp
index 62d6a60..6d361e7 100644
--- a/src/Mara/Gui/MainWindow.cpp
+++ b/src/Mara/Gui/MainWindow.cpp
@@ -28,8 +28,10 @@
#include <RadiumPlayer.hpp>
+#ifdef RADIUM_HAS_SKELETON_ANIM
#include <Engine/Scene/SkeletonBasedAnimationSystem.hpp>
#include <Gui/SkeletonBasedAnimation/SkeletonBasedAnimationUI.hpp>
+#endif
using namespace Ra::Gui;
using namespace Ra::Engine;
@@ -541,6 +543,7 @@ void MainWindow::timelineSetPingPong( bool status ) {
}
void MainWindow::addRadiumSystemsUI() {
+#ifdef RADIUM_HAS_SKELETON_ANIM
// Register the Skeleton-based animation UI
auto animSystem = static_cast<Ra::Engine::Scene::SkeletonBasedAnimationSystem*>(
Ra::Engine::RadiumEngine::getInstance()->getSystem( "SkeletonBasedAnimationSystem" ) );
@@ -558,5 +561,6 @@ void MainWindow::addRadiumSystemsUI() {
&MainWindow::selectedItem,
skelAnimUI,
&Ra::Gui::SkeletonBasedAnimationUI::selectionChanged );
+ #endif
}
} // namespace Mara
diff --git a/src/Mara/RadiumPlayer.hpp b/src/Mara/RadiumPlayer.hpp
index baa27ab..d377a04 100644
--- a/src/Mara/RadiumPlayer.hpp
+++ b/src/Mara/RadiumPlayer.hpp
@@ -1,6 +1,9 @@
#pragma once
#include <Gui/BaseApplication.hpp>
+
+#include<optional>
+
namespace Mara {
class RadiumPlayer : public Ra::Gui::BaseApplication
{
diff --git a/src/libRender/RadiumNBR/EnvMap.cpp b/src/libRender/RadiumNBR/EnvMap.cpp
index 748cd8c..f98b748 100644
--- a/src/libRender/RadiumNBR/EnvMap.cpp
+++ b/src/libRender/RadiumNBR/EnvMap.cpp
@@ -35,7 +35,7 @@ using namespace gl;
template <typename T>
void flip_horizontally( T* img, size_t w, size_t h, size_t c ) {
#pragma omp parallel for
- for ( size_t r = 0; r < h; ++r )
+ for ( int r = 0; r < int(h); ++r )
{
for ( size_t l = 0; l < w / 2; ++l )
{
--
GitLab