Browse Source

Revert "Display deprecation warning when writing FFT compressed anim chans"

This reverts commit 2c6a6c9f062dbb7df340133ccdce37fef2c06f2c.

This commit constitutes a commitment to keep the FFT compression feature
around in 1.10 and beyond. The plan at this time is to replace FFTW
support with FFTS (which is comparable in speed and much more liberally
licensed) and have a builtin DFT/FFT implementation to fall back on when
FFTS is not available. In this regard, FFTS does for Fourier transforms
what Eigen does for linear transforms: it provides a more efficient
implementation for Panda to use, but isn't necessary for the functionality
to work.
Sam Edwards 7 years ago
parent
commit
d110db96f0

+ 4 - 10
panda/src/chan/animChannelMatrixXfmTable.cxx

@@ -327,16 +327,10 @@ void AnimChannelMatrixXfmTable::
 write_datagram(BamWriter *manager, Datagram &me) {
   AnimChannelMatrix::write_datagram(manager, me);
 
-  if (compress_channels) {
-    chan_cat.warning()
-      << "FFT compression of animations is deprecated.  For compatibility "
-         "with future versions of Panda3D, set compress-channels to false.\n";
-
-    if (!FFTCompressor::is_compression_available()) {
-      chan_cat.error()
-        << "Compression is not available; writing uncompressed channels.\n";
-      compress_channels = false;
-    }
+  if (compress_channels && !FFTCompressor::is_compression_available()) {
+    chan_cat.error()
+      << "Compression is not available; writing uncompressed channels.\n";
+    compress_channels = false;
   }
 
   me.add_bool(compress_channels);

+ 4 - 10
panda/src/chan/animChannelScalarTable.cxx

@@ -146,16 +146,10 @@ void AnimChannelScalarTable::
 write_datagram(BamWriter *manager, Datagram &me) {
   AnimChannelScalar::write_datagram(manager, me);
 
-  if (compress_channels) {
-    chan_cat.warning()
-      << "FFT compression of animations is deprecated.  For compatibility "
-         "with future versions of Panda3D, set compress-channels to false.\n";
-
-    if (!FFTCompressor::is_compression_available()) {
-      chan_cat.error()
-        << "Compression is not available; writing uncompressed channels.\n";
-      compress_channels = false;
-    }
+  if (compress_channels && !FFTCompressor::is_compression_available()) {
+    chan_cat.error()
+      << "Compression is not available; writing uncompressed channels.\n";
+    compress_channels = false;
   }
 
   me.add_bool(compress_channels);