[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25646] trunk/blender/intern/audaspace: Small fixes for some float literals.
Joerg Mueller
nexyon at gmail.com
Fri Jan 1 12:55:56 CET 2010
Revision: 25646
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25646
Author: nexyon
Date: 2010-01-01 12:55:56 +0100 (Fri, 01 Jan 2010)
Log Message:
-----------
Small fixes for some float literals.
Modified Paths:
--------------
trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.cpp
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_HighpassReader.cpp
trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_LowpassReader.cpp
trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h
trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h
trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
Modified: trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -44,8 +44,8 @@
AUD_NEW("buffer")
memset(m_envelopes->getBuffer(), 0, samplesize);
- m_bAttack = pow(arthreshold, 1.0/(specs.rate * attack));
- m_bRelease = pow(arthreshold, 1.0/(specs.rate * release));
+ m_bAttack = pow(arthreshold, 1.0f/(specs.rate * attack));
+ m_bRelease = pow(arthreshold, 1.0f/(specs.rate * release));
}
AUD_EnvelopeReader::~AUD_EnvelopeReader()
Modified: trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h 2010-01-01 11:55:56 UTC (rev 25646)
@@ -51,14 +51,14 @@
* \param frequency The cutoff frequency.
* \param Q The Q factor.
*/
- AUD_HighpassFactory(AUD_IFactory* factory, float frequency, float Q = 1.0);
+ AUD_HighpassFactory(AUD_IFactory* factory, float frequency, float Q = 1.0f);
/**
* Creates a new highpass factory.
* \param frequency The cutoff frequency.
* \param Q The Q factor.
*/
- AUD_HighpassFactory(float frequency, float Q = 1.0);
+ AUD_HighpassFactory(float frequency, float Q = 1.0f);
virtual AUD_IReader* createReader();
};
Modified: trunk/blender/intern/audaspace/FX/AUD_HighpassReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_HighpassReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_HighpassReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -55,7 +55,7 @@
m_position = 0;
// calculate coefficients
- float w0 = 2.0 * M_PI * frequency / specs.rate;
+ float w0 = 2 * M_PI * frequency / specs.rate;
float alpha = sin(w0) / (2 * Q);
float norm = 1 + alpha;
m_coeff[0][0] = 0;
Modified: trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h 2010-01-01 11:55:56 UTC (rev 25646)
@@ -51,14 +51,14 @@
* \param frequency The cutoff frequency.
* \param Q The Q factor.
*/
- AUD_LowpassFactory(AUD_IFactory* factory, float frequency, float Q = 1.0);
+ AUD_LowpassFactory(AUD_IFactory* factory, float frequency, float Q = 1.0f);
/**
* Creates a new lowpass factory.
* \param frequency The cutoff frequency.
* \param Q The Q factor.
*/
- AUD_LowpassFactory(float frequency, float Q = 1.0);
+ AUD_LowpassFactory(float frequency, float Q = 1.0f);
virtual AUD_IReader* createReader();
};
Modified: trunk/blender/intern/audaspace/FX/AUD_LowpassReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_LowpassReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_LowpassReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -55,7 +55,7 @@
m_position = 0;
// calculate coefficients
- float w0 = 2.0 * M_PI * frequency / specs.rate;
+ float w0 = 2 * M_PI * frequency / specs.rate;
float alpha = sin(w0) / (2 * Q);
float norm = 1 + alpha;
m_coeff[0][0] = 0;
Modified: trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h 2010-01-01 11:55:56 UTC (rev 25646)
@@ -45,7 +45,7 @@
* \param factory The input factory.
* \param pitch The desired pitch.
*/
- AUD_PitchFactory(AUD_IFactory* factory = 0, float pitch = 1.0);
+ AUD_PitchFactory(AUD_IFactory* factory = 0, float pitch = 1.0f);
/**
* Creates a new pitch factory.
Modified: trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h 2010-01-01 11:55:56 UTC (rev 25646)
@@ -47,7 +47,7 @@
* \param factory The input factory.
* \param volume The desired volume.
*/
- AUD_VolumeFactory(AUD_IFactory* factory = 0, float volume = 1.0);
+ AUD_VolumeFactory(AUD_IFactory* factory = 0, float volume = 1.0f);
/**
* Creates a new volume factory.
Modified: trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -868,7 +868,7 @@
float AUD_OpenALDevice::getPosition(AUD_Handle* handle)
{
- float position = 0.0;
+ float position = 0.0f;
lock();
@@ -1283,7 +1283,7 @@
result = true;
break;
case AUD_3DSS_IS_RELATIVE:
- alSourcei(source, AL_SOURCE_RELATIVE, value > 0.0);
+ alSourcei(source, AL_SOURCE_RELATIVE, value > 0.0f);
result = true;
break;
case AUD_3DSS_MAX_DISTANCE:
@@ -1341,7 +1341,7 @@
{
ALint i;
alGetSourcei(source, AL_SOURCE_RELATIVE, &i);
- result = i ? 1.0 : 0.0;
+ result = i ? 1.0f : 0.0f;
break;
}
case AUD_3DSS_MAX_DISTANCE:
Modified: trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -108,7 +108,7 @@
for(int i = 0; i < m_length / 2 + 1; i++)
{
- frequency = i * specs.rate / (m_length / 2.0 + 1.0);
+ frequency = i * specs.rate / (m_length / 2.0f + 1.0f);
if((frequency < m_low) || (frequency > m_high))
complex[i][0] = complex[i][1] = 0.0;
}
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -182,7 +182,7 @@
{
info.specs.channels = AUD_CHANNELS_INVALID;
info.specs.rate = AUD_RATE_INVALID;
- info.length = 0.0;
+ info.length = 0.0f;
}
return info;
@@ -427,7 +427,7 @@
catch(AUD_Exception)
{
}
- return 0.0;
+ return 0.0f;
}
int AUD_update3DSource(AUD_Handle* handle, AUD_3DData* data)
@@ -483,7 +483,7 @@
{
}
}
- return 0.0;
+ return 0.0f;
}
int AUD_setSoundVolume(AUD_Handle* handle, float volume)
Modified: trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -49,7 +49,8 @@
for(i=0; i < m_rch; i++)
sum += mapping[channels][i];
for(i=0; i < m_rch; i++)
- m_mapping[channels][i] = sum > 0.0 ? mapping[channels][i]/sum : 0.0;
+ m_mapping[channels][i] = sum > 0.0f ?
+ mapping[channels][i]/sum : 0.0f;
}
m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
Modified: trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -29,12 +29,12 @@
#define AUD_U8_0 0x80
#define AUD_S16_MAX 0x7FFF
#define AUD_S16_MIN 0x8000
-#define AUD_S16_FLT 32768.0
+#define AUD_S16_FLT 32768.0f
#define AUD_S32_MAX 0x7FFFFFFF
#define AUD_S32_MIN 0x80000000
-#define AUD_S32_FLT 2147483648.0
-#define AUD_FLT_MAX 1.0
-#define AUD_FLT_MIN -1.0
+#define AUD_S32_FLT 2147483648.0f
+#define AUD_FLT_MAX 1.0f
+#define AUD_FLT_MIN -1.0f
void AUD_convert_u8_s16(data_t* target, data_t* source, int length)
{
Modified: trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -93,7 +93,7 @@
buffer = m_buffer->getBuffer();
for(int i = 0; i < length; i++)
{
- buffer[i] = sin((m_position + i) * 2.0 * M_PI * m_frequency /
+ buffer[i] = sin((m_position + i) * 2.0f * M_PI * m_frequency /
(float)m_sampleRate);
}
Modified: trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp 2010-01-01 11:40:48 UTC (rev 25645)
+++ trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp 2010-01-01 11:55:56 UTC (rev 25646)
@@ -51,7 +51,7 @@
m_playingSounds = new std::list<AUD_SoftwareHandle*>(); AUD_NEW("list")
m_pausedSounds = new std::list<AUD_SoftwareHandle*>(); AUD_NEW("list")
m_playback = false;
- m_volume = 1.0;
+ m_volume = 1.0f;
m_mixer = new AUD_Mixer(); AUD_NEW("mixer")
m_mixer->setSpecs(m_specs);
@@ -184,7 +184,7 @@
AUD_SoftwareHandle* sound = new AUD_SoftwareHandle; AUD_NEW("handle")
sound->keep = keep;
sound->reader = reader;
- sound->volume = 1.0;
+ sound->volume = 1.0f;
lock();
m_playingSounds->push_back(sound);
@@ -421,10 +421,10 @@
case AUD_CAPS_VOLUME:
lock();
m_volume = *((float*)value);
- if(m_volume > 1.0)
- m_volume = 1.0;
- else if(m_volume < 0.0)
- m_volume = 0.0;
+ if(m_volume > 1.0f)
+ m_volume = 1.0f;
+ else if(m_volume < 0.0f)
+ m_volume = 0.0f;
unlock();
return true;
case AUD_CAPS_SOURCE_VOLUME:
@@ -435,10 +435,10 @@
{
AUD_SoftwareHandle* handle = (AUD_SoftwareHandle*)caps->handle;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list