From 66eeabd7d093f78e5ce2d55a290e4c22000b0acf Mon Sep 17 00:00:00 2001 From: Jordi Date: Mon, 27 Nov 2017 15:48:50 +0100 Subject: [PATCH] Removes custom code added for sketchfab channel compression that should not be there --- src/osgPlugins/osgjs/Animation.cpp | 20 -------------------- src/osgPlugins/osgjs/CMakeLists.txt | 4 ---- 2 files changed, 24 deletions(-) diff --git a/src/osgPlugins/osgjs/Animation.cpp b/src/osgPlugins/osgjs/Animation.cpp index 40af1ed47..a14352d1d 100644 --- a/src/osgPlugins/osgjs/Animation.cpp +++ b/src/osgPlugins/osgjs/Animation.cpp @@ -240,16 +240,6 @@ static void addJSONChannel(osgAnimation::Channel* channel, JSONObject& anim, Wri } } -#ifdef USE_COMPRESSED_CHANNELS - { - osgAnimation::Vec3usLinearChannel* c = dynamic_cast(channel); - if (c) { - if (addJSONChannel("osgAnimation.Vec3LerpChannelCompressed", c, true, anim, writer, parent)) - return; - } - } -#endif - { osgAnimation::QuatSphericalLinearChannel* c = dynamic_cast(channel); if (c) { @@ -258,16 +248,6 @@ static void addJSONChannel(osgAnimation::Channel* channel, JSONObject& anim, Wri } } -#ifdef USE_COMPRESSED_CHANNELS - { - osgAnimation::Vec3usSphericalLinearChannel* c = dynamic_cast(channel); - if (c) { - if (addJSONChannel("osgAnimation.QuatSlerpChannelCompressed", c, true, anim, writer, parent)) - return; - } - } -#endif - { osgAnimation::FloatCubicBezierChannel* c = dynamic_cast(channel); if (c) { diff --git a/src/osgPlugins/osgjs/CMakeLists.txt b/src/osgPlugins/osgjs/CMakeLists.txt index 980f644b9..2c6673119 100644 --- a/src/osgPlugins/osgjs/CMakeLists.txt +++ b/src/osgPlugins/osgjs/CMakeLists.txt @@ -16,10 +16,6 @@ SET(TARGET_H WriteVisitor ) -IF($ENV{SKETCHFAB_BUILD}) - ADD_DEFINITIONS(-DUSE_COMPRESSED_CHANNELS) -ENDIF() - #### end var setup ### SET(TARGET_ADDED_LIBRARIES osgAnimation