epfl-cvs

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28787

Modified Files:
	aicontroller.cc game.cc model.h 
Log Message:

fixes


Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** game.cc	14 Oct 2004 13:47:59 -0000	1.13
--- game.cc	15 Oct 2004 14:01:01 -0000	1.14
***************
*** 14,18 ****
  	Engine::pEngine = pEngine;
  	
- 	SoundManager::pSoundManager = pSoundManager;
  	
  	pSceneManager = new SceneManager (pTimer);
--- 14,17 ----
***************
*** 37,40 ****
--- 36,40 ----
  	_CreatePlayers ();
  	
+ 	SoundManager::pSoundManager = pSoundManager;
  	//On ajoute les sons que l'on veut. On fixe "Music" relatif au Listener.
  	//FIXME: Chargement d'une musique d'ambiance au format ogg prend plus de temps qu'avec le format wav...
***************
*** 56,66 ****
  	
  	//On baisse le volume de la musique d'ambiance
! 	//pSoundManager->SetSoundVolume("Music",0.5);
  	
  	//On joue les sons
  	pSoundManager->PlaySound("fire");
  	pSoundManager->PlaySound("thunder");
! 	//pSoundManager->PlaySound("Music");
! 	
  }
  
--- 56,65 ----
  	
  	//On baisse le volume de la musique d'ambiance
! 	pSoundManager->SetSoundVolume("Music",0.5);
  	
  	//On joue les sons
  	pSoundManager->PlaySound("fire");
  	pSoundManager->PlaySound("thunder");
! 	pSoundManager->PlaySound("Music");
  }
  

Index: aicontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/aicontroller.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aicontroller.cc	14 Oct 2004 13:21:06 -0000	1.2
--- aicontroller.cc	15 Oct 2004 14:00:53 -0000	1.3
***************
*** 23,29 ****
  	float fVarZ = vCentre.z - vPos.z;
  	float fDist = sqrt(fVarX*fVarX + fVarZ*fVarZ);
! 	std::cout	<< "EndPoint Z: "		<< vCentre.z
  			<< "	 Position : "	<< vPos
! 			<< "	 Distance : "	<< abs(fVarZ)	<< std::endl;
  }
  
--- 23,29 ----
  	float fVarZ = vCentre.z - vPos.z;
  	float fDist = sqrt(fVarX*fVarX + fVarZ*fVarZ);
! /*	std::cout	<< "EndPoint Z: "		<< vCentre.z
  			<< "	 Position : "	<< vPos
! 			<< "	 Distance : "	<< abs(fVarZ)	<< std::endl;*/
  }
  

Index: model.h
===================================================================
RCS file: /cvsroot/epfl/tggame/model.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** model.h	10 Oct 2004 20:54:47 -0000	1.5
--- model.h	15 Oct 2004 14:01:01 -0000	1.6
***************
*** 55,60 ****
  	inline Vector3 GetPosition () { return pMD5->GetPosition(); }
  	inline void SetPosition (const Vector3& v) { pMD5->SetPosition(v); }
! 	inline void SetAcceleration (const Vector3& v) { pMD5->vAccel = v; }
! 	inline Vector3 GetAcceleration () { return pMD5->vAccel; }
   protected:
  	bool _ParseMDLFile (char*);
--- 55,60 ----
  	inline Vector3 GetPosition () { return pMD5->GetPosition(); }
  	inline void SetPosition (const Vector3& v) { pMD5->SetPosition(v); }
! 	inline void SetAcceleration (const Vector3& v) { pMD5->SetAccel(v); }
! 	inline Vector3 GetAcceleration () { return pMD5->GetAccel(); }
   protected:
  	bool _ParseMDLFile (char*);