Browse Source

SceneGraph: remove integer TranslationTransformation template instance.

We can now use the *.hpp for that even on Windows.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
4e0f8ff097
  1. 3
      src/SceneGraph/Object.h
  2. 3
      src/SceneGraph/Test/TranslationTransformationTest.cpp
  3. 2
      src/SceneGraph/TranslationTransformation.h
  4. 2
      src/SceneGraph/instantiation.cpp

3
src/SceneGraph/Object.h

@ -90,12 +90,9 @@ class documentation or @ref compilation-speedup-hpp for more information.
- @ref RigidMatrixTransformation3D "Object<RigidMatrixTransformation3D>" - @ref RigidMatrixTransformation3D "Object<RigidMatrixTransformation3D>"
- @ref TranslationTransformation2D "Object<TranslationTransformation2D>" - @ref TranslationTransformation2D "Object<TranslationTransformation2D>"
- @ref TranslationTransformation3D "Object<TranslationTransformation3D>" - @ref TranslationTransformation3D "Object<TranslationTransformation3D>"
- @ref BasicTranslationTransformation2D "Object<BasicTranslationTransformation2D<Float, Int>>"
- @ref BasicTranslationTransformation3D "Object<BasicTranslationTransformation3D<Float, Int>>"
@see @ref Scene, @ref AbstractFeature, @ref AbstractTransformation, @see @ref Scene, @ref AbstractFeature, @ref AbstractTransformation,
@ref DebugTools::ObjectRenderer @ref DebugTools::ObjectRenderer
@todo Test (and fix) that hpp works also on Windows
*/ */
template<class Transformation> class Object: public AbstractObject<Transformation::Dimensions, typename Transformation::Type>, public Transformation template<class Transformation> class Object: public AbstractObject<Transformation::Dimensions, typename Transformation::Type>, public Transformation
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

3
src/SceneGraph/Test/TranslationTransformationTest.cpp

@ -25,6 +25,7 @@
#include <sstream> #include <sstream>
#include <TestSuite/Tester.h> #include <TestSuite/Tester.h>
#include "SceneGraph/Object.hpp"
#include "SceneGraph/TranslationTransformation.h" #include "SceneGraph/TranslationTransformation.h"
#include "SceneGraph/Scene.h" #include "SceneGraph/Scene.h"
@ -131,7 +132,7 @@ void TranslationTransformationTest::translate() {
} }
void TranslationTransformationTest::integral() { void TranslationTransformationTest::integral() {
typedef Object<TranslationTransformation<2, Float, Int>> Object2Di; typedef Object<TranslationTransformation<2, Float, Short>> Object2Di;
Object2Di o; Object2Di o;
o.translate({3, -7}); o.translate({3, -7});

2
src/SceneGraph/TranslationTransformation.h

@ -209,8 +209,6 @@ template<UnsignedInt dimensions, class T, class TranslationType> struct Transfor
#ifdef _WIN32 #ifdef _WIN32
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<2, Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<2, Float>>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float>>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<2, Float, Int>>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float, Int>>;
#endif #endif
}} }}

2
src/SceneGraph/instantiation.cpp

@ -74,8 +74,6 @@ template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<BasicRigidMatrixTransformatio
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<BasicRigidMatrixTransformation3D<Float>>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<BasicRigidMatrixTransformation3D<Float>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<2, Float>>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<2, Float>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<3, Float>>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<3, Float>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<2, Float, Int>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<3, Float, Int>>;
#endif #endif
}} }}

Loading…
Cancel
Save