From 7a63538fb9dadfe6bcb4bdd7da82dad2c7f4ddea Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 2 Jul 2016 10:44:40 +0100
Subject: [PATCH] Removed inappropriate use of Vec3us in osgAnimation as this
 relies upon nonexistant functionality in Vec3us and in general just doesn't
 make sense to attempt to use float point maths with a unsigned short.

---
 include/osgAnimation/Channel      | 2 --
 include/osgAnimation/Interpolator | 2 --
 include/osgAnimation/Sampler      | 2 --
 3 files changed, 6 deletions(-)

diff --git a/include/osgAnimation/Channel b/include/osgAnimation/Channel
index 5ed868204..d2f3d63de 100644
--- a/include/osgAnimation/Channel
+++ b/include/osgAnimation/Channel
@@ -178,10 +178,8 @@ namespace osgAnimation
     typedef TemplateChannel<FloatLinearSampler> FloatLinearChannel;
     typedef TemplateChannel<Vec2LinearSampler> Vec2LinearChannel;
     typedef TemplateChannel<Vec3LinearSampler> Vec3LinearChannel;
-    typedef TemplateChannel<Vec3usLinearSampler> Vec3usLinearChannel;  // quantized Vec3LinearChannel
     typedef TemplateChannel<Vec4LinearSampler> Vec4LinearChannel;
     typedef TemplateChannel<QuatSphericalLinearSampler> QuatSphericalLinearChannel;
-    typedef TemplateChannel<Vec3usSphericalLinearSampler> Vec3usSphericalLinearChannel;  // quantized QuatSphericalLinearChannel
     typedef TemplateChannel<MatrixLinearSampler> MatrixLinearChannel;
 
     typedef TemplateChannel<FloatCubicBezierSampler> FloatCubicBezierChannel;
diff --git a/include/osgAnimation/Interpolator b/include/osgAnimation/Interpolator
index bf4f1cd29..28c9b789f 100644
--- a/include/osgAnimation/Interpolator
+++ b/include/osgAnimation/Interpolator
@@ -221,11 +221,9 @@ namespace osgAnimation
     typedef TemplateLinearInterpolator<float, float> FloatLinearInterpolator;
     typedef TemplateLinearInterpolator<osg::Vec2, osg::Vec2> Vec2LinearInterpolator;
     typedef TemplateLinearInterpolator<osg::Vec3, osg::Vec3> Vec3LinearInterpolator;
-    typedef TemplateLinearInterpolator<osg::Vec3us, osg::Vec3us> Vec3usLinearInterpolator;
     typedef TemplateLinearInterpolator<osg::Vec3, Vec3Packed> Vec3PackedLinearInterpolator;
     typedef TemplateLinearInterpolator<osg::Vec4, osg::Vec4> Vec4LinearInterpolator;
     typedef TemplateSphericalLinearInterpolator<osg::Quat, osg::Quat> QuatSphericalLinearInterpolator;
-    typedef TemplateSphericalLinearInterpolator<osg::Vec3us, osg::Vec3us> Vec3usSphericalLinearInterpolator;
     typedef TemplateLinearInterpolator<osg::Matrixf, osg::Matrixf> MatrixLinearInterpolator;
 
     typedef TemplateCubicBezierInterpolator<float, FloatCubicBezier > FloatCubicBezierInterpolator;
diff --git a/include/osgAnimation/Sampler b/include/osgAnimation/Sampler
index 53be9407e..26730c880 100644
--- a/include/osgAnimation/Sampler
+++ b/include/osgAnimation/Sampler
@@ -123,10 +123,8 @@ namespace osgAnimation
     typedef TemplateSampler<FloatLinearInterpolator> FloatLinearSampler;
     typedef TemplateSampler<Vec2LinearInterpolator> Vec2LinearSampler;
     typedef TemplateSampler<Vec3LinearInterpolator> Vec3LinearSampler;
-    typedef TemplateSampler<Vec3usLinearInterpolator> Vec3usLinearSampler;
     typedef TemplateSampler<Vec4LinearInterpolator> Vec4LinearSampler;
     typedef TemplateSampler<QuatSphericalLinearInterpolator> QuatSphericalLinearSampler;
-    typedef TemplateSampler<Vec3usSphericalLinearInterpolator> Vec3usSphericalLinearSampler;
     typedef TemplateSampler<MatrixLinearInterpolator> MatrixLinearSampler;
 
     typedef TemplateSampler<FloatCubicBezierInterpolator> FloatCubicBezierSampler;