diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/sound | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2 colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip |
FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
Diffstat (limited to 'src/sound')
-rw-r--r-- | src/sound/sound.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index 5b8f469..d28dee5 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -16,8 +16,6 @@ // sound.cpp
-#define STRICT
-#define D3D_OVERLOADS
#include <stdlib.h>
#include <ctype.h>
@@ -28,6 +26,7 @@ #include "common/language.h"
#include "common/struct.h"
#include "common/iman.h"
+#include "math/geometry.h"
#include "math/old/math3d.h"
#include "sound/sound.h"
@@ -977,9 +976,9 @@ void CSound::ComputeVolumePan2D(int channel, const D3DVECTOR &pos) m_channel[channel].volume = 1.0f-((dist-10.0f)/100.0f);
#endif
- a = RotateAngle(m_lookat.x-m_eye.x, m_eye.z-m_lookat.z);
- g = RotateAngle(pos.x-m_eye.x, m_eye.z-pos.z);
- m_channel[channel].pan = sinf(Direction(a, g));
+ a = Math::RotateAngle(m_lookat.x-m_eye.x, m_eye.z-m_lookat.z);
+ g = Math::RotateAngle(pos.x-m_eye.x, m_eye.z-pos.z);
+ m_channel[channel].pan = sinf(Math::Direction(a, g));
}
// Sounds in the middle.
|