New sound system & removed miles

src/EffectLib/EffectData.cpp

@@ -96,7 +96,7 @@ bool CEffectData::LoadScript(const char * c_szFileName)
 
 bool CEffectData::LoadSoundScriptData(const char * c_szFileName)
 {
-	TSoundDataVector SoundDataVector;
+	NSound::TSoundDataVector SoundDataVector;
 
 	if (LoadSoundInformationPiece(c_szFileName, SoundDataVector))
 	{
@@ -164,7 +164,7 @@ CEffectMeshScript * CEffectData::GetMeshPointer(DWORD dwPosition)
 	return m_MeshVector[dwPosition];
 }
 
-TSoundInstanceVector * CEffectData::GetSoundInstanceVector()
+NSound::TSoundInstanceVector * CEffectData::GetSoundInstanceVector()
 {
 	return &m_SoundInstanceVector;
 }

src/EffectLib/EffectData.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../milesLib/Type.h"
+#include "../AudioLib/Type.h"
 
 #include "ParticleSystemData.h"
 #include "EffectMesh.h"
@@ -30,7 +30,7 @@ class CEffectData
 		DWORD							GetLightCount();
 		CLightData *					GetLightPointer(DWORD dwPosition);
 
-		TSoundInstanceVector *			GetSoundInstanceVector();
+		NSound::TSoundInstanceVector *			GetSoundInstanceVector();
 
 		float							GetBoundingSphereRadius();
 		D3DXVECTOR3						GetBoundingSpherePosition();
@@ -52,7 +52,7 @@ class CEffectData
 		TParticleVector					m_ParticleVector;
 		TMeshVector						m_MeshVector;
 		TLightVector					m_LightVector;
-		TSoundInstanceVector			m_SoundInstanceVector;
+		NSound::TSoundInstanceVector			m_SoundInstanceVector;
 
 		float							m_fBoundingSphereRadius;
 		D3DXVECTOR3						m_v3BoundingSpherePosition;

src/EffectLib/EffectInstance.cpp

@@ -5,7 +5,7 @@
 
 #include "../eterBase/Stl.h"
 #include "../eterLib/StateManager.h"
-#include "../MilesLib/SoundManager.h"
+#include "../AudioLib/SoundEngine.h"
 
 CDynamicPool<CEffectInstance>	CEffectInstance::ms_kPool;
 int CEffectInstance::ms_iRenderingEffectCount = 0;
@@ -50,12 +50,12 @@ void CEffectInstance::UpdateSound()
 {
 	if (m_pSoundInstanceVector)
 	{
-		UpdateSoundInstance(m_dwFrame,
-			*m_pSoundInstanceVector,
-			m_matGlobal._41,
-			m_matGlobal._42,
-			m_matGlobal._43,
-			false);
+		SoundEngine::Instance().UpdateSoundInstance(m_matGlobal._41,
+													m_matGlobal._42,
+													m_matGlobal._43,
+													m_dwFrame,
+													m_pSoundInstanceVector,
+													false, false);
 		// NOTE : 매트릭스에서 위치를 직접 얻어온다 - [levites]
 	}
 	++m_dwFrame;

src/EffectLib/EffectInstance.h

@@ -2,7 +2,7 @@
 
 #include "../eterlib/GrpObjectInstance.h"
 #include "../eterlib/Pool.h"
-#include "../mileslib/Type.h"
+#include "../AudioLib/Type.h"
 
 #include "EffectElementBaseInstance.h"
 #include "EffectData.h"
@@ -77,7 +77,7 @@ class CEffectInstance : public CGraphicObjectInstance
 		std::vector<CEffectMeshInstance*>		m_MeshInstanceVector;
 		std::vector<CLightInstance*>			m_LightInstanceVector;
 
-		TSoundInstanceVector *					m_pSoundInstanceVector;
+		NSound::TSoundInstanceVector *					m_pSoundInstanceVector;
 
 		float m_fBoundingSphereRadius;
 		D3DXVECTOR3 m_v3BoundingSpherePosition;

src/EffectLib/StdAfx.h

@@ -12,7 +12,7 @@
 #include "../eterLib/StdAfx.h"
 #include "../eterLib/TextFileLoader.h"
 
-#include "../milesLib/StdAfx.h"
+#include "../AudioLib/StdAfx.h"
 
 /*
 #include "FrameController.h"