Browse Source

SceneGraph: fix TranslationTransformationTest on Windows.

*.hpp files are probably not working as expected here, will fix that
later. Added TODO for that.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
3df67b370f
  1. 1
      src/SceneGraph/Object.h
  2. 5
      src/SceneGraph/Test/TranslationTransformationTest.cpp

1
src/SceneGraph/Object.h

@ -95,6 +95,7 @@ class documentation or @ref compilation-speedup-hpp for more information.
@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 MAGNUM_SCENEGRAPH_EXPORT Object: public AbstractObject<Transformation::Dimensions, typename Transformation::Type>, public Transformation template<class Transformation> class MAGNUM_SCENEGRAPH_EXPORT Object: public AbstractObject<Transformation::Dimensions, typename Transformation::Type>, public Transformation
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

5
src/SceneGraph/Test/TranslationTransformationTest.cpp

@ -28,9 +28,6 @@
#include "SceneGraph/TranslationTransformation.h" #include "SceneGraph/TranslationTransformation.h"
#include "SceneGraph/Scene.h" #include "SceneGraph/Scene.h"
/* For Object2Di */
#include "SceneGraph/Object.hpp"
namespace Magnum { namespace SceneGraph { namespace Test { namespace Magnum { namespace SceneGraph { namespace Test {
typedef Object<TranslationTransformation2D> Object2D; typedef Object<TranslationTransformation2D> Object2D;
@ -134,7 +131,7 @@ void TranslationTransformationTest::translate() {
} }
void TranslationTransformationTest::integral() { void TranslationTransformationTest::integral() {
typedef Object<TranslationTransformation<2, Float, Short>> Object2Di; typedef Object<TranslationTransformation<2, Float, Int>> Object2Di;
Object2Di o; Object2Di o;
o.translate({3, -7}); o.translate({3, -7});

Loading…
Cancel
Save