Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

SSE2: Workaround alignment issue related to std::pair

Browse Source 
--HG--
branch : sse2
hg/feature/sse2
kaetemi 11 years ago
parent 00b8ad4c91
commit d3847e10cc
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File

16
code/nel/include/nel/sound/clustered_sound.h
Unescape Escape View File

@ -50,7 +50,6 @@ class CClusteredSound
{ {
public: public:
/// This structure contain data about sound status in a cluster /// This structure contain data about sound status in a cluster
NL_ALIGN_SSE2(16)
struct CClusterSoundStatus struct CClusterSoundStatus
{ {
/// The relative gain of sound in the cluster /// The relative gain of sound in the cluster
@ -60,11 +59,11 @@ public:
/// The ratio distance/max earing distance /// The ratio distance/max earing distance
float DistFactor; float DistFactor;
/// The sound virtual position (in fact Dist * Direction) /// The sound virtual position (in fact Dist * Direction)
NLMISC::CVector Position; NLMISC::CVectorPacked Position;
/// The blending factor between real sound pos and virtual pos (1 mean virtual pos, 0 mean real pos). /// The blending factor between real sound pos and virtual pos (1 mean virtual pos, 0 mean real pos).
float PosAlpha; float PosAlpha;
/// The direction vector for the virtual sound source. /// The direction vector for the virtual sound source.
NLMISC::CVector Direction; NLMISC::CVectorPacked Direction;
/// The occlusion att. /// The occlusion att.
sint32 Occlusion; sint32 Occlusion;
/// The occlusion LF factor (see EAX spec) /// The occlusion LF factor (see EAX spec)
@ -79,7 +78,6 @@ public:
typedef std::map<NL3D::CCluster*, CClusterSoundStatus> TClusterStatusMap; typedef std::map<NL3D::CCluster*, CClusterSoundStatus> TClusterStatusMap;
/// This structure is used when we traverse the cluster/portal graph. /// This structure is used when we traverse the cluster/portal graph.
NL_ALIGN_SSE2(16)
struct CSoundTravContext struct CSoundTravContext
{ {
/// The current gain. /// The current gain.
@ -99,18 +97,18 @@ public:
/// A blending factor to compute virtual source position. /// A blending factor to compute virtual source position.
float Alpha; float Alpha;
/// The direction vector from listener to the first portal/cluster /// The direction vector from listener to the first portal/cluster
NLMISC::CVector Direction1; NLMISC::CVectorPacked Direction1;
/// The direction vector from the first portal/cluster to the second one. /// The direction vector from the first portal/cluster to the second one.
NLMISC::CVector Direction2; NLMISC::CVectorPacked Direction2;
/// The current blended direction used to place vitual source. /// The current blended direction used to place vitual source.
NLMISC::CVector Direction; NLMISC::CVectorPacked Direction;
/// The previously traversed cluster. Used to stop back traversal. /// The previously traversed cluster. Used to stop back traversal.
NL3D::CCluster *PreviousCluster; NL3D::CCluster *PreviousCluster;
/// The previous sound propagation vector /// The previous sound propagation vector
NLMISC::CVector PreviousVector; NLMISC::CVectorPacked PreviousVector;
/// The last pseudo listener position /// The last pseudo listener position
NLMISC::CVector ListenerPos; NLMISC::CVectorPacked ListenerPos;
/// Constructor. Init all default value. /// Constructor. Init all default value.
CSoundTravContext(const NLMISC::CVector &listenerPos, CSoundTravContext(const NLMISC::CVector &listenerPos,

2
code/nel/src/sound/audio_mixer_user.cpp
Unescape Escape View File

@ -1705,7 +1705,7 @@ void CAudioMixerUser::update()
{ {
// there is some data here, update the virtual position of the sound. // there is some data here, update the virtual position of the sound.
float dist = (css->Position - source->getPos()).norm(); float dist = (css->Position - source->getPos()).norm();
CVector vpos(_ListenPosition + css->Direction * (css->Dist + dist)); CVector vpos(_ListenPosition + CVector(css->Direction) * (css->Dist + dist));
// _Tracks[i]->DrvSource->setPos(source->getPos() * (1-css->PosAlpha) + css->Position*(css->PosAlpha)); // _Tracks[i]->DrvSource->setPos(source->getPos() * (1-css->PosAlpha) + css->Position*(css->PosAlpha));
_Tracks[i]->getPhysicalSource()->setPos(source->getPos() * (1-css->PosAlpha) + vpos*(css->PosAlpha)); _Tracks[i]->getPhysicalSource()->setPos(source->getPos() * (1-css->PosAlpha) + vpos*(css->PosAlpha));
// update the relative gain // update the relative gain

9
code/nel/src/sound/clustered_sound.cpp
Unescape Escape View File

@ -263,7 +263,7 @@ void CClusteredSound::update(const CVector &listenerPos, const CVector &/* view
{ {
// this one is better ! // this one is better !
cs.Distance = css.Dist; cs.Distance = css.Dist;
cs.Source->setPos(listenerPos + css.Direction * css.Dist + CVector(0,0,2)); cs.Source->setPos(listenerPos + CVector(css.Direction) * css.Dist + CVector(0,0,2));
if (css.DistFactor < 1.0f) if (css.DistFactor < 1.0f)
cs.Source->setRelativeGain(css.Gain * (1.0f - (css.DistFactor*css.DistFactor*css.DistFactor*css.DistFactor))); cs.Source->setRelativeGain(css.Gain * (1.0f - (css.DistFactor*css.DistFactor*css.DistFactor*css.DistFactor)));
else else
@ -289,7 +289,7 @@ void CClusteredSound::update(const CVector &listenerPos, const CVector &/* view
cs.Source = CAudioMixerUser::instance()->createSource(soundName, false, NULL, NULL, cluster); cs.Source = CAudioMixerUser::instance()->createSource(soundName, false, NULL, NULL, cluster);
if (cs.Source != 0) if (cs.Source != 0)
{ {
cs.Source->setPos(listenerPos + css.Direction * css.Dist + CVector(0,0,2)); cs.Source->setPos(listenerPos + CVector(css.Direction) * css.Dist + CVector(0,0,2));
if (css.DistFactor < 1.0f) if (css.DistFactor < 1.0f)
cs.Source->setRelativeGain(css.Gain * (1.0f - (css.DistFactor*css.DistFactor/**css.DistFactor*css.DistFactor*/))); cs.Source->setRelativeGain(css.Gain * (1.0f - (css.DistFactor*css.DistFactor/**css.DistFactor*css.DistFactor*/)));
else else
@ -867,7 +867,7 @@ bool CClusteredSound::addAudibleCluster(CCluster *cluster, CClusterSoundStatus &
{ {
TClusterStatusMap::iterator it(_AudibleClusters.find(cluster)); TClusterStatusMap::iterator it(_AudibleClusters.find(cluster));
nlassert(soundStatus.Dist < _MaxEarDistance); nlassert(soundStatus.Dist < _MaxEarDistance);
nlassert(soundStatus.Direction.norm() <= 1.01f); nlassert(CVector(soundStatus.Direction).norm() <= 1.01f);
if (it != _AudibleClusters.end()) if (it != _AudibleClusters.end())
{ {
@ -881,8 +881,7 @@ bool CClusteredSound::addAudibleCluster(CCluster *cluster, CClusterSoundStatus &
} }
else else
{ {
//_AudibleClusters.insert(make_pair(cluster, soundStatus)); _AudibleClusters.insert(make_pair(cluster, soundStatus));
_AudibleClusters[cluster] = soundStatus;
return true; return true;
} }

2
code/nel/src/sound/simple_source.cpp
Unescape Escape View File

@ -109,7 +109,7 @@ CVector CSimpleSource::getVirtualPos() const
{ {
// there is some data here, update the virtual position of the sound. // there is some data here, update the virtual position of the sound.
float dist = (css->Position - getPos()).norm(); float dist = (css->Position - getPos()).norm();
CVector vpos(CAudioMixerUser::instance()->getListenPosVector() + css->Direction * (css->Dist + dist)); CVector vpos(CAudioMixerUser::instance()->getListenPosVector() + CVector(css->Direction) * (css->Dist + dist));
vpos = _Position * (1-css->PosAlpha) + vpos*(css->PosAlpha); vpos = _Position * (1-css->PosAlpha) + vpos*(css->PosAlpha);
return vpos; return vpos;
} }

2
code/nel/src/sound/stream_source.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ CVector CStreamSource::getVirtualPos() const
{ {
// there is some data here, update the virtual position of the sound. // there is some data here, update the virtual position of the sound.
float dist = (css->Position - getPos()).norm(); float dist = (css->Position - getPos()).norm();
CVector vpos(CAudioMixerUser::instance()->getListenPosVector() + css->Direction * (css->Dist + dist)); CVector vpos(CAudioMixerUser::instance()->getListenPosVector() + CVector(css->Direction) * (css->Dist + dist));
vpos = _Position * (1-css->PosAlpha) + vpos*(css->PosAlpha); vpos = _Position * (1-css->PosAlpha) + vpos*(css->PosAlpha);
return vpos; return vpos;
} }

2
code/ryzom/client/src/sound_manager.cpp
Unescape Escape View File

@ -343,7 +343,7 @@ void CSoundManager::drawSounds(float camHeight)
const CClusteredSound::CClusterSoundStatus &css = first->second; const CClusteredSound::CClusterSoundStatus &css = first->second;
if (css.Direction != CVector::Null) if (css.Direction != CVector::Null)
{ {
CVector dest = pos+css.Direction*css.Dist; CVector dest = pos+CVector(css.Direction)*css.Dist;
NL3D::CDRU::drawLine(pos, dest, CRGBA(0,255,255,255), *idriver); NL3D::CDRU::drawLine(pos, dest, CRGBA(0,255,255,255), *idriver);
NL3D::CDRU::drawLine(dest+CVector(0.5f,0.5f,0), dest+CVector(-0.5f,-0.5f,0), CRGBA(0, 255,255,255), *idriver); NL3D::CDRU::drawLine(dest+CVector(0.5f,0.5f,0), dest+CVector(-0.5f,-0.5f,0), CRGBA(0, 255,255,255), *idriver);

Write Preview
Loading…
Cancel
Save