Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27973
Modified Files:
game.cc playercontroller.cc
Log Message:
Ajout des bruit de pas et d'un coup de feu (ESPACE)
Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** game.cc 13 Oct 2004 18:39:09 -0000 1.10
--- game.cc 13 Oct 2004 18:59:55 -0000 1.11
***************
*** 37,47 ****
_CreatePlayers ();
- /*
-
//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...
pSoundManager->AddWAV("fire",false,true);
pSoundManager->AddWAV("thunder",false,true);
! pSoundManager->AddWAV("Music",true,true);
pSoundManager->AddWAV("step",true,true);
--- 37,45 ----
_CreatePlayers ();
//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...
pSoundManager->AddWAV("fire",false,true);
pSoundManager->AddWAV("thunder",false,true);
! pSoundManager->AddOGG("Music",true,true);
pSoundManager->AddWAV("step",true,true);
***************
*** 65,69 ****
pSoundManager->PlaySound("Music");
- */
}
--- 63,66 ----
***************
*** 125,130 ****
void Game::PreFrame ()
{
- /*
-
Camera* myCam = pSceneManager->GetCamera();
--- 122,125 ----
***************
*** 137,142 ****
pSoundManager->SetListenerOrientation(forward.x,forward.y,forward.z,up.x,up.y,up.z);
- */
-
float t = pTimer->GetFrameInterval ();
for (unsigned int i=0; i<vControllers.size(); i++)
--- 132,135 ----
Index: playercontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playercontroller.cc 10 Oct 2004 20:54:47 -0000 1.4
--- playercontroller.cc 13 Oct 2004 18:59:55 -0000 1.5
***************
*** 1,3 ****
--- 1,4 ----
#include "playercontroller.h"
+ #include <soundmanager.h>
using namespace tg;
***************
*** 26,38 ****
--- 27,46 ----
case TGKEY_w:
iForward += 1;
+ SoundManager::pSoundManager->PlaySound("step");
break;
case TGKEY_s:
iForward -= 1;
+ SoundManager::pSoundManager->PlaySound("step");
break;
case TGKEY_a:
iStrafe -= 1;
+ SoundManager::pSoundManager->PlaySound("step");
break;
case TGKEY_d:
iStrafe += 1;
+ SoundManager::pSoundManager->PlaySound("step");
+ break;
+ case TGKEY_SPACE:
+ SoundManager::pSoundManager->PlaySound("gun");
break;
default:
***************
*** 47,54 ****
--- 55,64 ----
case TGKEY_s:
iForward = 0;
+ SoundManager::pSoundManager->StopSound("step");
break;
case TGKEY_a:
case TGKEY_d:
iStrafe = 0;
+ SoundManager::pSoundManager->StopSound("step");
break;
default:
|
