epfl-cvs

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

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

Modified Files:
	game.cc 
Log Message:
Portage Win32

Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** game.cc	2 Oct 2004 22:47:06 -0000	1.6
--- game.cc	4 Oct 2004 14:51:01 -0000	1.7
***************
*** 36,43 ****
  	_CreatePlayers ();
  	
! 	pSoundManager->AddWAV("bubbles",false,true);
! 	pSoundManager->AddOGG("Music",true,true);
  	
! 	Vector3 soundtestpos = pWorld->GetPointLightPos(9);
  	
  	//pSoundManager->SetSoundProperties("fire",soundtestpos.x,soundtestpos.y,soundtestpos.z,0.0,0.0,0.0);
--- 36,43 ----
  	_CreatePlayers ();
  	
! 	//pSoundManager->AddWAV("bubbles",false,true);
! 	//pSoundManager->AddOGG("Music",true,true);
  	
! 	/*Vector3 soundtestpos = pWorld->GetPointLightPos(9);
  	
  	//pSoundManager->SetSoundProperties("fire",soundtestpos.x,soundtestpos.y,soundtestpos.z,0.0,0.0,0.0);
***************
*** 47,51 ****
  	
  	pSoundManager->PlaySound("bubbles");
! 	pSoundManager->PlaySound("Music");
  }
  
--- 47,51 ----
  	
  	pSoundManager->PlaySound("bubbles");
! 	pSoundManager->PlaySound("Music");*/
  }
  
***************
*** 74,78 ****
  	//création du joueur local
  	//on ajoute _pas_ le pawn au scenemanager
! 	Camera* cam = new Camera (0.025f,15000, Vector3 (0, 100,0));
  	//TODO: on devrait plutot se base sur la bounding box du model
  	cam->pBBox->vMin = Vector3(-10, -70, -10);
--- 74,83 ----
  	//création du joueur local
  	//on ajoute _pas_ le pawn au scenemanager
! 	#ifndef TGWIN32
! 	#define CAM_SPEED 15000
! 	#else
! 	#define CAM_SPEED 150000
! 	#endif
! 	Camera* cam = new Camera (0.025f,CAM_SPEED, Vector3 (0, 100,0));
  	//TODO: on devrait plutot se base sur la bounding box du model
  	cam->pBBox->vMin = Vector3(-10, -70, -10);