From 3b666d85f460de3ea44c817549ef393feb30ff02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Dec 2013 01:48:29 +0100 Subject: [PATCH] SceneGraph: instantiate everything consistently on one place. --- src/SceneGraph/Animable.cpp | 9 +-------- src/SceneGraph/instantiation.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/SceneGraph/Animable.cpp b/src/SceneGraph/Animable.cpp index 1087f8371..d4b41833f 100644 --- a/src/SceneGraph/Animable.cpp +++ b/src/SceneGraph/Animable.cpp @@ -22,17 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include "Animable.hpp" +#include "Animable.h" namespace Magnum { namespace SceneGraph { -#ifndef DOXYGEN_GENERATING_OUTPUT -template class MAGNUM_SCENEGRAPH_EXPORT Animable<2, Float>; -template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>; -template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<2, Float>; -template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>; -#endif - Debug operator<<(Debug debug, AnimationState value) { switch(value) { #define _c(value) case AnimationState::value: return debug << "SceneGraph::AnimationState::" #value; diff --git a/src/SceneGraph/instantiation.cpp b/src/SceneGraph/instantiation.cpp index f326f2c02..9c8ca8606 100644 --- a/src/SceneGraph/instantiation.cpp +++ b/src/SceneGraph/instantiation.cpp @@ -23,6 +23,7 @@ */ #include "SceneGraph/AbstractFeature.hpp" +#include "SceneGraph/Animable.hpp" #include "SceneGraph/Camera2D.hpp" #include "SceneGraph/Camera3D.hpp" #include "SceneGraph/DualComplexTransformation.h" @@ -48,6 +49,11 @@ template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<3, Float>; template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<2, Float>; template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>; +template class MAGNUM_SCENEGRAPH_EXPORT Animable<2, Float>; +template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>; +template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<2, Float>; +template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>; + template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<2, Float>; template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<3, Float>; template class MAGNUM_SCENEGRAPH_EXPORT BasicCamera2D;