Skip to content

Commit d110db9

Browse files
committed
Revert "Display deprecation warning when writing FFT compressed anim chans"
This reverts commit 2c6a6c9. 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.
1 parent c3d52ee commit d110db9

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

panda/src/chan/animChannelMatrixXfmTable.cxx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -327,16 +327,10 @@ void AnimChannelMatrixXfmTable::
327327
write_datagram(BamWriter *manager, Datagram &me) {
328328
AnimChannelMatrix::write_datagram(manager, me);
329329

330-
if (compress_channels) {
331-
chan_cat.warning()
332-
<< "FFT compression of animations is deprecated. For compatibility "
333-
"with future versions of Panda3D, set compress-channels to false.\n";
334-
335-
if (!FFTCompressor::is_compression_available()) {
336-
chan_cat.error()
337-
<< "Compression is not available; writing uncompressed channels.\n";
338-
compress_channels = false;
339-
}
330+
if (compress_channels && !FFTCompressor::is_compression_available()) {
331+
chan_cat.error()
332+
<< "Compression is not available; writing uncompressed channels.\n";
333+
compress_channels = false;
340334
}
341335

342336
me.add_bool(compress_channels);

panda/src/chan/animChannelScalarTable.cxx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,10 @@ void AnimChannelScalarTable::
146146
write_datagram(BamWriter *manager, Datagram &me) {
147147
AnimChannelScalar::write_datagram(manager, me);
148148

149-
if (compress_channels) {
150-
chan_cat.warning()
151-
<< "FFT compression of animations is deprecated. For compatibility "
152-
"with future versions of Panda3D, set compress-channels to false.\n";
153-
154-
if (!FFTCompressor::is_compression_available()) {
155-
chan_cat.error()
156-
<< "Compression is not available; writing uncompressed channels.\n";
157-
compress_channels = false;
158-
}
149+
if (compress_channels && !FFTCompressor::is_compression_available()) {
150+
chan_cat.error()
151+
<< "Compression is not available; writing uncompressed channels.\n";
152+
compress_channels = false;
159153
}
160154

161155
me.add_bool(compress_channels);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy