FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #387 from jtorresfabra/remove_custom_code

Browse Source 
Removes custom code added for sketchfab channel compression that shou…
This commit is contained in:
OpenSceneGraph git repository 2017-11-27 15:54:39 +00:00 committed by GitHub
commit 6abb9b27f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/osgjs/Animation.cpp
View File

@ -240,16 +240,6 @@ static void addJSONChannel(osgAnimation::Channel* channel, JSONObject& anim, Wri
} }
} }
#ifdef USE_COMPRESSED_CHANNELS
{
osgAnimation::Vec3usLinearChannel* c = dynamic_cast<osgAnimation::Vec3usLinearChannel*>(channel);
if (c) {
if (addJSONChannel<osgAnimation::Vec3usLinearChannel>("osgAnimation.Vec3LerpChannelCompressed", c, true, anim, writer, parent))
return;
}
}
#endif
{ {
osgAnimation::QuatSphericalLinearChannel* c = dynamic_cast<osgAnimation::QuatSphericalLinearChannel*>(channel); osgAnimation::QuatSphericalLinearChannel* c = dynamic_cast<osgAnimation::QuatSphericalLinearChannel*>(channel);
if (c) { if (c) {
@ -258,16 +248,6 @@ static void addJSONChannel(osgAnimation::Channel* channel, JSONObject& anim, Wri
} }
} }
#ifdef USE_COMPRESSED_CHANNELS
{
osgAnimation::Vec3usSphericalLinearChannel* c = dynamic_cast<osgAnimation::Vec3usSphericalLinearChannel*>(channel);
if (c) {
if (addJSONChannel<osgAnimation::Vec3usSphericalLinearChannel>("osgAnimation.QuatSlerpChannelCompressed", c, true, anim, writer, parent))
return;
}
}
#endif
{ {
osgAnimation::FloatCubicBezierChannel* c = dynamic_cast<osgAnimation::FloatCubicBezierChannel*>(channel); osgAnimation::FloatCubicBezierChannel* c = dynamic_cast<osgAnimation::FloatCubicBezierChannel*>(channel);
if (c) { if (c) {

4
src/osgPlugins/osgjs/CMakeLists.txt
View File

@ -16,10 +16,6 @@ SET(TARGET_H
WriteVisitor WriteVisitor
) )
IF($ENV{SKETCHFAB_BUILD})
ADD_DEFINITIONS(-DUSE_COMPRESSED_CHANNELS)
ENDIF()
#### end var setup ### #### end var setup ###
SET(TARGET_ADDED_LIBRARIES SET(TARGET_ADDED_LIBRARIES
osgAnimation osgAnimation