Skip to content
Snippets Groups Projects
Commit 0b3f780a authored by Mathias Paulin's avatar Mathias Paulin :speech_balloon:
Browse files

Make lib and appli compile on windows

parent 890d7734
No related branches found
No related tags found
No related merge requests found
......@@ -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
#pragma once
#include <Gui/BaseApplication.hpp>
#include<optional>
namespace Mara {
class RadiumPlayer : public Ra::Gui::BaseApplication
{
......
......@@ -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 )
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment